From 7ad3840c6bc98c5a4aee48ab7d97aa114aa05efc Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Tue, 26 Mar 2024 11:53:28 +0100 Subject: [PATCH 1/2] tests: fix panic via state test runner using json logger --- tests/state_test_util.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 367688e57f9e..43a03de36d61 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -295,6 +295,9 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh } evm := vm.NewEVM(context, txContext, st.StateDB, config, vmconfig) + if tracer := vmconfig.Tracer; tracer != nil && tracer.OnTxStart != nil { + tracer.OnTxStart(evm.GetVMContext(), nil, msg.From) + } // Execute the message. snapshot := st.StateDB.Snapshot() gaspool := new(core.GasPool) From 5585a939229db51cc7c2b0d41ec4106d0ddc668f Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Tue, 26 Mar 2024 12:31:29 +0100 Subject: [PATCH 2/2] tests: also invoke OnTxEnd --- tests/state_test_util.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 43a03de36d61..416bab947264 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -297,6 +297,11 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh if tracer := vmconfig.Tracer; tracer != nil && tracer.OnTxStart != nil { tracer.OnTxStart(evm.GetVMContext(), nil, msg.From) + if evm.Config.Tracer.OnTxEnd != nil { + defer func() { + evm.Config.Tracer.OnTxEnd(nil, err) + }() + } } // Execute the message. snapshot := st.StateDB.Snapshot()