forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-17 05:26:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth/catalyst: fix tests for getPayload change (#33322)

Browse source 
Fixes a test/lint regression introduced by #32754
This commit is contained in:
Felix Lange 2025-11-28 15:06:11 +01:00 committed by GitHub
parent 28376aea78
commit fbbaa3c849
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eth/catalyst/api.go
View file

@ -466,11 +466,13 @@ func (api *ConsensusAPI) GetPayloadV5(payloadID engine.PayloadID) (*engine.Execu
}) })
} }
// getPayload will retreive the specified payload and verify it conforms to the // getPayload will retrieve the specified payload and verify it conforms to the
// endpoint's allowed payload versions and forks. // endpoint's allowed payload versions and forks.
//
// Note passing nil `forks`, `versions` disables the respective check.
func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool, versions []engine.PayloadVersion, forks []forks.Fork) (*engine.ExecutionPayloadEnvelope, error) { func (api *ConsensusAPI) getPayload(payloadID engine.PayloadID, full bool, versions []engine.PayloadVersion, forks []forks.Fork) (*engine.ExecutionPayloadEnvelope, error) {
log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID) log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID)
if !payloadID.Is(versions...) { if versions != nil && !payloadID.Is(versions...) {
return nil, engine.UnsupportedFork return nil, engine.UnsupportedFork
} }
data := api.localBlocks.get(payloadID, full) data := api.localBlocks.get(payloadID, full)

8
eth/catalyst/api_test.go
View file

@ -203,7 +203,7 @@ func TestEth2PrepareAndGetPayload(t *testing.T) {
BeaconRoot: blockParams.BeaconRoot, BeaconRoot: blockParams.BeaconRoot,
Version: engine.PayloadV1, Version: engine.PayloadV1,
}).Id() }).Id()
execData, err := api.getPayload(payloadID, true) execData, err := api.getPayload(payloadID, true, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error getting payload, err=%v", err) t.Fatalf("error getting payload, err=%v", err)
} }
@ -636,7 +636,7 @@ func TestNewPayloadOnInvalidChain(t *testing.T) {
t.Fatalf("error preparing payload, invalid status: %v", resp.PayloadStatus.Status) t.Fatalf("error preparing payload, invalid status: %v", resp.PayloadStatus.Status)
} }
// give the payload some time to be built // give the payload some time to be built
if payload, err = api.getPayload(*resp.PayloadID, true); err != nil { if payload, err = api.getPayload(*resp.PayloadID, true, nil, nil); err != nil {
t.Fatalf("can't get payload: %v", err) t.Fatalf("can't get payload: %v", err)
} }
if len(payload.ExecutionPayload.Transactions) > 0 { if len(payload.ExecutionPayload.Transactions) > 0 {
@ -1219,7 +1219,7 @@ func TestNilWithdrawals(t *testing.T) {
Random: test.blockParams.Random, Random: test.blockParams.Random,
Version: payloadVersion, Version: payloadVersion,
}).Id() }).Id()
execData, err := api.GetPayloadV2(payloadID) execData, err := api.getPayload(payloadID, false, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error getting payload, err=%v", err) t.Fatalf("error getting payload, err=%v", err)
} }
@ -1674,7 +1674,7 @@ func TestWitnessCreationAndConsumption(t *testing.T) {
BeaconRoot: blockParams.BeaconRoot, BeaconRoot: blockParams.BeaconRoot,
Version: engine.PayloadV3, Version: engine.PayloadV3,
}).Id() }).Id()
envelope, err := api.getPayload(payloadID, true) envelope, err := api.getPayload(payloadID, true, nil, nil)
if err != nil { if err != nil {
t.Fatalf("error getting payload, err=%v", err) t.Fatalf("error getting payload, err=%v", err)
} }

2
eth/catalyst/simulated_beacon.go
View file

@ -214,7 +214,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
return nil return nil
} }
envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true) envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true, nil, nil)
if err != nil { if err != nil {
return err return err
} }