From b24306eacc9a11f7a98641930b1a550b9c74cc27 Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Tue, 28 Oct 2025 12:35:00 +0800 Subject: [PATCH] fix some lint issues --- cmd/evm/internal/t8ntool/execution.go | 4 ++-- core/blockchain_test.go | 2 +- core/types/bal/bal_test.go | 2 +- core/vm/runtime/runtime_test.go | 12 ++++++++++++ eth/downloader/queue_test.go | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index e61442cf95..5303d432fb 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -316,11 +316,11 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig, return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err)) } // EIP-7002 - if _, _, err := core.ProcessWithdrawalQueue(&requests, evm); err != nil { + if err := core.ProcessWithdrawalQueue(&requests, evm); err != nil { return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not process withdrawal requests: %v", err)) } // EIP-7251 - if _, _, err := core.ProcessConsolidationQueue(&requests, evm); err != nil { + if err := core.ProcessConsolidationQueue(&requests, evm); err != nil { return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not process consolidation requests: %v", err)) } } diff --git a/core/blockchain_test.go b/core/blockchain_test.go index b749798f9c..576b0a8720 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -165,7 +165,7 @@ func testBlockChainImport(chain types.Blocks, blockchain *BlockChain) error { blockchain.reportBlock(block, res, err) return err } - err = blockchain.validator.ValidateState(block, statedb, res, false) + err = blockchain.validator.ValidateState(block, statedb, res, true, false) if err != nil { blockchain.reportBlock(block, res, err) return err diff --git a/core/types/bal/bal_test.go b/core/types/bal/bal_test.go index 1e49ada31a..641087b04d 100644 --- a/core/types/bal/bal_test.go +++ b/core/types/bal/bal_test.go @@ -38,7 +38,7 @@ func equalBALs(a *BlockAccessList, b *BlockAccessList) bool { func makeTestConstructionBAL() *AccessListBuilder { return &AccessListBuilder{ - map[common.Address]*ConstructionAccountAccesses{ + FinalizedAccesses: map[common.Address]*ConstructionAccountAccesses{ common.BytesToAddress([]byte{0xff, 0xff}): { StorageWrites: map[common.Hash]map[uint16]common.Hash{ common.BytesToHash([]byte{0x01}): { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index ddd32df039..a001d81623 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -312,6 +312,18 @@ func (d *dummyChain) Config() *params.ChainConfig { return nil } +func (d *dummyChain) CurrentHeader() *types.Header { + return nil +} + +func (d *dummyChain) GetHeaderByNumber(n uint64) *types.Header { + return d.GetHeader(common.Hash{}, n) +} + +func (d *dummyChain) GetHeaderByHash(h common.Hash) *types.Header { + return nil +} + // TestBlockhash tests the blockhash operation. It's a bit special, since it internally // requires access to a chain reader. func TestBlockhash(t *testing.T) { diff --git a/eth/downloader/queue_test.go b/eth/downloader/queue_test.go index 120e3f9d2d..06c3c62a18 100644 --- a/eth/downloader/queue_test.go +++ b/eth/downloader/queue_test.go @@ -341,7 +341,7 @@ func XTestDelivery(t *testing.T) { uncleHashes[i] = types.CalcUncleHash(uncles) } time.Sleep(100 * time.Millisecond) - _, err := q.DeliverBodies(peer.id, txset, txsHashes, uncleset, uncleHashes, nil, nil) + _, err := q.DeliverBodies(peer.id, txset, txsHashes, uncleset, uncleHashes, nil, nil, nil, nil) if err != nil { fmt.Printf("delivered %d bodies %v\n", len(txset), err) }