diff --git a/consensus/tests/engine_v2_tests/api_test.go b/consensus/tests/engine_v2_tests/api_test.go index cab0ee131..0ae00856c 100644 --- a/consensus/tests/engine_v2_tests/api_test.go +++ b/consensus/tests/engine_v2_tests/api_test.go @@ -66,7 +66,7 @@ func TestGetMissedRoundsInEpochByBlockNum(t *testing.T) { startingBlockNum := currentBlock.Number().Int64() + 1 // Skipped the round roundNumber := startingBlockNum + 2 - block := CreateBlock(blockchain, chainConfig, currentBlock, int(startingBlockNum), roundNumber, blockCoinBase, signer, signFn, nil, nil, "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450") + block := CreateBlock(blockchain, chainConfig, currentBlock, int(startingBlockNum), roundNumber, blockCoinBase, signer, signFn, nil, nil, "25cb20ed8e7f21934d832318bc912e99e8745b4b3018e65d30bafc565df19c3a") err := blockchain.InsertBlock(block) if err != nil { t.Fatal(err) diff --git a/consensus/tests/engine_v2_tests/helper.go b/consensus/tests/engine_v2_tests/helper.go index 3234ea9c5..b67730056 100644 --- a/consensus/tests/engine_v2_tests/helper.go +++ b/consensus/tests/engine_v2_tests/helper.go @@ -559,7 +559,7 @@ func PrepareXDCTestBlockChainWith128Candidates(t *testing.T, numOfBlocks int, ch blockCoinBase = signer.Hex() } roundNumber := int64(i) - chainConfig.XDPoS.V2.SwitchBlock.Int64() - block := CreateBlock(blockchain, chainConfig, currentBlock, i, roundNumber, blockCoinBase, signer, signFn, nil, nil, "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450") + block := CreateBlock(blockchain, chainConfig, currentBlock, i, roundNumber, blockCoinBase, signer, signFn, nil, nil, "25cb20ed8e7f21934d832318bc912e99e8745b4b3018e65d30bafc565df19c3a") err = blockchain.InsertBlock(block) if err != nil { t.Fatal(err) diff --git a/consensus/tests/engine_v2_tests/mine_test.go b/consensus/tests/engine_v2_tests/mine_test.go index 96775fa0a..70bc0f464 100644 --- a/consensus/tests/engine_v2_tests/mine_test.go +++ b/consensus/tests/engine_v2_tests/mine_test.go @@ -128,7 +128,7 @@ func TestUpdateMasterNodes(t *testing.T) { t.Fatal(err) } //Get from block validator error message - merkleRoot := "2f34d88e4afb95a51b5dd3b157bdec944790c033bbf6e990cc7f946ad07d47c4" + merkleRoot := "41ad5ea0d4c46f36548b27a946fe51e3cefd4d8567cb5c3398ebb570f99d9ee3" header := &types.Header{ Root: common.HexToHash(merkleRoot), Number: big.NewInt(int64(1350)), @@ -270,7 +270,7 @@ func TestUpdateMultipleMasterNodes(t *testing.T) { t.Logf("Inserting block with propose at 1350...") blockCoinbaseA := "0xaaa0000000000000000000000000000000001350" //Get from block validator error message - merkleRoot := "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450" + merkleRoot := "25cb20ed8e7f21934d832318bc912e99e8745b4b3018e65d30bafc565df19c3a" parentBlock := CreateBlock(blockchain, config, currentBlock, 1350, 450, blockCoinbaseA, signer, signFn, nil, nil, merkleRoot) err := blockchain.InsertBlock(parentBlock) assert.Nil(t, err) diff --git a/consensus/tests/engine_v2_tests/penalty_test.go b/consensus/tests/engine_v2_tests/penalty_test.go index fb7e500e4..5f44416b2 100644 --- a/consensus/tests/engine_v2_tests/penalty_test.go +++ b/consensus/tests/engine_v2_tests/penalty_test.go @@ -38,7 +38,7 @@ func TestHookPenaltyV2TwoEpoch(t *testing.T) { header1335 := blockchain.GetHeaderByNumber(config.XDPoS.Epoch + config.XDPoS.Gap - uint64(common.MergeSignRange)) tx, err := signingTxWithKey(header1335, 0, voterKey) assert.Nil(t, err) - block1349 := CreateBlock(blockchain, conf, block1348, 1349, 1358, signer.Hex(), signer, signFn, nil, nil, "c2bf7b59be5184fc1148be5db14692b2dc89a1b345895d3e8d0ee7b8a7607450") + block1349 := CreateBlock(blockchain, conf, block1348, 1349, 1358, signer.Hex(), signer, signFn, nil, nil, "25cb20ed8e7f21934d832318bc912e99e8745b4b3018e65d30bafc565df19c3a") err = blockchain.InsertBlock(block1349) assert.Nil(t, err) adaptor.CacheSigningTxs(block1349.Hash(), []*types.Transaction{tx})