From ab72803e6f171d6fc2c40419c833853b7c122f6f Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Mon, 4 May 2020 14:09:14 +0200
Subject: [PATCH] accounts/abi: move U256Bytes to common/math (#21020)
---
accounts/abi/abi_test.go | 3 +-
accounts/abi/bind/template.go | 1 -
accounts/abi/numbers.go | 7 ----
accounts/abi/numbers_test.go | 33 -------------------
accounts/abi/pack.go | 6 ++--
common/math/big.go | 6 ++++
common/math/big_test.go | 10 ++++++
contracts/checkpointoracle/contract/oracle.go | 1 -
signer/core/signed_data.go | 3 +-
9 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 accounts/abi/numbers_test.go
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index 16625ec80..713dbebbe 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -27,6 +27,7 @@ import (
"testing"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/crypto"
)
@@ -601,7 +602,7 @@ func TestInputFixedArrayAndVariableInputLength(t *testing.T) {
strvalue = common.RightPadBytes([]byte(strin), 32)
fixedarrin1value1 = common.LeftPadBytes(fixedarrin1[0].Bytes(), 32)
fixedarrin1value2 = common.LeftPadBytes(fixedarrin1[1].Bytes(), 32)
- dynarroffset = U256(big.NewInt(int64(256 + ((len(strin)/32)+1)*32)))
+ dynarroffset = math.U256Bytes(big.NewInt(int64(256 + ((len(strin)/32)+1)*32)))
dynarrlength = make([]byte, 32)
dynarrlength[31] = byte(len(dynarrin))
dynarrinvalue1 = common.LeftPadBytes(dynarrin[0].Bytes(), 32)
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
index c361a49f8..555c1803e 100644
--- a/accounts/abi/bind/template.go
+++ b/accounts/abi/bind/template.go
@@ -103,7 +103,6 @@ var (
_ = big.NewInt
_ = strings.NewReader
_ = ethereum.NotFound
- _ = abi.U256
_ = bind.Bind
_ = common.Big1
_ = types.BloomLookup
diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go
index 770bf7341..03cbc7085 100644
--- a/accounts/abi/numbers.go
+++ b/accounts/abi/numbers.go
@@ -21,7 +21,6 @@ import (
"reflect"
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/math"
)
var (
@@ -37,9 +36,3 @@ var (
int64T = reflect.TypeOf(int64(0))
addressT = reflect.TypeOf(common.Address{})
)
-
-// U256 converts a big Int into a 256bit EVM number.
-// This operation is destructive.
-func U256(n *big.Int) []byte {
- return math.PaddedBigBytes(math.U256(n), 32)
-}
diff --git a/accounts/abi/numbers_test.go b/accounts/abi/numbers_test.go
deleted file mode 100644
index d25a5abcb..000000000
--- a/accounts/abi/numbers_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package abi
-
-import (
- "bytes"
- "math/big"
- "testing"
-)
-
-func TestNumberTypes(t *testing.T) {
- ubytes := make([]byte, 32)
- ubytes[31] = 1
-
- unsigned := U256(big.NewInt(1))
- if !bytes.Equal(unsigned, ubytes) {
- t.Errorf("expected %x got %x", ubytes, unsigned)
- }
-}
diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go
index dd1c9a5df..096648be1 100644
--- a/accounts/abi/pack.go
+++ b/accounts/abi/pack.go
@@ -69,11 +69,11 @@ func packElement(t Type, reflectValue reflect.Value) []byte {
func packNum(value reflect.Value) []byte {
switch kind := value.Kind(); kind {
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
- return U256(new(big.Int).SetUint64(value.Uint()))
+ return math.U256Bytes(new(big.Int).SetUint64(value.Uint()))
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- return U256(big.NewInt(value.Int()))
+ return math.U256Bytes(big.NewInt(value.Int()))
case reflect.Ptr:
- return U256(new(big.Int).Set(value.Interface().(*big.Int)))
+ return math.U256Bytes(new(big.Int).Set(value.Interface().(*big.Int)))
default:
panic("abi: fatal error")
}
diff --git a/common/math/big.go b/common/math/big.go
index d31c59af1..17a57df9d 100644
--- a/common/math/big.go
+++ b/common/math/big.go
@@ -184,6 +184,12 @@ func U256(x *big.Int) *big.Int {
return x.And(x, tt256m1)
}
+// U256Bytes converts a big Int into a 256bit EVM number.
+// This operation is destructive.
+func U256Bytes(n *big.Int) []byte {
+ return PaddedBigBytes(U256(n), 32)
+}
+
// S256 interprets x as a two's complement number.
// x must not exceed 256 bits (the result is undefined if it does) and is not modified.
//
diff --git a/common/math/big_test.go b/common/math/big_test.go
index be9810dc8..f896ec65b 100644
--- a/common/math/big_test.go
+++ b/common/math/big_test.go
@@ -212,6 +212,16 @@ func TestU256(t *testing.T) {
}
}
+func TestU256Bytes(t *testing.T) {
+ ubytes := make([]byte, 32)
+ ubytes[31] = 1
+
+ unsigned := U256Bytes(big.NewInt(1))
+ if !bytes.Equal(unsigned, ubytes) {
+ t.Errorf("expected %x got %x", ubytes, unsigned)
+ }
+}
+
func TestBigEndianByteAt(t *testing.T) {
tests := []struct {
x string
diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go
index 3bb351792..998ccb93c 100644
--- a/contracts/checkpointoracle/contract/oracle.go
+++ b/contracts/checkpointoracle/contract/oracle.go
@@ -20,7 +20,6 @@ var (
_ = big.NewInt
_ = strings.NewReader
_ = ethereum.NotFound
- _ = abi.U256
_ = bind.Bind
_ = common.Big1
_ = types.BloomLookup
diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go
index dc41fadd9..de36aa889 100644
--- a/signer/core/signed_data.go
+++ b/signer/core/signed_data.go
@@ -31,7 +31,6 @@ import (
"unicode"
"github.com/ethereum/go-ethereum/accounts"
- "github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
@@ -587,7 +586,7 @@ func (typedData *TypedData) EncodePrimitiveValue(encType string, encValue interf
if err != nil {
return nil, err
}
- return abi.U256(b), nil
+ return math.U256Bytes(b), nil
}
return nil, fmt.Errorf("unrecognized type '%s'", encType)
--
GitLab