Change shorthands

pull/150/head
Maran 11 years ago
parent f5d4414734
commit 31e44c2ab9
  1. 26
      ethutil/common.go
  2. 6
      ethutil/common_test.go

@ -7,13 +7,13 @@ import (
// The different number of units // The different number of units
var ( var (
Ether = BigPow(10, 18) Ether = BigPow(10, 18)
Finney = BigPow(10, 15) Finney = BigPow(10, 15)
Szabo = BigPow(10, 12) Szabo = BigPow(10, 12)
Vita = BigPow(10, 9) Shannon = BigPow(10, 9)
Turing = BigPow(10, 6) Babbage = BigPow(10, 6)
Eins = BigPow(10, 3) Ada = BigPow(10, 3)
Wei = big.NewInt(1) Wei = big.NewInt(1)
) )
// Currency to string // Currency to string
@ -27,12 +27,12 @@ func CurrencyToString(num *big.Int) string {
return fmt.Sprintf("%v Finney", new(big.Int).Div(num, Finney)) return fmt.Sprintf("%v Finney", new(big.Int).Div(num, Finney))
case num.Cmp(Szabo) >= 0: case num.Cmp(Szabo) >= 0:
return fmt.Sprintf("%v Szabo", new(big.Int).Div(num, Szabo)) return fmt.Sprintf("%v Szabo", new(big.Int).Div(num, Szabo))
case num.Cmp(Vita) >= 0: case num.Cmp(Shannon) >= 0:
return fmt.Sprintf("%v Vita", new(big.Int).Div(num, Vita)) return fmt.Sprintf("%v Shannon", new(big.Int).Div(num, Shannon))
case num.Cmp(Turing) >= 0: case num.Cmp(Babbage) >= 0:
return fmt.Sprintf("%v Turing", new(big.Int).Div(num, Turing)) return fmt.Sprintf("%v Babbage", new(big.Int).Div(num, Babbage))
case num.Cmp(Eins) >= 0: case num.Cmp(Ada) >= 0:
return fmt.Sprintf("%v Eins", new(big.Int).Div(num, Eins)) return fmt.Sprintf("%v Ada", new(big.Int).Div(num, Ada))
} }
return fmt.Sprintf("%v Wei", num) return fmt.Sprintf("%v Wei", num)

@ -26,15 +26,15 @@ func TestCommon(t *testing.T) {
t.Error("Got", szabo) t.Error("Got", szabo)
} }
if vito != "10 Vita" { if vito != "10 Shannon" {
t.Error("Got", vito) t.Error("Got", vito)
} }
if turing != "10 Turing" { if turing != "10 Babbage" {
t.Error("Got", turing) t.Error("Got", turing)
} }
if eins != "10 Eins" { if eins != "10 Ada" {
t.Error("Got", eins) t.Error("Got", eins)
} }

Loading…
Cancel
Save