From 2109d9f1cf27cd4b60990c1da47f5b825dde8192 Mon Sep 17 00:00:00 2001 From: arnau <17317030+arnaucube@users.noreply.github.com> Date: Thu, 6 Aug 2020 12:47:32 +0200 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Eduard S. --- common/leaf.go | 6 +----- common/tx.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/common/leaf.go b/common/leaf.go index 87b5445..156c750 100644 --- a/common/leaf.go +++ b/common/leaf.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/binary" "fmt" - "math" "math/big" eth "github.com/ethereum/go-ethereum/common" @@ -28,7 +27,7 @@ type Leaf struct { func (l *Leaf) Bytes() ([32 * NLEAFELEMS]byte, error) { var b [32 * NLEAFELEMS]byte - if l.Nonce >= uint64(math.Pow(2, 40)) { + if l.Nonce > 0xffffffffff { return b, fmt.Errorf("%s Nonce", ErrNumOverflow) } if len(l.Balance.Bytes()) > 24 { @@ -102,9 +101,6 @@ func LeafFromBytes(b [32 * NLEAFELEMS]byte) (*Leaf, error) { var nonceBytes [8]byte copy(nonceBytes[:], b[4:9]) nonce := binary.LittleEndian.Uint64(nonceBytes[:]) - if nonce >= uint64(math.Pow(2, 40)) { - return nil, fmt.Errorf("%s Nonce", ErrNumOverflow) - } sign := b[10] == 1 balance := new(big.Int).SetBytes(SwapEndianness(b[32:56])) // b[32:56], as Balance is 192 bits (24 bytes) if !bytes.Equal(b[56:64], []byte{0, 0, 0, 0, 0, 0, 0, 0}) { diff --git a/common/tx.go b/common/tx.go index 393b9ef..3f2156f 100644 --- a/common/tx.go +++ b/common/tx.go @@ -22,7 +22,7 @@ func (idx Idx) BigInt() *big.Int { // IdxFromBigInt converts a *big.Int to Idx type func IdxFromBigInt(b *big.Int) (Idx, error) { - if b.Int64() > 4294967295 { // 2**32-1 + if b.Int64() > 0xffffffff { // 2**32-1 return 0, ErrNumOverflow } return Idx(uint32(b.Int64())), nil