Skip to content

op-service/apis: remove redundant interface #18049

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
joshklop merged 1 commit into from
Oct 29, 2025
Merged

op-service/apis: remove redundant interface #18049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion op-acceptance-tests/tests/jovian/da_footprint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func TestDAFootprint(gt *testing.T) {

_, txs, err := ethClient.InfoAndTxsByHash(t.Ctx(), info.Hash())
require.NoError(err)
_, receipts, err := sys.L2EL.Escape().L2EthExtendedClient().FetchReceipts(t.Ctx(), info.Hash())
_, receipts, err := sys.L2EL.Escape().L2EthClient().FetchReceipts(t.Ctx(), info.Hash())
require.NoError(err)

var totalDAFootprint uint64
Expand Down
2 changes: 1 addition & 1 deletion op-devstack/dsl/l2_el.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (el *L2ELNode) DisconnectPeerWith(peer *L2ELNode) {
}

func (el *L2ELNode) PayloadByNumber(number uint64) *eth.ExecutionPayloadEnvelope {
payload, err := el.inner.L2EthExtendedClient().PayloadByNumber(el.ctx, number)
payload, err := el.inner.L2EthClient().PayloadByNumber(el.ctx, number)
el.require.NoError(err, "failed to get payload")
return payload
}
Expand Down
2 changes: 1 addition & 1 deletion op-devstack/shim/l2_el.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (r *rpcL2ELNode) L2EthClient() apis.L2EthClient {
return r.l2Client
}

func (r *rpcL2ELNode) L2EthExtendedClient() apis.L2EthExtendedClient {
func (r *rpcL2ELNode) L2EthExtendedClient() apis.L2EthClient {
return r.l2Client
}

Expand Down
1 change: 0 additions & 1 deletion op-devstack/stack/l2_el.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ func (id L2ELNodeID) Match(elems []L2ELNode) []L2ELNode {
type L2ELNode interface {
ID() L2ELNodeID
L2EthClient() apis.L2EthClient
L2EthExtendedClient() apis.L2EthExtendedClient
L2EngineClient() apis.EngineClient

ELNode
Expand Down
4 changes: 0 additions & 4 deletions op-service/apis/l2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ type OutputRootFetcher interface {
}

type L2EthClient interface {
EthClient
L2EthBlockRef
}

type L2EthExtendedClient interface {
EthExtendedClient
SystemConfigFetcher
OutputRootFetcher
Expand Down
2 changes: 1 addition & 1 deletion op-service/sources/l2_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ type L2Client struct {
fetchWithdrawalRootFromState bool
}

var _ apis.L2EthExtendedClient = (*L2Client)(nil)
var _ apis.L2EthClient = (*L2Client)(nil)

// NewL2Client constructs a new L2Client instance. The L2Client is a thin wrapper around the EthClient with added functions
// for fetching and caching eth.L2BlockRef values. This includes fetching an L2BlockRef by block number, label, or hash.
Expand Down