diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-20 23:09:44 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-20 23:09:44 +0800 |
| commit | 4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0 (patch) | |
| tree | d4622ae52bcc4c158aa26cf171a306979307bfc9 /ethutil/common.go | |
| parent | 6efdd21633c1d21f36080754a89ad82c0c244128 (diff) | |
| parent | c37b3cef7dc465832761b1da6761eeaa47e368d1 (diff) | |
| download | go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar.gz go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar.bz2 go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar.lz go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar.xz go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.tar.zst go-tangerine-4b13f93a3e0f2901a8e1aa38dfef115e24c63ef0.zip | |
Merge branch 'release/poc5-rc7'
Diffstat (limited to 'ethutil/common.go')
| -rw-r--r-- | ethutil/common.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ethutil/common.go b/ethutil/common.go index 983ea5d1b..771dfc723 100644 --- a/ethutil/common.go +++ b/ethutil/common.go @@ -7,13 +7,13 @@ import ( // The different number of units var ( - Ether = BigPow(10, 18) - Finney = BigPow(10, 15) - Szabo = BigPow(10, 12) - Vita = BigPow(10, 9) - Turing = BigPow(10, 6) - Eins = BigPow(10, 3) - Wei = big.NewInt(1) + Ether = BigPow(10, 18) + Finney = BigPow(10, 15) + Szabo = BigPow(10, 12) + Shannon = BigPow(10, 9) + Babbage = BigPow(10, 6) + Ada = BigPow(10, 3) + Wei = big.NewInt(1) ) // Currency to string @@ -27,12 +27,12 @@ func CurrencyToString(num *big.Int) string { return fmt.Sprintf("%v Finney", new(big.Int).Div(num, Finney)) case num.Cmp(Szabo) >= 0: return fmt.Sprintf("%v Szabo", new(big.Int).Div(num, Szabo)) - case num.Cmp(Vita) >= 0: - return fmt.Sprintf("%v Vita", new(big.Int).Div(num, Vita)) - case num.Cmp(Turing) >= 0: - return fmt.Sprintf("%v Turing", new(big.Int).Div(num, Turing)) - case num.Cmp(Eins) >= 0: - return fmt.Sprintf("%v Eins", new(big.Int).Div(num, Eins)) + case num.Cmp(Shannon) >= 0: + return fmt.Sprintf("%v Shannon", new(big.Int).Div(num, Shannon)) + case num.Cmp(Babbage) >= 0: + return fmt.Sprintf("%v Babbage", new(big.Int).Div(num, Babbage)) + case num.Cmp(Ada) >= 0: + return fmt.Sprintf("%v Ada", new(big.Int).Div(num, Ada)) } return fmt.Sprintf("%v Wei", num) |