diff --git a/op-acceptance-tests/tests/jovian/da_footprint_test.go b/op-acceptance-tests/tests/jovian/da_footprint_test.go index d53cd8730a07f..77f345078b78a 100644 --- a/op-acceptance-tests/tests/jovian/da_footprint_test.go +++ b/op-acceptance-tests/tests/jovian/da_footprint_test.go @@ -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 diff --git a/op-devstack/dsl/l2_el.go b/op-devstack/dsl/l2_el.go index 7b6bf70c42e04..c4a8be53eab79 100644 --- a/op-devstack/dsl/l2_el.go +++ b/op-devstack/dsl/l2_el.go @@ -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 } diff --git a/op-devstack/shim/l2_el.go b/op-devstack/shim/l2_el.go index b43786af451a1..1739647c215ad 100644 --- a/op-devstack/shim/l2_el.go +++ b/op-devstack/shim/l2_el.go @@ -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 } diff --git a/op-devstack/stack/l2_el.go b/op-devstack/stack/l2_el.go index 3616e39972084..7b5e3e0781544 100644 --- a/op-devstack/stack/l2_el.go +++ b/op-devstack/stack/l2_el.go @@ -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 diff --git a/op-service/apis/l2.go b/op-service/apis/l2.go index 00d09335d0b82..41580b4f0924f 100644 --- a/op-service/apis/l2.go +++ b/op-service/apis/l2.go @@ -32,11 +32,7 @@ type OutputRootFetcher interface { } type L2EthClient interface { - EthClient L2EthBlockRef -} - -type L2EthExtendedClient interface { EthExtendedClient SystemConfigFetcher OutputRootFetcher diff --git a/op-service/sources/l2_client.go b/op-service/sources/l2_client.go index 616b5d9facf48..f5bc5fb358ae2 100644 --- a/op-service/sources/l2_client.go +++ b/op-service/sources/l2_client.go @@ -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.