Merge remote-tracking branch 'ethereum/conversion' into conversion

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