Fix tests

Fantom-foundation · Sep 20, 2024 · 70deec1 · 70deec1
1 parent e345a83
commit 70deec1
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 39 deletions.
diff --git a/cmd/aida-rpc/rpc_test.go b/cmd/aida-rpc/rpc_test.go
@@ -42,7 +42,7 @@ func TestRpc_AllDbEventsAreIssuedInOrder_Sequential(t *testing.T) {
 	archiveThree := state.NewMockNonCommittableStateDB(ctrl)
 	archiveFour := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	// Simulate the execution of four requests in three blocks.
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -99,7 +99,7 @@ func TestRpc_AllDbEventsAreIssuedInOrder_Parallel(t *testing.T) {
 	archiveTwo := state.NewMockNonCommittableStateDB(ctrl)
 	archiveThree := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.Workers = 2
 	// Simulate the execution of four requests in three blocks.
 	provider.EXPECT().
@@ -154,7 +154,7 @@ func TestRpc_AllTransactionsAreProcessedInOrder_Sequential(t *testing.T) {
 	ext := executor.NewMockExtension[*rpc.RequestAndResults](ctrl)
 	processor := executor.NewMockProcessor[*rpc.RequestAndResults](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	// Simulate the execution of four requests in three blocks.
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -231,7 +231,7 @@ func TestRpc_AllTransactionsAreProcessed_Parallel(t *testing.T) {
 	ext := executor.NewMockExtension[*rpc.RequestAndResults](ctrl)
 	processor := executor.NewMockProcessor[*rpc.RequestAndResults](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.Workers = 2
 	// Simulate the execution of four requests in three blocks.
 	provider.EXPECT().
@@ -304,7 +304,7 @@ func TestRpc_ValidationDoesNotFailOnValidTransaction_Sequential(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	var err error
 	reqBlockTwo.Response.Result, err = json.Marshal("0x1")
 	if err != nil {
@@ -338,7 +338,7 @@ func TestRpc_ValidationDoesNotFailOnValidTransaction_Parallel(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	var err error
 	reqBlockTwo.Response.Result, err = json.Marshal("0x1")
@@ -373,7 +373,7 @@ func TestRpc_ValidationFailsOnValidTransaction_Sequential(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	var err error
 	reqBlockTwo.Response.Result, err = json.Marshal("0x1")
 	if err != nil {
@@ -411,7 +411,7 @@ func TestRpc_ValidationFailsOnValidTransaction_Parallel(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	var err error
 	reqBlockTwo.Response.Result, err = json.Marshal("0x1")

diff --git a/cmd/aida-sdb/record_test.go b/cmd/aida-sdb/record_test.go
@@ -38,7 +38,7 @@ func TestSdbRecord_AllDbEventsAreIssuedInOrder(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	path := t.TempDir() + "test_trace"
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 10, 11, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 10, 11, false, "")
 	cfg.TraceFile = path
 	cfg.SyncPeriodLength = 1
 	provider.EXPECT().

diff --git a/cmd/aida-vm-adb/run_vm_adb_test.go b/cmd/aida-vm-adb/run_vm_adb_test.go
@@ -44,7 +44,7 @@ func TestVmAdb_AllDbEventsAreIssuedInOrder_Sequential(t *testing.T) {
 	archiveBlockTwo := state.NewMockNonCommittableStateDB(ctrl)
 	archiveBlockThree := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
@@ -128,7 +128,7 @@ func TestVmAdb_AllDbEventsAreIssuedInOrder_Parallel(t *testing.T) {
 	archiveBlockTwo := state.NewMockNonCommittableStateDB(ctrl)
 	archiveBlockThree := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	cfg.Workers = 2
 	// Simulate the execution of three transactions in two blocks.
@@ -221,7 +221,7 @@ func TestVmAdb_AllTransactionsAreProcessedInOrder_Sequential(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -302,7 +302,7 @@ func TestVmAdb_AllTransactionsAreProcessed_Parallel(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.Workers = 2
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
@@ -383,7 +383,7 @@ func TestVmAdb_ValidationDoesNotFailOnValidTransaction_Sequential(t *testing.T)
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {
@@ -433,7 +433,7 @@ func TestVmAdb_ValidationDoesNotFailOnValidTransaction_Parallel(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -483,7 +483,7 @@ func TestVmAdb_ValidationFailsOnInvalidTransaction_Sequential(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {
@@ -524,7 +524,7 @@ func TestVmAdb_ValidationFailsOnInvalidTransaction_Parallel(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).

diff --git a/cmd/aida-vm-sdb/run_eth_test.go b/cmd/aida-vm-sdb/run_eth_test.go
@@ -38,8 +38,9 @@ func TestVmSdb_Eth_AllDbEventsAreIssuedInOrder(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, false, "Cancun")
 	cfg.ContinueOnFailure = true
+
 	data := ethtest.CreateTestTransaction(t)
 
 	provider.EXPECT().
@@ -101,7 +102,7 @@ func TestVmSdb_Eth_AllTransactionsAreProcessedInOrder(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, false, "Cancun")
 	data := ethtest.CreateTestTransaction(t)
 
 	// Simulate the execution of three transactions in two blocks.
@@ -173,7 +174,7 @@ func TestVmSdb_Eth_ValidationDoesNotFailOnValidTransaction(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, true, "Cancun")
 	data := ethtest.CreateTestTransaction(t)
 
 	provider.EXPECT().
@@ -233,7 +234,7 @@ func TestVmSdb_Eth_ValidationDoesFailOnInvalidTransaction(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.EthTestsChainID, 2, 4, true, "Cancun")
 	data := ethtest.CreateTestTransaction(t)
 
 	provider.EXPECT().

diff --git a/cmd/aida-vm-sdb/run_substate_test.go b/cmd/aida-vm-sdb/run_substate_test.go
@@ -43,7 +43,7 @@ func TestVmSdb_Substate_AllDbEventsAreIssuedInOrder(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
@@ -129,7 +129,7 @@ func TestVmSdb_Substate_AllTransactionsAreProcessedInOrder(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -208,7 +208,7 @@ func TestVmSdb_Substate_ValidationDoesNotFailOnValidTransaction(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {
@@ -258,7 +258,7 @@ func TestVmSdb_Substate_ValidationFailsOnInvalidTransaction(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {

diff --git a/cmd/aida-vm-sdb/run_tx_generator_test.go b/cmd/aida-vm-sdb/run_tx_generator_test.go
@@ -39,7 +39,7 @@ func TestVmSdb_TxGenerator_AllTransactionsAreProcessedInOrder(t *testing.T) {
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	// Simulate the execution of four transactions in three blocks.
 	provider.EXPECT().
 		Run(2, 4, gomock.Any()).

diff --git a/cmd/aida-vm/run_vm_test.go b/cmd/aida-vm/run_vm_test.go
@@ -42,7 +42,7 @@ func TestVm_AllDbEventsAreIssuedInOrder_Sequential(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
@@ -107,7 +107,7 @@ func TestVm_AllTransactionsAreProcessedInOrder_Sequential(t *testing.T) {
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	// Simulate the execution of three transactions in two blocks.
 	provider.EXPECT().
@@ -163,7 +163,7 @@ func TestVm_AllTransactionsAreProcessedInOrder_Parallel(t *testing.T) {
 	processor := executor.NewMockProcessor[txcontext.TxContext](ctrl)
 	ext := executor.NewMockExtension[txcontext.TxContext](ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, false, "")
 	cfg.ContinueOnFailure = true
 	cfg.Workers = 2
 	// Simulate the execution of three transactions in two blocks.
@@ -237,7 +237,7 @@ func TestVmAdb_ValidationDoesNotFailOnValidTransaction_Sequential(t *testing.T)
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {
@@ -285,7 +285,7 @@ func TestVmAdb_ValidationDoesNotFailOnValidTransaction_Parallel(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
@@ -334,7 +334,7 @@ func TestVm_ValidationFailsOnInvalidTransaction_Sequential(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).
 		DoAndReturn(func(_ int, _ int, consumer executor.Consumer[txcontext.TxContext]) error {
@@ -372,7 +372,7 @@ func TestVm_ValidationFailsOnInvalidTransaction_Parallel(t *testing.T) {
 	provider := executor.NewMockProvider[txcontext.TxContext](ctrl)
 	db := state.NewMockStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true)
+	cfg := utils.NewTestConfig(t, utils.MainnetChainID, 2, 4, true, "")
 	cfg.Workers = 2
 	provider.EXPECT().
 		Run(2, 5, gomock.Any()).

diff --git a/executor/extension/statedb/archive_inquirer_test.go b/executor/extension/statedb/archive_inquirer_test.go
@@ -95,7 +95,7 @@ func TestArchiveInquirer_RunsRandomTransactionsInBackground(t *testing.T) {
 	db := state.NewMockStateDB(ctrl)
 	archive := state.NewMockNonCommittableStateDB(ctrl)
 
-	cfg := utils.NewTestConfig(t, utils.TestnetChainID, 0, 0, false)
+	cfg := utils.NewTestConfig(t, utils.TestnetChainID, 0, 0, false, "")
 	cfg.ArchiveMode = true
 	cfg.ArchiveQueryRate = 100
 	cfg.ArchiveMaxQueryAge = 100

diff --git a/executor/extension/tracker/block_progress_tracker_test.go b/executor/extension/tracker/block_progress_tracker_test.go
@@ -71,7 +71,7 @@ func TestSubstateProgressTrackerExtension_LoggingHappens(t *testing.T) {
 		Result: &substate.Result{
 			Status: 0,
 		},
-	}, nil)
+	})
 
 	gomock.InOrder(
 		db.EXPECT().GetMemoryUsage().Return(&state.MemoryUsage{UsedBytes: 1234}),
@@ -141,7 +141,7 @@ func TestSubstateProgressTrackerExtension_FirstLoggingIsIgnored(t *testing.T) {
 		Result: &substate.Result{
 			Status: 0,
 		},
-	}, nil)
+	})
 
 	ext.PreRun(executor.State[txcontext.TxContext]{
 		Block:       4,

diff --git a/executor/transaction_processor_test.go b/executor/transaction_processor_test.go
@@ -31,7 +31,7 @@ func TestPrepareBlockCtx(t *testing.T) {
 	gaslimit := uint64(10000000)
 	blocknum := uint64(4600000)
 	basefee := big.NewInt(12345)
-	env := substatecontext.NewBlockEnvironment(&substate.Env{Difficulty: big.NewInt(1), GasLimit: gaslimit, Number: blocknum, Timestamp: 1675961395, BaseFee: basefee}, nil)
+	env := substatecontext.NewBlockEnvironment(&substate.Env{Difficulty: big.NewInt(1), GasLimit: gaslimit, Number: blocknum, Timestamp: 1675961395, BaseFee: basefee})
 
 	var hashError error
 	// BlockHashes are nil, expect an error

diff --git a/utils/config.go b/utils/config.go
@@ -279,8 +279,8 @@ func NewConfigContext(cfg *Config, ctx *cli.Context) *configContext {
 }
 
 // NewTestConfig creates a new config for test purpose
-func NewTestConfig(t *testing.T, chainId ChainID, first, last uint64, validate bool) *Config {
-	chainCfg, err := getChainConfig(chainId, "")
+func NewTestConfig(t *testing.T, chainId ChainID, first, last uint64, validate bool, fork string) *Config {
+	chainCfg, err := getChainConfig(chainId, fork)
 	if err != nil {
 		t.Fatalf("cannot get chain cfg: %v", err)
 	}