diff --git a/devnet-sdk/system/interfaces.go b/devnet-sdk/system/interfaces.go index 8e681e7d3bd3b..6532f576ef3ec 100644 --- a/devnet-sdk/system/interfaces.go +++ b/devnet-sdk/system/interfaces.go @@ -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) diff --git a/devnet-sdk/testing/systest/testing_test.go b/devnet-sdk/testing/systest/testing_test.go index c95e8461928c4..797fbf2220f61 100644 --- a/devnet-sdk/testing/systest/testing_test.go +++ b/devnet-sdk/testing/systest/testing_test.go @@ -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 } diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go index a0280831aec82..e97c932576858 100644 --- a/op-e2e/actions/interop/interop_test.go +++ b/op-e2e/actions/interop/interop_test.go @@ -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) } diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go index 079b9a1b2c706..363463996658c 100644 --- a/op-service/sources/supervisor_client.go +++ b/op-service/sources/supervisor_client.go @@ -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 diff --git a/op-service/testutils/fake_interop_backend.go b/op-service/testutils/fake_interop_backend.go deleted file mode 100644 index ae179fc4a428a..0000000000000 --- a/op-service/testutils/fake_interop_backend.go +++ /dev/null @@ -1,46 +0,0 @@ -package testutils - -import ( - "context" - - "github.com/ethereum-optimism/optimism/op-service/eth" - "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types" -) - -type FakeInteropBackend struct { - UnsafeViewFn func(ctx context.Context, chainID eth.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) - SafeViewFn func(ctx context.Context, chainID eth.ChainID, safe types.ReferenceView) (types.ReferenceView, error) - FinalizedFn func(ctx context.Context, chainID eth.ChainID) (eth.BlockID, error) - DerivedFromFn func(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) - UpdateLocalUnsafeFn func(ctx context.Context, chainID eth.ChainID, head eth.BlockRef) error - UpdateLocalSafeFn func(ctx context.Context, chainID eth.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error - UpdateFinalizedL1Fn func(ctx context.Context, chainID eth.ChainID, finalized eth.L1BlockRef) error -} - -func (m *FakeInteropBackend) UnsafeView(ctx context.Context, chainID eth.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) { - return m.UnsafeViewFn(ctx, chainID, unsafe) -} - -func (m *FakeInteropBackend) SafeView(ctx context.Context, chainID eth.ChainID, safe types.ReferenceView) (types.ReferenceView, error) { - return m.SafeViewFn(ctx, chainID, safe) -} - -func (m *FakeInteropBackend) Finalized(ctx context.Context, chainID eth.ChainID) (eth.BlockID, error) { - return m.FinalizedFn(ctx, chainID) -} - -func (m *FakeInteropBackend) CrossDerivedFrom(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) { - return m.DerivedFromFn(ctx, chainID, derived) -} - -func (m *FakeInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID eth.ChainID, head eth.BlockRef) error { - return m.UpdateLocalUnsafeFn(ctx, chainID, head) -} - -func (m *FakeInteropBackend) UpdateLocalSafe(ctx context.Context, chainID eth.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error { - return m.UpdateLocalSafeFn(ctx, chainID, derivedFrom, lastDerived) -} - -func (m *FakeInteropBackend) UpdateFinalizedL1(ctx context.Context, chainID eth.ChainID, finalized eth.L1BlockRef) error { - return m.UpdateFinalizedL1Fn(ctx, chainID, finalized) -} diff --git a/op-service/testutils/mock_interop_backend.go b/op-service/testutils/mock_interop_backend.go deleted file mode 100644 index b3ee32b3c923c..0000000000000 --- a/op-service/testutils/mock_interop_backend.go +++ /dev/null @@ -1,99 +0,0 @@ -package testutils - -import ( - "context" - - "github.com/stretchr/testify/mock" - - "github.com/ethereum-optimism/optimism/op-service/eth" - "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types" -) - -type MockInteropBackend struct { - Mock mock.Mock -} - -func (m *MockInteropBackend) UnsafeView(ctx context.Context, chainID eth.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) { - result := m.Mock.MethodCalled("UnsafeView", chainID, unsafe) - return result.Get(0).(types.ReferenceView), *result.Get(1).(*error) -} - -func (m *MockInteropBackend) ExpectUnsafeView(chainID eth.ChainID, unsafe types.ReferenceView, result types.ReferenceView, err error) { - m.Mock.On("UnsafeView", chainID, unsafe).Once().Return(result, &err) -} - -func (m *MockInteropBackend) OnUnsafeView(chainID eth.ChainID, fn func(request types.ReferenceView) (result types.ReferenceView, err error)) { - var result types.ReferenceView - var err error - m.Mock.On("UnsafeView", chainID, mock.Anything).Run(func(args mock.Arguments) { - v := args[0].(types.ReferenceView) - result, err = fn(v) - }).Return(result, &err) -} - -func (m *MockInteropBackend) SafeView(ctx context.Context, chainID eth.ChainID, safe types.ReferenceView) (types.ReferenceView, error) { - result := m.Mock.MethodCalled("SafeView", chainID, safe) - return result.Get(0).(types.ReferenceView), *result.Get(1).(*error) -} - -func (m *MockInteropBackend) ExpectSafeView(chainID eth.ChainID, safe types.ReferenceView, result types.ReferenceView, err error) { - m.Mock.On("SafeView", chainID, safe).Once().Return(result, &err) -} - -func (m *MockInteropBackend) OnSafeView(chainID eth.ChainID, fn func(request types.ReferenceView) (result types.ReferenceView, err error)) { - var result types.ReferenceView - var err error - m.Mock.On("SafeView", chainID, mock.Anything).Run(func(args mock.Arguments) { - v := args[0].(types.ReferenceView) - result, err = fn(v) - }).Return(result, &err) -} - -func (m *MockInteropBackend) Finalized(ctx context.Context, chainID eth.ChainID) (eth.BlockID, error) { - result := m.Mock.MethodCalled("Finalized", chainID) - return result.Get(0).(eth.BlockID), *result.Get(1).(*error) -} - -func (m *MockInteropBackend) ExpectFinalized(chainID eth.ChainID, result eth.BlockID, err error) { - m.Mock.On("Finalized", chainID).Once().Return(result, &err) -} - -func (m *MockInteropBackend) CrossDerivedFrom(ctx context.Context, chainID eth.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) { - result := m.Mock.MethodCalled("CrossDerivedFrom", chainID, derived) - return result.Get(0).(eth.L1BlockRef), *result.Get(1).(*error) -} - -func (m *MockInteropBackend) ExpectDerivedFrom(chainID eth.ChainID, derived eth.BlockID, result eth.L1BlockRef, err error) { - m.Mock.On("CrossDerivedFrom", chainID, derived).Once().Return(result, &err) -} - -func (m *MockInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID eth.ChainID, head eth.BlockRef) error { - result := m.Mock.MethodCalled("UpdateLocalUnsafe", chainID, head) - return *result.Get(0).(*error) -} - -func (m *MockInteropBackend) ExpectUpdateLocalUnsafe(chainID eth.ChainID, head eth.BlockRef, err error) { - m.Mock.On("UpdateLocalUnsafe", chainID, head).Once().Return(&err) -} - -func (m *MockInteropBackend) ExpectAnyUpdateLocalUnsafe(chainID eth.ChainID, err error) { - m.Mock.On("UpdateLocalUnsafe", chainID, mock.Anything).Once().Return(&err) -} - -func (m *MockInteropBackend) UpdateLocalSafe(ctx context.Context, chainID eth.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error { - result := m.Mock.MethodCalled("UpdateLocalSafe", chainID, derivedFrom, lastDerived) - return *result.Get(0).(*error) -} - -func (m *MockInteropBackend) ExpectUpdateLocalSafe(chainID eth.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef, err error) { - m.Mock.On("UpdateLocalSafe", chainID, derivedFrom, lastDerived).Once().Return(&err) -} - -func (m *MockInteropBackend) UpdateFinalizedL1(ctx context.Context, chainID eth.ChainID, finalized eth.L1BlockRef) error { - result := m.Mock.MethodCalled("UpdateFinalizedL1", chainID, finalized) - return *result.Get(0).(*error) -} - -func (m *MockInteropBackend) AssertExpectations(t mock.TestingT) { - m.Mock.AssertExpectations(t) -} diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go index ca5d67d6313aa..5c9cc1b00ba95 100644 --- a/op-supervisor/supervisor/frontend/frontend.go +++ b/op-supervisor/supervisor/frontend/frontend.go @@ -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) }