diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-12 03:56:59 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-12 03:56:59 +0800 |
| commit | 8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1 (patch) | |
| tree | 3cf67a559ef450500ddfd7df9d457f3e1a994caf /ethutil | |
| parent | 9ee6295c752a518603de01e4feaec787c61a5dcf (diff) | |
| parent | 1938bfcddfd2722880a692c59cad344b611711c8 (diff) | |
| download | dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar.gz dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar.bz2 dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar.lz dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar.xz dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.tar.zst dexon-8a2e50ab2a6c903a6ab3ab10a74c37e1f3b8f3f1.zip | |
Merge branch 'develop' into interop
Conflicts:
peer.go
Diffstat (limited to 'ethutil')
| -rw-r--r-- | ethutil/big.go | 4 | ||||
| -rw-r--r-- | ethutil/common.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ethutil/big.go b/ethutil/big.go index 1c25a4784..7af6f7414 100644 --- a/ethutil/big.go +++ b/ethutil/big.go @@ -68,8 +68,8 @@ func BigCopy(src *big.Int) *big.Int { // Returns the maximum size big integer func BigMax(x, y *big.Int) *big.Int { if x.Cmp(y) <= 0 { - return x + return y } - return y + return x } diff --git a/ethutil/common.go b/ethutil/common.go index c7973eb92..ddaf78f88 100644 --- a/ethutil/common.go +++ b/ethutil/common.go @@ -18,8 +18,8 @@ var ( Wei = big.NewInt(1) ) -// Currency to string // +// Currency to string // Returns a string representing a human readable format func CurrencyToString(num *big.Int) string { switch { |