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

core: clean up parallal state processor

Browse source
This commit is contained in:
MariusVanDerWijden 2026-02-05 14:59:06 +01:00
parent 1d942bddf3
commit 8182ab0b06
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/parallel_state_processor.go
View file

@ -100,6 +100,12 @@ func (p *ParallelStateProcessor) prepareExecResult(block *types.Block, allStateR
allLogs = append(allLogs, result.receipt.Logs...) allLogs = append(allLogs, result.receipt.Logs...)
allReceipts = append(allReceipts, result.receipt) allReceipts = append(allReceipts, result.receipt)
} }
// Block gas limit is enforced against usedGas (pre-refund after Amsterdam, post-refund before).
if usedGas > header.GasLimit {
return &ProcessResultWithMetrics{
ProcessResult: &ProcessResult{Error: fmt.Errorf("gas limit exceeded")},
}
}
// Read requests if Prague is enabled. // Read requests if Prague is enabled.
if p.chainConfig().IsPrague(block.Number(), block.Time()) { if p.chainConfig().IsPrague(block.Number(), block.Time()) {

10
tests/block_test.go
View file

@ -126,7 +126,7 @@ func TestBlockchain(t *testing.T) {
bt.skipLoad(`.*\.meta/.*`) bt.skipLoad(`.*\.meta/.*`)
bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) { bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) {
execBlockTest(t, bt, test) execBlockTest(t, bt, test, false)
}) })
// There is also a LegacyTests folder, containing blockchain tests generated // There is also a LegacyTests folder, containing blockchain tests generated
// prior to Istanbul. However, they are all derived from GeneralStateTests, // prior to Istanbul. However, they are all derived from GeneralStateTests,
@ -144,7 +144,7 @@ func testExecutionSpecBlocktests(t *testing.T, testDir string) {
bt.skipLoad(".*prague/eip7002_el_triggerable_withdrawals/test_system_contract_deployment.json") bt.skipLoad(".*prague/eip7002_el_triggerable_withdrawals/test_system_contract_deployment.json")
bt.walk(t, testDir, func(t *testing.T, name string, test *BlockTest) { bt.walk(t, testDir, func(t *testing.T, name string, test *BlockTest) {
execBlockTest(t, bt, test) execBlockTest(t, bt, test, true)
}) })
} }
@ -158,6 +158,8 @@ func TestExecutionSpecBlocktestsBAL(t *testing.T) {
testExecutionSpecBlocktests(t, executionSpecBALBlockchainTestDir) testExecutionSpecBlocktests(t, executionSpecBALBlockchainTestDir)
} }
var failures = 0
func execBlockTest(t *testing.T, bt *testMatcher, test *BlockTest, buildAndVerifyBAL bool) { func execBlockTest(t *testing.T, bt *testMatcher, test *BlockTest, buildAndVerifyBAL bool) {
// Define all the different flag combinations we should run the tests with, // Define all the different flag combinations we should run the tests with,
// picking only one for short tests. // picking only one for short tests.
@ -175,6 +177,10 @@ func execBlockTest(t *testing.T, bt *testMatcher, test *BlockTest, buildAndVerif
for _, snapshot := range snapshotConf { for _, snapshot := range snapshotConf {
for _, dbscheme := range dbschemeConf { for _, dbscheme := range dbschemeConf {
if err := bt.checkFailure(t, test.Run(snapshot, dbscheme, true, buildAndVerifyBAL, nil, nil)); err != nil { if err := bt.checkFailure(t, test.Run(snapshot, dbscheme, true, buildAndVerifyBAL, nil, nil)); err != nil {
failures++
if failures > 10 {
panic("adsf")
}
t.Errorf("test with config {snapshotter:%v, scheme:%v} failed: %v", snapshot, dbscheme, err) t.Errorf("test with config {snapshotter:%v, scheme:%v} failed: %v", snapshot, dbscheme, err)
return return
} }