Merge pull request #2185 from CortexFoundation/dev

get rid of custom MaxUint64 and MaxUint64
CortexFoundation · Oct 31, 2024 · aec0024 · aec0024
2 parents dd9bf95 + dc3a41c
commit aec0024
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 74 deletions.
diff --git a/common/math/big_test.go b/common/math/big_test.go
@@ -270,48 +270,3 @@ func TestLittleEndianByteAt(t *testing.T) {
 
 	}
 }
-
-func TestS256(t *testing.T) {
-	tests := []struct{ x, y *big.Int }{
-		{x: big.NewInt(0), y: big.NewInt(0)},
-		{x: big.NewInt(1), y: big.NewInt(1)},
-		{x: big.NewInt(2), y: big.NewInt(2)},
-		{
-			x: new(big.Int).Sub(BigPow(2, 255), big.NewInt(1)),
-			y: new(big.Int).Sub(BigPow(2, 255), big.NewInt(1)),
-		},
-		{
-			x: BigPow(2, 255),
-			y: new(big.Int).Neg(BigPow(2, 255)),
-		},
-		{
-			x: new(big.Int).Sub(BigPow(2, 256), big.NewInt(1)),
-			y: big.NewInt(-1),
-		},
-		{
-			x: new(big.Int).Sub(BigPow(2, 256), big.NewInt(2)),
-			y: big.NewInt(-2),
-		},
-	}
-	for _, test := range tests {
-		if y := S256(test.x); y.Cmp(test.y) != 0 {
-			t.Errorf("S256(%x) = %x, want %x", test.x, y, test.y)
-		}
-	}
-}
-
-func TestExp(t *testing.T) {
-	tests := []struct{ base, exponent, result *big.Int }{
-		{base: big.NewInt(0), exponent: big.NewInt(0), result: big.NewInt(1)},
-		{base: big.NewInt(1), exponent: big.NewInt(0), result: big.NewInt(1)},
-		{base: big.NewInt(1), exponent: big.NewInt(1), result: big.NewInt(1)},
-		{base: big.NewInt(1), exponent: big.NewInt(2), result: big.NewInt(1)},
-		{base: big.NewInt(3), exponent: big.NewInt(144), result: MustParseBig256("507528786056415600719754159741696356908742250191663887263627442114881")},
-		{base: big.NewInt(2), exponent: big.NewInt(255), result: MustParseBig256("57896044618658097711785492504343953926634992332820282019728792003956564819968")},
-	}
-	for _, test := range tests {
-		if result := Exp(test.base, test.exponent); result.Cmp(test.result) != 0 {
-			t.Errorf("Exp(%d, %d) = %d, want %d", test.base, test.exponent, result, test.result)
-		}
-	}
-}
diff --git a/common/math/integer.go b/common/math/integer.go
@@ -22,22 +22,6 @@ import (
 	"strconv"
 )
 
-// Integer limit values.
-const (
-	MaxInt8   = 1<<7 - 1
-	MinInt8   = -1 << 7
-	MaxInt16  = 1<<15 - 1
-	MinInt16  = -1 << 15
-	MaxInt32  = 1<<31 - 1
-	MinInt32  = -1 << 31
-	MaxInt64  = 1<<63 - 1
-	MinInt64  = -1 << 63
-	MaxUint8  = 1<<8 - 1
-	MaxUint16 = 1<<16 - 1
-	MaxUint32 = 1<<32 - 1
-	MaxUint64 = 1<<64 - 1
-)
-
 // HexOrDecimal64 marshals uint64 as hex or decimal.
 type HexOrDecimal64 uint64
 

diff --git a/common/math/integer_test.go b/common/math/integer_test.go
@@ -17,6 +17,7 @@
 package math
 
 import (
+	"math"
 	"testing"
 )
 
@@ -36,8 +37,8 @@ func TestOverflow(t *testing.T) {
 		op       operation
 	}{
 		// add operations
-		{MaxUint64, 1, true, add},
-		{MaxUint64 - 1, 1, false, add},
+		{math.MaxUint64, 1, true, add},
+		{math.MaxUint64 - 1, 1, false, add},
 
 		// sub operations
 		{0, 1, true, sub},
@@ -46,8 +47,8 @@ func TestOverflow(t *testing.T) {
 		// mul operations
 		{0, 0, false, mul},
 		{10, 10, false, mul},
-		{MaxUint64, 2, true, mul},
-		{MaxUint64, 1, false, mul},
+		{math.MaxUint64, 2, true, mul},
+		{math.MaxUint64, 1, false, mul},
 	} {
 		var overflows bool
 		switch test.op {

diff --git a/core/blockchain_test.go b/core/blockchain_test.go
@@ -17,6 +17,9 @@
 package core
 
 import (
+	"errors"
+	"fmt"
+	gomath "math"
 	"math/big"
 	"testing"
 

diff --git a/core/rawdb/freezer_batch.go b/core/rawdb/freezer_batch.go
@@ -18,10 +18,10 @@ package rawdb
 
 import (
 	"fmt"
+	"math"
 
 	"github.com/golang/snappy"
 
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 	"github.com/CortexFoundation/CortexTheseus/rlp"
 )
 

diff --git a/core/rawdb/freezer_memory.go b/core/rawdb/freezer_memory.go
@@ -19,10 +19,10 @@ package rawdb
 import (
 	"errors"
 	"fmt"
+	"math"
 	"sync"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 	"github.com/CortexFoundation/CortexTheseus/ctxcdb"
 	"github.com/CortexFoundation/CortexTheseus/log"
 	"github.com/CortexFoundation/CortexTheseus/rlp"

diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go
@@ -20,13 +20,13 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
+	"math"
 	"math/big"
 	"time"
 
 	"github.com/VictoriaMetrics/fastcache"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 	"github.com/CortexFoundation/CortexTheseus/core/rawdb"
 	"github.com/CortexFoundation/CortexTheseus/core/types"
 	"github.com/CortexFoundation/CortexTheseus/ctxcdb"

diff --git a/core/types/block_test.go b/core/types/block_test.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"hash"
+	gomath "math"
 	"math/big"
 	"reflect"
 	"testing"

diff --git a/core/vm/common.go b/core/vm/common.go
@@ -17,10 +17,11 @@
 package vm
 
 import (
+	"math"
+
 	"github.com/holiman/uint256"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 )
 
 // calcMemSize64 calculates the required memory size, and returns

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -21,6 +21,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	gomath "math"
 	"math/big"
 
 	"github.com/consensys/gnark-crypto/ecc"
@@ -379,7 +380,7 @@ func (c *bigModExp) RequiredGas(input []byte) uint64 {
 		// 2. Different divisor (`GQUADDIVISOR`) (3)
 		gas.Div(gas, big3)
 		if gas.BitLen() > 64 {
-			return math.MaxUint64
+			return gomath.MaxUint64
 		}
 		// 3. Minimum price of 200 gas
 		if gas.Uint64() < 200 {
@@ -392,7 +393,7 @@ func (c *bigModExp) RequiredGas(input []byte) uint64 {
 	gas.Div(gas, big20)
 
 	if gas.BitLen() > 64 {
-		return math.MaxUint64
+		return gomath.MaxUint64
 	}
 	return gas.Uint64()
 }

diff --git a/internal/ctxcapi/api.go b/internal/ctxcapi/api.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"math/big"
 	"time"
 
@@ -29,7 +30,6 @@ import (
 	"github.com/CortexFoundation/CortexTheseus/accounts/keystore"
 	"github.com/CortexFoundation/CortexTheseus/common"
 	"github.com/CortexFoundation/CortexTheseus/common/hexutil"
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 	"github.com/CortexFoundation/CortexTheseus/consensus/cuckoo"
 	"github.com/CortexFoundation/CortexTheseus/core"
 	"github.com/CortexFoundation/CortexTheseus/core/rawdb"

diff --git a/params/config_test.go b/params/config_test.go
@@ -17,9 +17,13 @@
 package params
 
 import (
+	"math"
 	"math/big"
 	"reflect"
 	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestCheckCompatible(t *testing.T) {

diff --git a/rlp/decode_test.go b/rlp/decode_test.go
@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	gomath "math"
 	"math/big"
 	"reflect"
 	"strings"
@@ -546,7 +547,7 @@ var decodeTests = []decodeTest{
 	// uint256
 	{input: "80", ptr: new(*uint256.Int), value: uint256.NewInt(0)},
 	{input: "01", ptr: new(*uint256.Int), value: uint256.NewInt(1)},
-	{input: "88FFFFFFFFFFFFFFFF", ptr: new(*uint256.Int), value: uint256.NewInt(math.MaxUint64)},
+	{input: "88FFFFFFFFFFFFFFFF", ptr: new(*uint256.Int), value: uint256.NewInt(gomath.MaxUint64)},
 	{input: "89FFFFFFFFFFFFFFFFFF", ptr: new(*uint256.Int), value: veryBigInt256},
 	{input: "10", ptr: new(uint256.Int), value: *uint256.NewInt(16)}, // non-pointer also works
 

diff --git a/rpc/types_test.go b/rpc/types_test.go
@@ -18,11 +18,11 @@ package rpc
 
 import (
 	"encoding/json"
+	"math"
 	"reflect"
 	"testing"
 
 	"github.com/CortexFoundation/CortexTheseus/common"
-	"github.com/CortexFoundation/CortexTheseus/common/math"
 )
 
 func TestBlockNumberJSONUnmarshal(t *testing.T) {