Skip to content

op-supervisor,op-service: rm more deprecated interop typing #15815

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
protolambda merged 1 commit into from
May 9, 2025
Merged

op-supervisor,op-service: rm more deprecated interop typing #15815

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 devnet-sdk/system/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ type Supervisor interface {
CrossSafe(context.Context, eth.ChainID) (supervisorTypes.DerivedIDPair, error)
Finalized(context.Context, eth.ChainID) (eth.BlockID, error)
FinalizedL1(context.Context) (eth.BlockRef, error)
CrossDerivedFrom(context.Context, eth.ChainID, eth.BlockID) (eth.BlockRef, error)
CrossDerivedToSource(context.Context, eth.ChainID, eth.BlockID) (eth.BlockRef, error)
UpdateLocalUnsafe(context.Context, eth.ChainID, eth.BlockRef) error
UpdateLocalSafe(context.Context, eth.ChainID, eth.L1BlockRef, eth.BlockRef) error
SuperRootAtTimestamp(context.Context, hexutil.Uint64) (eth.SuperRootResponse, error)
Expand Down
2 changes: 1 addition & 1 deletion devnet-sdk/testing/systest/testing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (m *mockSupervisor) FinalizedL1(ctx context.Context) (eth.BlockRef, error)
return eth.BlockRef{}, nil
}

func (m *mockSupervisor) CrossDerivedFrom(ctx context.Context, chainID eth.ChainID, blockID eth.BlockID) (eth.BlockRef, error) {
func (m *mockSupervisor) CrossDerivedToSource(ctx context.Context, chainID eth.ChainID, blockID eth.BlockID) (eth.BlockRef, error) {
return eth.BlockRef{}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion op-e2e/actions/interop/interop_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func TestInteropCrossSafeDependencyDelay(gt *testing.T) {

// Assert that the executing message in chain A only
// became cross-safe when the dependency of chain B became cross safe later.
source, err := actors.Supervisor.CrossDerivedFrom(t.Ctx(), actors.ChainA.ChainID, execTxIncludedIn.ID())
source, err := actors.Supervisor.CrossDerivedToSource(t.Ctx(), actors.ChainA.ChainID, execTxIncludedIn.ID())
require.NoError(t, err)
require.Equal(t, chainBSubmittedIn.NumberU64(), source.Number)
}
Expand Down
5 changes: 0 additions & 5 deletions op-service/sources/supervisor_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ func (cl *SupervisorClient) FinalizedL1(ctx context.Context) (result eth.BlockRe
return result, err
}

func (cl *SupervisorClient) CrossDerivedFrom(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (result eth.BlockRef, err error) {
err = cl.client.CallContext(ctx, &result, "supervisor_crossDerivedFrom", chainID, derived)
return result, err
}

func (cl *SupervisorClient) UpdateLocalUnsafe(ctx context.Context, chainID eth.ChainID, head eth.BlockRef) (err error) {
err = cl.client.CallContext(ctx, nil, "supervisor_updateLocalUnsafe", chainID, head)
return err
Expand Down
46 changes: 0 additions & 46 deletions op-service/testutils/fake_interop_backend.go
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions op-service/testutils/mock_interop_backend.go
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions op-supervisor/supervisor/frontend/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ func (q *QueryFrontend) FinalizedL1(ctx context.Context) (eth.BlockRef, error) {
return q.Supervisor.FinalizedL1(ctx)
}

// CrossDerivedFrom is deprecated, but remains for backwards compatibility to callers
// it is equivalent to CrossDerivedToSource
func (q *QueryFrontend) CrossDerivedFrom(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
return q.Supervisor.CrossDerivedToSource(ctx, chainID, derived)
}

func (q *QueryFrontend) CrossDerivedToSource(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
return q.Supervisor.CrossDerivedToSource(ctx, chainID, derived)
}
Expand Down