diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2017-02-28 22:09:11 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2017-02-28 22:09:11 +0800 |
| commit | 5f7826270c9e87509fd7731ec64953a5e4761de0 (patch) | |
| tree | 0d3187b115a0e10afcce1bb38ed8ba977d8bf44f /accounts/abi | |
| parent | d4f60d362b8fcf82db1accf89c146a2a71375841 (diff) | |
| download | dexon-5f7826270c9e87509fd7731ec64953a5e4761de0.tar.gz dexon-5f7826270c9e87509fd7731ec64953a5e4761de0.tar.zst dexon-5f7826270c9e87509fd7731ec64953a5e4761de0.zip | |
all: unify big.Int zero checks, use common/math in more places (#3716)
* common/math: optimize PaddedBigBytes, use it more
name old time/op new time/op delta
PaddedBigBytes-8 71.1ns ± 5% 46.1ns ± 1% -35.15% (p=0.000 n=20+19)
name old alloc/op new alloc/op delta
PaddedBigBytes-8 48.0B ± 0% 32.0B ± 0% -33.33% (p=0.000 n=20+20)
* all: unify big.Int zero checks
Various checks were in use. This commit replaces them all with Int.Sign,
which is cheaper and less code.
eg templates:
func before(x *big.Int) bool { return x.BitLen() == 0 }
func after(x *big.Int) bool { return x.Sign() == 0 }
func before(x *big.Int) bool { return x.BitLen() > 0 }
func after(x *big.Int) bool { return x.Sign() != 0 }
func before(x *big.Int) int { return x.Cmp(common.Big0) }
func after(x *big.Int) int { return x.Sign() }
* common/math, crypto/secp256k1: make ReadBits public in package math
Diffstat (limited to 'accounts/abi')
| -rw-r--r-- | accounts/abi/bind/backends/simulated.go | 2 | ||||
| -rw-r--r-- | accounts/abi/numbers.go | 2 | ||||
| -rw-r--r-- | accounts/abi/packing.go | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 5e2fcbae7..e21ffe1f8 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -237,7 +237,7 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallM if call.GasPrice == nil { call.GasPrice = big.NewInt(1) } - if call.Gas == nil || call.Gas.BitLen() == 0 { + if call.Gas == nil || call.Gas.Sign() == 0 { call.Gas = big.NewInt(50000000) } if call.Value == nil { diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 36fb6705e..10afa6511 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -59,7 +59,7 @@ var ( // U256 converts a big Int into a 256bit EVM number. func U256(n *big.Int) []byte { - return common.LeftPadBytes(math.U256(n).Bytes(), 32) + return math.PaddedBigBytes(math.U256(n), 32) } // packNum packs the given number (using the reflect value) and will cast it to appropriate number representation diff --git a/accounts/abi/packing.go b/accounts/abi/packing.go index 5054dcf13..1d7f85e2b 100644 --- a/accounts/abi/packing.go +++ b/accounts/abi/packing.go @@ -20,6 +20,7 @@ import ( "reflect" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation @@ -45,9 +46,9 @@ func packElement(t Type, reflectValue reflect.Value) []byte { return common.LeftPadBytes(reflectValue.Bytes(), 32) case BoolTy: if reflectValue.Bool() { - return common.LeftPadBytes(common.Big1.Bytes(), 32) + return math.PaddedBigBytes(common.Big1, 32) } else { - return common.LeftPadBytes(common.Big0.Bytes(), 32) + return math.PaddedBigBytes(common.Big0, 32) } case BytesTy: if reflectValue.Kind() == reflect.Array { |