Changing the forced batch tests to use genesisBlockNumber from the te…

…st.genesis.config.json. Signed-off-by: Nikolay Nedkov <nikolai_nedkov@yahoo.com>
0xPolygonHermez · Oct 18, 2023 · d005c03 · d005c03
1 parent a96fd9f
commit d005c03
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 18 deletions.
diff --git a/ci/e2e-group10/forced_batches_vector_group2_test.go b/ci/e2e-group10/forced_batches_vector_group2_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/0xPolygonHermez/zkevm-node/config"
 	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
 	"github.com/0xPolygonHermez/zkevm-node/hex"
 	"github.com/0xPolygonHermez/zkevm-node/log"
@@ -30,7 +31,11 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 	}
 	vectorFilesDir := "./../vectors/src/state-transition/forced-tx/group2"
 	ctx := context.Background()
-	err := filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
+	genesisFileAsStr, err := config.LoadGenesisFileAsString("../../test/config/test.genesis.config.json")
+	require.NoError(t, err)
+	genesisConfig, err := config.LoadGenesisFromJSONString(genesisFileAsStr)
+	require.NoError(t, err)
+	err = filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -59,7 +64,8 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 				log.Info("# Setting Genesis #")
 				log.Info("###################")
 				genesisActions := vectors.GenerateGenesisActions(testCase.Genesis)
-				require.NoError(t, opsman.SetGenesis(genesisActions))
+
+				require.NoError(t, opsman.SetGenesis(genesisConfig.Genesis.GenesisBlockNum, genesisActions))
 				require.NoError(t, opsman.Setup())
 
 				// Check initial root

diff --git a/ci/e2e-group11/forced_batches_vector_group3_test.go b/ci/e2e-group11/forced_batches_vector_group3_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/0xPolygonHermez/zkevm-node/config"
 	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
 	"github.com/0xPolygonHermez/zkevm-node/hex"
 	"github.com/0xPolygonHermez/zkevm-node/log"
@@ -34,7 +35,11 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 	}
 	vectorFilesDir := "./../vectors/src/state-transition/forced-tx/group3"
 	ctx := context.Background()
-	err := filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
+	genesisFileAsStr, err := config.LoadGenesisFileAsString("../../test/config/test.genesis.config.json")
+	require.NoError(t, err)
+	genesisConfig, err := config.LoadGenesisFromJSONString(genesisFileAsStr)
+	require.NoError(t, err)
+	err = filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -63,7 +68,7 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 				log.Info("# Setting Genesis #")
 				log.Info("###################")
 				genesisActions := vectors.GenerateGenesisActions(testCase.Genesis)
-				require.NoError(t, opsman.SetGenesis(genesisActions))
+				require.NoError(t, opsman.SetGenesis(genesisConfig.Genesis.GenesisBlockNum, genesisActions))
 				require.NoError(t, opsman.Setup())
 
 				// Check initial root

diff --git a/ci/e2e-group9/forced_batches_vector_group1_test.go b/ci/e2e-group9/forced_batches_vector_group1_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/0xPolygonHermez/zkevm-node/config"
 	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
 	"github.com/0xPolygonHermez/zkevm-node/hex"
 	"github.com/0xPolygonHermez/zkevm-node/log"
@@ -34,7 +35,11 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 	}
 	vectorFilesDir := "./../vectors/src/state-transition/forced-tx/group1"
 	ctx := context.Background()
-	err := filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
+	genesisFileAsStr, err := config.LoadGenesisFileAsString("../../test/config/test.genesis.config.json")
+	require.NoError(t, err)
+	genesisConfig, err := config.LoadGenesisFromJSONString(genesisFileAsStr)
+	require.NoError(t, err)
+	err = filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -63,7 +68,7 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 				log.Info("# Setting Genesis #")
 				log.Info("###################")
 				genesisActions := vectors.GenerateGenesisActions(testCase.Genesis)
-				require.NoError(t, opsman.SetGenesis(genesisActions))
+				require.NoError(t, opsman.SetGenesis(genesisConfig.Genesis.GenesisBlockNum, genesisActions))
 				require.NoError(t, opsman.SetForkID(forkID6))
 				require.NoError(t, opsman.Setup())
 

diff --git a/config/network.go b/config/network.go
@@ -71,22 +71,23 @@ func (cfg *Config) loadNetworkConfig(ctx *cli.Context) {
 		networkJSON = TestnetNetworkConfigJSON
 	case string(custom):
 		var err error
-		networkJSON, err = loadGenesisFileAsString(ctx)
+		cfgPath := ctx.String(FlagCustomNetwork)
+		networkJSON, err = LoadGenesisFileAsString(cfgPath)
 		if err != nil {
 			panic(err.Error())
 		}
 	default:
 		log.Fatalf("unsupported --network value. Must be one of: [%s, %s, %s]", mainnet, testnet, custom)
 	}
-	config, err := loadGenesisFromJSONString(networkJSON)
+	config, err := LoadGenesisFromJSONString(networkJSON)
 	if err != nil {
 		panic(fmt.Errorf("failed to load genesis configuration from file. Error: %v", err))
 	}
 	cfg.NetworkConfig = config
 }
 
-func loadGenesisFileAsString(ctx *cli.Context) (string, error) {
-	cfgPath := ctx.String(FlagCustomNetwork)
+// LoadGenesisFileAsString loads the genesis file as a string
+func LoadGenesisFileAsString(cfgPath string) (string, error) {
 	if cfgPath != "" {
 		f, err := os.Open(cfgPath) //nolint:gosec
 		if err != nil {
@@ -109,7 +110,8 @@ func loadGenesisFileAsString(ctx *cli.Context) (string, error) {
 	}
 }
 
-func loadGenesisFromJSONString(jsonStr string) (NetworkConfig, error) {
+// LoadGenesisFromJSONString loads the genesis file from JSON string
+func LoadGenesisFromJSONString(jsonStr string) (NetworkConfig, error) {
 	var cfg NetworkConfig
 
 	var cfgJSON GenesisFromJSON

diff --git a/test/e2e/forced_batches_vector_test.go b/test/e2e/forced_batches_vector_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/0xPolygonHermez/zkevm-node/config"
 	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
 	"github.com/0xPolygonHermez/zkevm-node/hex"
 	"github.com/0xPolygonHermez/zkevm-node/log"
@@ -34,7 +35,11 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 	}
 	vectorFilesDir := "./../vectors/src/state-transition/forced-tx"
 	ctx := context.Background()
-	err := filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
+	genesisFileAsStr, err := config.LoadGenesisFileAsString("../config/test.genesis.config.json")
+	require.NoError(t, err)
+	genesisConfig, err := config.LoadGenesisFromJSONString(genesisFileAsStr)
+	require.NoError(t, err)
+	err = filepath.Walk(vectorFilesDir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -63,7 +68,7 @@ func TestForcedBatchesVectorFiles(t *testing.T) {
 				log.Info("# Setting Genesis #")
 				log.Info("###################")
 				genesisActions := vectors.GenerateGenesisActions(testCase.Genesis)
-				require.NoError(t, opsman.SetGenesis(genesisActions))
+				require.NoError(t, opsman.SetGenesis(genesisConfig.Genesis.GenesisBlockNum, genesisActions))
 				require.NoError(t, opsman.Setup())
 
 				// Check initial root

diff --git a/test/e2e/state_test.go b/test/e2e/state_test.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/0xPolygonHermez/zkevm-node/config"
 	"github.com/0xPolygonHermez/zkevm-node/encoding"
 	"github.com/0xPolygonHermez/zkevm-node/state"
 	"github.com/0xPolygonHermez/zkevm-node/test/operations"
@@ -30,6 +31,10 @@ func TestStateTransition(t *testing.T) {
 	// Load test vectors
 	testCases, err := vectors.LoadStateTransitionTestCases("./../vectors/src/state-transition/no-data/general.json")
 	require.NoError(t, err)
+	genesisFileAsStr, err := config.LoadGenesisFileAsString("../config/test.genesis.config.json")
+	require.NoError(t, err)
+	genesisConfig, err := config.LoadGenesisFromJSONString(genesisFileAsStr)
+	require.NoError(t, err)
 
 	for _, testCase := range testCases {
 		t.Run(testCase.Description, func(t *testing.T) {
@@ -54,7 +59,7 @@ func TestStateTransition(t *testing.T) {
 			for _, gacc := range testCase.GenesisAccounts {
 				genesisAccounts[gacc.Address] = gacc.Balance.Int
 			}
-			require.NoError(t, opsman.SetGenesisAccountsBalance(genesisAccounts))
+			require.NoError(t, opsman.SetGenesisAccountsBalance(genesisConfig.Genesis.GenesisBlockNum, genesisAccounts))
 
 			// Check initial root
 			require.NoError(t, opsman.CheckVirtualRoot(testCase.ExpectedOldRoot))

diff --git a/test/operations/manager.go b/test/operations/manager.go
@@ -137,7 +137,7 @@ func (m *Manager) CheckConsolidatedRoot(expectedRoot string) error {
 }
 
 // SetGenesisAccountsBalance creates the genesis block in the state.
-func (m *Manager) SetGenesisAccountsBalance(genesisAccounts map[string]big.Int) error {
+func (m *Manager) SetGenesisAccountsBalance(genesisBlockNumber uint64, genesisAccounts map[string]big.Int) error {
 	var genesisActions []*state.GenesisAction
 	for address, balanceValue := range genesisAccounts {
 		action := &state.GenesisAction{
@@ -148,12 +148,12 @@ func (m *Manager) SetGenesisAccountsBalance(genesisAccounts map[string]big.Int)
 		genesisActions = append(genesisActions, action)
 	}
 
-	return m.SetGenesis(genesisActions)
+	return m.SetGenesis(genesisBlockNumber, genesisActions)
 }
 
-func (m *Manager) SetGenesis(genesisActions []*state.GenesisAction) error {
+func (m *Manager) SetGenesis(genesisBlockNumber uint64, genesisActions []*state.GenesisAction) error {
 	genesisBlock := state.Block{
-		BlockNumber: 102,
+		BlockNumber: genesisBlockNumber,
 		BlockHash:   state.ZeroHash,
 		ParentHash:  state.ZeroHash,
 		ReceivedAt:  time.Now(),