aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-20 21:01:35 +0800
committerFelix Lange <fjl@twurst.com>2015-03-20 21:01:35 +0800
commit28ddc16a9b5779b6b31036e8248ed8457de7b443 (patch)
tree7508db500151bdaf0ebed726286f823e67993103 /common
parentc161d73d429ef421cdb9c75b743c16d72aa8a89a (diff)
parent01ff0b3176e6d83dcc5e6716f04301de71e3fc9e (diff)
downloaddexon-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.gz
dexon-28ddc16a9b5779b6b31036e8248ed8457de7b443.tar.zst
dexon-28ddc16a9b5779b6b31036e8248ed8457de7b443.zip
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'common')
-rw-r--r--common/big.go4
-rw-r--r--common/types.go11
2 files changed, 4 insertions, 11 deletions
diff --git a/common/big.go b/common/big.go
index 750b28f85..8fe9d8bef 100644
--- a/common/big.go
+++ b/common/big.go
@@ -104,7 +104,7 @@ 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 {
+ if x.Cmp(y) < 0 {
return y
}
@@ -115,7 +115,7 @@ func BigMax(x, y *big.Int) *big.Int {
//
// Returns the minimum size big integer
func BigMin(x, y *big.Int) *big.Int {
- if x.Cmp(y) >= 0 {
+ if x.Cmp(y) > 0 {
return y
}
diff --git a/common/types.go b/common/types.go
index 38044d5c8..daefcde11 100644
--- a/common/types.go
+++ b/common/types.go
@@ -35,10 +35,7 @@ func (h *Hash) SetBytes(b []byte) {
b = b[len(b)-hashLength:]
}
- // reverse loop
- for i := len(b) - 1; i >= 0; i-- {
- h[hashLength-len(b)+i] = b[i]
- }
+ copy(h[hashLength-len(b):], b)
}
// Set string `s` to h. If s is larger than len(h) it will panic
@@ -73,11 +70,7 @@ func (a *Address) SetBytes(b []byte) {
if len(b) > len(a) {
b = b[len(b)-addressLength:]
}
-
- // reverse loop
- for i := len(b) - 1; i >= 0; i-- {
- a[addressLength-len(b)+i] = b[i]
- }
+ copy(a[addressLength-len(b):], b)
}
// Set string `s` to a. If s is larger than len(a) it will panic