Merge branch 'ethereum:master' into test-addrutil

This commit is contained in:
tianyeyouyou 2024-11-11 14:56:55 +08:00 committed by GitHub
commit b3f578e287
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -308,6 +308,7 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh
if tracer := evm.Config.Tracer; tracer != nil && tracer.OnTxEnd != nil {
evm.Config.Tracer.OnTxEnd(nil, err)
}
return st, common.Hash{}, 0, err
}
// Add 0-value mining reward. This only makes a difference in the cases
// where
@ -322,7 +323,7 @@ func (t *StateTest) RunNoVerify(subtest StateSubtest, vmconfig vm.Config, snapsh
receipt := &types.Receipt{GasUsed: vmRet.UsedGas}
tracer.OnTxEnd(receipt, nil)
}
return st, root, vmRet.UsedGas, err
return st, root, vmRet.UsedGas, nil
}
func (t *StateTest) gasLimit(subtest StateSubtest) uint64 {