forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 18:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: abstract hookstest.Register() out of hookstest.Stub.Register() (#12)

Browse source
This commit is contained in:
Arran Schlosberg 2024-09-11 17:52:14 +01:00 committed by GitHub
parent d9991bbee9
commit 72744cebe7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/state_transition.libevm_test.go
View file

@ -25,7 +25,7 @@ func TestCanExecuteTransaction(t *testing.T) {
return makeErr(from, to, s.GetState(account, slot)) return makeErr(from, to, s.GetState(account, slot))
}, },
} }
hooks.RegisterForRules(t) hooks.Register(t)
value := rng.Hash() value := rng.Hash()

6
core/vm/contracts.libevm_test.go
View file

@ -64,7 +64,7 @@ func TestPrecompileOverride(t *testing.T) {
}, },
}, },
} }
hooks.RegisterForRules(t) hooks.Register(t)
t.Run(fmt.Sprintf("%T.Call([overridden precompile address = %v])", &vm.EVM{}, tt.addr), func(t *testing.T) { t.Run(fmt.Sprintf("%T.Call([overridden precompile address = %v])", &vm.EVM{}, tt.addr), func(t *testing.T) {
_, evm := ethtest.NewZeroEVM(t) _, evm := ethtest.NewZeroEVM(t)
@ -103,7 +103,7 @@ func TestNewStatefulPrecompile(t *testing.T) {
), ),
}, },
} }
hooks.RegisterForRules(t) hooks.Register(t)
caller := rng.Address() caller := rng.Address()
input := rng.Bytes(8) input := rng.Bytes(8)
@ -133,7 +133,7 @@ func TestCanCreateContract(t *testing.T) {
return makeErr(cc, s.GetState(account, slot)) return makeErr(cc, s.GetState(account, slot))
}, },
} }
hooks.RegisterForRules(t) hooks.Register(t)
origin := rng.Address() origin := rng.Address()
caller := rng.Address() caller := rng.Address()

25
libevm/hookstest/stub.go
View file

@ -1,4 +1,5 @@
// Package hookstest provides test doubles for testing subsets of libevm hooks. // Package hookstest provides test doubles and convenience wrappers for testing
// libevm hooks.
package hookstest package hookstest
import ( import (
@ -10,6 +11,15 @@ import (
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
// Register clears any registered [params.Extras] and then registers `extras`
// for the liftime of the current test, clearing them via tb's
// [testing.TB.Cleanup].
func Register[C params.ChainConfigHooks, R params.RulesHooks](tb testing.TB, extras params.Extras[C, R]) {
params.TestOnlyClearRegisteredExtras()
tb.Cleanup(params.TestOnlyClearRegisteredExtras)
params.RegisterExtras(extras)
}
// A Stub is a test double for [params.ChainConfigHooks] and // A Stub is a test double for [params.ChainConfigHooks] and
// [params.RulesHooks]. Each of the fields, if non-nil, back their respective // [params.RulesHooks]. Each of the fields, if non-nil, back their respective
// hook methods, which otherwise fall back to the default behaviour. // hook methods, which otherwise fall back to the default behaviour.
@ -19,17 +29,14 @@ type Stub struct {
CanCreateContractFn func(*libevm.AddressContext, libevm.StateReader) error CanCreateContractFn func(*libevm.AddressContext, libevm.StateReader) error
} }
// RegisterForRules clears any registered [params.Extras] and then registers s // Register is a convenience wrapper for registering s as both the
// as [params.RulesHooks], which are themselves cleared by the // [params.ChainConfigHooks] and [params.RulesHooks] via [Register].
// [testing.TB.Cleanup] routine. func (s *Stub) Register(tb testing.TB) {
func (s *Stub) RegisterForRules(tb testing.TB) { Register(tb, params.Extras[Stub, Stub]{
params.TestOnlyClearRegisteredExtras() NewRules: func(_ *params.ChainConfig, _ *params.Rules, _ *Stub, blockNum *big.Int, isMerge bool, timestamp uint64) *Stub {
params.RegisterExtras(params.Extras[params.NOOPHooks, Stub]{
NewRules: func(_ *params.ChainConfig, _ *params.Rules, _ *params.NOOPHooks, blockNum *big.Int, isMerge bool, timestamp uint64) *Stub {
return s return s
}, },
}) })
tb.Cleanup(params.TestOnlyClearRegisteredExtras)
} }
func (s Stub) PrecompileOverride(a common.Address) (libevm.PrecompiledContract, bool) { func (s Stub) PrecompileOverride(a common.Address) (libevm.PrecompiledContract, bool) {