lux/evm
2
0
Fork 0
mirror of https://github.com/luxfi/evm.git synced 2026-09-24 00:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary testing harness

Browse Source
This commit is contained in:
Patrick O'Grady
2022-02-15 17:58:05 -08:00
parent 8b4a462f57
commit d026a640bb
2 changed files with 8 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
consensus/dummy/test_consensus.go
-53
View File
@@ -1,53 +0,0 @@
// (c) 2019-2020, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
package dummy
import (
"github.com/ava-labs/subnet-evm/consensus"
"github.com/ava-labs/subnet-evm/core/state"
"github.com/ava-labs/subnet-evm/core/types"
)
type (
OnFinalizeAndAssembleCallbackType = func(header *types.Header, state *state.StateDB, txs []*types.Transaction) (err error)
OnExtraStateChangeType = func(block *types.Block, statedb *state.StateDB) (err error)
ConsensusCallbacks struct {
OnFinalizeAndAssemble OnFinalizeAndAssembleCallbackType
OnExtraStateChange OnExtraStateChangeType
}
DummyEngineCB struct {
cb *ConsensusCallbacks
DummyEngine
}
)
func NewTestConsensusCB(cb *ConsensusCallbacks) *DummyEngineCB {
return &DummyEngineCB{
cb: cb,
}
}
func (self *DummyEngineCB) Finalize(chain consensus.ChainHeaderReader, block *types.Block, parent *types.Header, state *state.StateDB, receipts []*types.Receipt) error {
if self.cb.OnExtraStateChange != nil {
err := self.cb.OnExtraStateChange(block, state)
if err != nil {
return err
}
}
return self.DummyEngine.Finalize(chain, block, parent, state, receipts)
}
func (self *DummyEngineCB) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *types.Header, parent *types.Header, state *state.StateDB, txs []*types.Transaction,
uncles []*types.Header, receipts []*types.Receipt) (*types.Block, error) {
if self.cb.OnFinalizeAndAssemble != nil {
err := self.cb.OnFinalizeAndAssemble(header, state, txs)
if err != nil {
return nil, err
}
}
return self.DummyEngine.FinalizeAndAssemble(chain, header, parent, state, txs, uncles, receipts)
}
core/blockchain_test.go
+8 -23
View File
@@ -9,9 +9,7 @@ import (
"github.com/ava-labs/subnet-evm/consensus/dummy"
"github.com/ava-labs/subnet-evm/core/rawdb"
"github.com/ava-labs/subnet-evm/core/state"
"github.com/ava-labs/subnet-evm/core/state/pruner"
"github.com/ava-labs/subnet-evm/core/types"
"github.com/ava-labs/subnet-evm/core/vm"
"github.com/ava-labs/subnet-evm/ethdb"
"github.com/ava-labs/subnet-evm/params"
@@ -265,16 +263,7 @@ func TestBlockChainOfflinePruningUngracefulShutdown(t *testing.T) {
SnapshotLimit: 256,
},
chainConfig,
dummy.NewTestConsensusCB(&dummy.ConsensusCallbacks{
OnExtraStateChange: func(block *types.Block, sdb *state.StateDB) error {
sdb.SetState(common.HexToAddress("0xdeadbeef"), common.HexToHash("0xdeadbeef"), common.HexToHash("0xdeadbeef"))
return nil
},
OnFinalizeAndAssemble: func(header *types.Header, sdb *state.StateDB, txs []*types.Transaction) error {
sdb.SetState(common.HexToAddress("0xdeadbeef"), common.HexToHash("0xdeadbeef"), common.HexToHash("0xdeadbeef"))
return nil
},
}),
dummy.NewFaker(),
vm.Config{},
lastAcceptedHash,
)
@@ -290,6 +279,11 @@ func TestBlockChainOfflinePruningUngracefulShutdown(t *testing.T) {
return blockchain, nil
}
targetRoot := blockchain.LastAcceptedBlock().Root()
if targetRoot == blockchain.Genesis().Root() {
return blockchain, nil
}
tempDir := t.TempDir()
if err := blockchain.CleanBlockRootsAboveLastAccepted(); err != nil {
return nil, err
@@ -299,10 +293,10 @@ func TestBlockChainOfflinePruningUngracefulShutdown(t *testing.T) {
return nil, fmt.Errorf("offline pruning failed (%s, %d): %w", tempDir, 256, err)
}
targetRoot := blockchain.LastAcceptedBlock().Root()
if err := pruner.Prune(targetRoot); err != nil {
return nil, fmt.Errorf("failed to prune blockchain with target root: %s due to: %w", targetRoot, err)
}
// Re-initialize the blockchain after pruning
return NewBlockChain(
db,
@@ -313,16 +307,7 @@ func TestBlockChainOfflinePruningUngracefulShutdown(t *testing.T) {
SnapshotLimit: 256,
},
chainConfig,
dummy.NewTestConsensusCB(&dummy.ConsensusCallbacks{
OnExtraStateChange: func(block *types.Block, sdb *state.StateDB) error {
sdb.SetState(common.HexToAddress("0xdeadbeef"), common.HexToHash("0xdeadbeef"), common.HexToHash("0xdeadbeef"))
return nil
},
OnFinalizeAndAssemble: func(header *types.Header, sdb *state.StateDB, txs []*types.Transaction) error {
sdb.SetState(common.HexToAddress("0xdeadbeef"), common.HexToHash("0xdeadbeef"), common.HexToHash("0xdeadbeef"))
return nil
},
}),
dummy.NewFaker(),
vm.Config{},
lastAcceptedHash,
)