Skip to content

eth/catalyst: fix tests for getPayload change #33322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjl merged 2 commits into from
Nov 28, 2025
Merged

eth/catalyst: fix tests for getPayload change #33322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
795481c
eth/catalyst: fix tests for getPayload change
fjl Nov 28, 2025
3093fdd
eth/catalyst: fix typo
fjl Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions eth/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
// 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) {
log.Trace("Engine API request received", "method", "GetPayload", "id", payloadID)
if !payloadID.Is(versions...) {
if versions != nil && !payloadID.Is(versions...) {
return nil, engine.UnsupportedFork
}
data := api.localBlocks.get(payloadID, full)
Expand Down
8 changes: 4 additions & 4 deletions eth/catalyst/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func TestEth2PrepareAndGetPayload(t *testing.T) {
BeaconRoot: blockParams.BeaconRoot,
Version: engine.PayloadV1,
}).Id()
execData, err := api.getPayload(payloadID, true)
execData, err := api.getPayload(payloadID, true, nil, nil)
if err != nil {
t.Fatalf("error getting payload, err=%v", err)
}
Expand Down Expand Up @@ -636,7 +636,7 @@ func TestNewPayloadOnInvalidChain(t *testing.T) {
t.Fatalf("error preparing payload, invalid status: %v", resp.PayloadStatus.Status)
}
// 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)
}
if len(payload.ExecutionPayload.Transactions) > 0 {
Expand Down Expand Up @@ -1219,7 +1219,7 @@ func TestNilWithdrawals(t *testing.T) {
Random: test.blockParams.Random,
Version: payloadVersion,
}).Id()
execData, err := api.GetPayloadV2(payloadID)
execData, err := api.getPayload(payloadID, false, nil, nil)
if err != nil {
t.Fatalf("error getting payload, err=%v", err)
}
Expand Down Expand Up @@ -1674,7 +1674,7 @@ func TestWitnessCreationAndConsumption(t *testing.T) {
BeaconRoot: blockParams.BeaconRoot,
Version: engine.PayloadV3,
}).Id()
envelope, err := api.getPayload(payloadID, true)
envelope, err := api.getPayload(payloadID, true, nil, nil)
if err != nil {
t.Fatalf("error getting payload, err=%v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion eth/catalyst/simulated_beacon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
return nil
}

envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true)
envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true, nil, nil)
if err != nil {
return err
}
Expand Down