cmd/evm/internal/t8ntool,cmd/evm: make sure the vm inits the external…

… interpreter when set Date: 2022-11-07 10:04:36-08:00 Signed-off-by: meows <[email protected]>
etclabscore · Nov 7, 2022 · 2d01869 · 2d01869
1 parent 7aa2b85
commit 2d01869
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -183,6 +183,11 @@ func Transition(ctx *cli.Context) error {
 		Debug:          (tracer != nil),
 		EVMInterpreter: ctx.String(utils.EVMInterpreterFlag.Name),
 	}
+
+	if vmConfig.EVMInterpreter != "" {
+		vm.InitEVMCEVM(vmConfig.EVMInterpreter)
+	}
+
 	// Construct the chainconfig
 	var chainConfig ctypes.ChainConfigurator
 	if cConf, extraEips, err := tests.GetChainConfig(ctx.String(ForknameFlag.Name)); err != nil {

diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
@@ -114,6 +114,10 @@ func stateTestCmd(ctx *cli.Context) error {
 		EVMInterpreter:   ctx.String(utils.EVMInterpreterFlag.Name),
 	}
 
+	if cfg.EVMInterpreter != "" {
+		vm.InitEVMCEVM(cfg.EVMInterpreter)
+	}
+
 	results := make([]StatetestResult, 0, len(tests))
 	for key, test := range tests {
 		for _, st := range test.Subtests(nil) {