FIX: Sovereign chain simulator tests

multiversx · Oct 8, 2024 · a3d3179 · a3d3179
1 parent 0fe648c
commit a3d3179
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 31 deletions.
diff --git a/cmd/sovereignnode/chainSimulator/sovereignChainSimulator_test.go b/cmd/sovereignnode/chainSimulator/sovereignChainSimulator_test.go
@@ -34,7 +34,6 @@ func TestNewSovereignChainSimulator(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -61,7 +60,6 @@ func TestChainSimulator_GenerateBlocksShouldWork(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -91,7 +89,6 @@ func TestChainSimulator_SetState(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -118,7 +115,6 @@ func TestChainSimulator_SetEntireState(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -140,7 +136,7 @@ func TestChainSimulator_SetEntireState(t *testing.T) {
 		CodeMetadata:     "BQY=",
 		Owner:            "erd1ss6u80ruas2phpmr82r42xnkd6rxy40g9jl69frppl4qez9w2jpsqj8x97",
 		DeveloperRewards: "5401004999998",
-		Keys: map[string]string{
+		Pairs: map[string]string{
 			"73756d": "0a",
 		},
 	}
@@ -164,7 +160,6 @@ func TestChainSimulator_SetEntireStateWithRemoval(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -186,7 +181,7 @@ func TestChainSimulator_SetEntireStateWithRemoval(t *testing.T) {
 		CodeMetadata:     "BQY=",
 		Owner:            "erd1ss6u80ruas2phpmr82r42xnkd6rxy40g9jl69frppl4qez9w2jpsqj8x97",
 		DeveloperRewards: "5401004999998",
-		Keys: map[string]string{
+		Pairs: map[string]string{
 			"73756d": "0a",
 		},
 	}
@@ -210,7 +205,6 @@ func TestChainSimulator_GetAccount(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -228,15 +222,14 @@ func TestSimulator_SendTransactions(t *testing.T) {
 	chainSimulator, err := NewSovereignChainSimulator(ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSim.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/basic/basic_sc_adder_test.go b/cmd/sovereignnode/chainSimulator/tests/basic/basic_sc_adder_test.go
@@ -30,15 +30,14 @@ func TestSovereignChainSimulator_SmartContract_Adder(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -56,6 +55,9 @@ func TestSovereignChainSimulator_SmartContract_Adder(t *testing.T) {
 	require.Nil(t, err)
 	nonce := uint64(0)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	initSum := big.NewInt(123)
 	initArgs := "@" + hex.EncodeToString(initSum.Bytes())
 	deployedContractAddress := chainSim.DeployContract(t, cs, wallet.Bytes, &nonce, systemScAddress, initArgs, adderWasmPath)

diff --git a/cmd/sovereignnode/chainSimulator/tests/bridge/bridge_test.go b/cmd/sovereignnode/chainSimulator/tests/bridge/bridge_test.go
@@ -42,15 +42,14 @@ func TestSovereignChainSimulator_DeployBridgeContractsThenIssueAndDeposit(t *tes
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 			AlterConfigsFunction: func(cfg *config.Configs) {
 				// Put every enable epoch on 0
 				cfg.EpochConfig.EnableEpochs = config.EnableEpochs{
@@ -89,6 +88,9 @@ func TestSovereignChainSimulator_DeployBridgeContractsThenIssueAndDeposit(t *tes
 	})
 	require.Nil(t, err)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	wallet := dtos.WalletAddress{Bech32: initialAddress, Bytes: initialAddrBytes}
 
 	expectedESDTSafeAddressBytes, err := nodeHandler.GetCoreComponents().AddressPubKeyConverter().Decode(outGoingSubscribedAddress)

diff --git a/cmd/sovereignnode/chainSimulator/tests/delegation/delegation_test.go b/cmd/sovereignnode/chainSimulator/tests/delegation/delegation_test.go
@@ -31,15 +31,14 @@ func TestSovereignChainSimulator_NewDelegationSC(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 			AlterConfigsFunction: func(cfg *config.Configs) {
 				cfg.EpochConfig.EnableEpochs.DelegationSmartContractEnableEpoch = 0
 			},
@@ -56,6 +55,9 @@ func TestSovereignChainSimulator_NewDelegationSC(t *testing.T) {
 	require.Nil(t, err)
 	nonce := uint64(0)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	txData := "createNewDelegationContract" +
 		"@" + hex.EncodeToString(big.NewInt(0).Mul(chainSim.OneEGLD, big.NewInt(100000)).Bytes()) +
 		"@64"

diff --git a/cmd/sovereignnode/chainSimulator/tests/epochChange/epochChange_test.go b/cmd/sovereignnode/chainSimulator/tests/epochChange/epochChange_test.go
@@ -45,7 +45,7 @@ func TestSovereignChainSimulator_EpochChange(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck:   false,
+			BypassTxSignatureCheck:   true,
 			TempDir:                  t.TempDir(),
 			PathToInitialConfig:      defaultPathToInitialConfig,
 			GenesisTimestamp:         time.Now().Unix(),

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issueSc_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issueSc_test.go
@@ -41,15 +41,14 @@ func TestSovereignChainSimulator_SmartContract_IssueToken(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 			AlterConfigsFunction: func(cfg *config.Configs) {
 				cfg.SystemSCConfig.ESDTSystemSCConfig.BaseIssuingCost = issuePrice
 			},
@@ -70,6 +69,9 @@ func TestSovereignChainSimulator_SmartContract_IssueToken(t *testing.T) {
 	require.Nil(t, err)
 	nonce := uint64(0)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	deployedContractAddress := chainSim.DeployContract(t, cs, wallet.Bytes, &nonce, systemScAddress, "", issueWasmPath)
 	deployedContractAddressBech32, err := nodeHandler.GetCoreComponents().AddressPubKeyConverter().Encode(deployedContractAddress)
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issueSft_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issueSft_test.go
@@ -33,15 +33,14 @@ func TestSovereignChainSimulator_RegisterTwoSfts(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 			AlterConfigsFunction: func(cfg *config.Configs) {
 				cfg.SystemSCConfig.ESDTSystemSCConfig.BaseIssuingCost = issuePrice
 			},
@@ -58,6 +57,9 @@ func TestSovereignChainSimulator_RegisterTwoSfts(t *testing.T) {
 	require.Nil(t, err)
 	nonce := uint64(0)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	issueCost, _ := big.NewInt(0).SetString(issuePrice, 10)
 	sftName := "SFTNAME"
 	sftTicker := "SFTTICKER"
@@ -100,15 +102,14 @@ func TestSovereignChainSimulator_IssueTwoSfts(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -122,6 +123,9 @@ func TestSovereignChainSimulator_IssueTwoSfts(t *testing.T) {
 	require.Nil(t, err)
 	nonce := uint64(0)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	issueCost, _ := big.NewInt(0).SetString(issuePrice, 10)
 	sftName := "SFTNAME"
 	sftTicker := "SFTTICKER"

diff --git a/cmd/sovereignnode/chainSimulator/tests/esdt/issue_test.go b/cmd/sovereignnode/chainSimulator/tests/esdt/issue_test.go
@@ -30,15 +30,14 @@ func TestSovereignChainSimulator_IssueFungible(t *testing.T) {
 	cs, err := sovereignChainSimulator.NewSovereignChainSimulator(sovereignChainSimulator.ArgsSovereignChainSimulator{
 		SovereignConfigPath: sovereignConfigPath,
 		ArgsChainSimulator: &chainSimulator.ArgsChainSimulator{
-			BypassTxSignatureCheck: false,
+			BypassTxSignatureCheck: true,
 			TempDir:                t.TempDir(),
 			PathToInitialConfig:    defaultPathToInitialConfig,
 			GenesisTimestamp:       time.Now().Unix(),
 			RoundDurationInMillis:  uint64(6000),
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 			AlterConfigsFunction: func(cfg *config.Configs) {
 				cfg.SystemSCConfig.ESDTSystemSCConfig.BaseIssuingCost = issuePrice
 			},
@@ -65,6 +64,9 @@ func TestSovereignChainSimulator_IssueFungible(t *testing.T) {
 	wallet, err := cs.GenerateAndMintWalletAddress(core.SovereignChainShardId, chainSim.InitialAmount)
 	require.Nil(t, err)
 
+	err = cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	issueCost, _ := big.NewInt(0).SetString(issuePrice, 10)
 	supply, _ := big.NewInt(0).SetString("123000000000000000000", 10)
 	tokenName := "SovereignTkn"

diff --git a/cmd/sovereignnode/chainSimulator/tests/processBlock/cleanupHeaders_test.go b/cmd/sovereignnode/chainSimulator/tests/processBlock/cleanupHeaders_test.go
@@ -31,7 +31,6 @@ func TestSovereignChainSimulator_NoCrossHeadersReceived(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)
@@ -82,7 +81,6 @@ func TestSovereignChainSimulator_BlockTrackerPoolsCleanup(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)

diff --git a/cmd/sovereignnode/chainSimulator/tests/processBlock/incomingHeader_test.go b/cmd/sovereignnode/chainSimulator/tests/processBlock/incomingHeader_test.go
@@ -49,7 +49,6 @@ func TestSovereignChainSimulator_IncomingHeader(t *testing.T) {
 			RoundsPerEpoch:         core.OptionalUint64{},
 			ApiInterface:           api.NewNoApiInterface(),
 			MinNodesPerShard:       2,
-			ConsensusGroupSize:     2,
 		},
 	})
 	require.Nil(t, err)

diff --git a/integrationTests/chainSimulator/staking/common.go b/integrationTests/chainSimulator/staking/common.go
@@ -119,6 +119,10 @@ func StakeNodes(t *testing.T, cs chainSimulatorIntegrationTests.ChainSimulator,
 		stakedBlsKeys = append(stakedBlsKeys, blsKeyBytes)
 	}
 
+	// Set state from CreateStakeTransaction needs an extra generated block to save state
+	err := cs.GenerateBlocks(1)
+	require.Nil(t, err)
+
 	stakeTxs, err := cs.SendTxsAndGenerateBlocksTilAreExecuted(txs, MaxNumOfBlockToGenerateWhenExecutingTx)
 	require.Nil(t, err)
 	require.NotNil(t, stakeTxs)

diff --git a/node/chainSimulator/sovereignChainSimulator.go b/node/chainSimulator/sovereignChainSimulator.go
@@ -2,8 +2,6 @@ package chainSimulator
 
 import (
 	"fmt"
-
-	"github.com/multiversx/mx-chain-go/node/chainSimulator/configs"
 )
 
 type sovereignChainSimulator struct {
@@ -14,7 +12,7 @@ type sovereignChainSimulator struct {
 func NewSovereignChainSimulator(args ArgsChainSimulator) (*sovereignChainSimulator, error) {
 	cs, err := NewBaseChainSimulator(ArgsBaseChainSimulator{
 		ArgsChainSimulator:          args,
-		ConsensusGroupSize:          configs.ChainSimulatorConsensusGroupSize,
+		ConsensusGroupSize:          args.MinNodesPerShard,
 		MetaChainConsensusGroupSize: 0,
 	})
 	if err != nil {