Change the timing of initializing global variables

kaiachain · Jan 23, 2025 · e44856e · e44856e
1 parent 29f0f5b
commit e44856e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/block_test.go b/tests/block_test.go
@@ -26,7 +26,6 @@ import (
 	"testing"
 
 	"github.com/kaiachain/kaia/blockchain"
-	"github.com/kaiachain/kaia/blockchain/types"
 	"github.com/kaiachain/kaia/common"
 	"github.com/stretchr/testify/suite"
 )
@@ -71,7 +70,6 @@ func (suite *ExecutionSpecBlockTestSuite) TearDownSuite() {
 	// Reset global variables for test
 	common.IsPrecompiledContractAddress = suite.originalIsPrecompiledContractAddress
 	blockchain.CreateContractWithCodeFormatInExecutionSpecTest = false
-	types.IsPragueInExecutionSpecTest = false
 }
 
 func (suite *ExecutionSpecBlockTestSuite) TestExecutionSpecBlock() {

diff --git a/tests/block_test_util.go b/tests/block_test_util.go
@@ -152,6 +152,9 @@ func (t *BlockTest) Run() error {
 			blockchain.ProcessParentBlockHash(header, vmenv, state, chain.Config().Rules(header.Number))
 		}
 	}
+	defer func() {
+		gxhash.CustomInitialize = nil
+	}()
 
 	gasChanges := map[vm.OpCode]uint64{}
 	if config.Rules(gblock.Number()).IsCancun {
@@ -274,6 +277,9 @@ func (t *BlockTest) insertBlocksFromTx(bc *blockchain.BlockChain, gBlock types.B
 		if bc.Config().IsIstanbulForkEnabled(bc.CurrentHeader().Number) {
 			types.IsPragueInExecutionSpecTest = true
 		}
+		defer func() {
+			types.IsPragueInExecutionSpecTest = false
+		}()
 
 		// var maxFeePerGas *big.Int
 		blocks, receiptsList := blockchain.GenerateChain(bc.Config(), preBlock, bc.Engine(), db, 1, func(i int, b *blockchain.BlockGen) {