diff --git a/app/ldiff/diff.go b/app/ldiff/diff.go index 7b1ad445..55c35646 100644 --- a/app/ldiff/diff.go +++ b/app/ldiff/diff.go @@ -1,7 +1,7 @@ // Package ldiff provides a container of elements with fixed id and changeable content. // Diff can calculate the difference with another diff container (you can make it remote) with minimum hops and traffic. // -//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anyproto/any-sync/app/ldiff Diff,Remote,DiffContainer +//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anyproto/any-sync/app/ldiff Diff,Remote package ldiff import ( diff --git a/app/ldiff/mock_ldiff/mock_ldiff.go b/app/ldiff/mock_ldiff/mock_ldiff.go index a9edaaf8..a5d2c786 100644 --- a/app/ldiff/mock_ldiff/mock_ldiff.go +++ b/app/ldiff/mock_ldiff/mock_ldiff.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anyproto/any-sync/app/ldiff (interfaces: Diff,Remote,DiffContainer) +// Source: github.com/anyproto/any-sync/app/ldiff (interfaces: Diff,Remote) // // Generated by this command: // -// mockgen -destination mock_ldiff/mock_ldiff.go github.com/anyproto/any-sync/app/ldiff Diff,Remote,DiffContainer +// mockgen -destination mock_ldiff/mock_ldiff.go github.com/anyproto/any-sync/app/ldiff Diff,Remote // // Package mock_ldiff is a generated GoMock package. @@ -14,7 +14,6 @@ import ( reflect "reflect" ldiff "github.com/anyproto/any-sync/app/ldiff" - spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto" gomock "go.uber.org/mock/gomock" ) @@ -58,20 +57,6 @@ func (mr *MockDiffMockRecorder) Diff(arg0, arg1 any) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Diff", reflect.TypeOf((*MockDiff)(nil).Diff), arg0, arg1) } -// DiffType mocks base method. -func (m *MockDiff) DiffType() spacesyncproto.DiffType { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DiffType") - ret0, _ := ret[0].(spacesyncproto.DiffType) - return ret0 -} - -// DiffType indicates an expected call of DiffType. -func (mr *MockDiffMockRecorder) DiffType() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DiffType", reflect.TypeOf((*MockDiff)(nil).DiffType)) -} - // Element mocks base method. func (m *MockDiff) Element(arg0 string) (ldiff.Element, error) { m.ctrl.T.Helper() @@ -225,70 +210,3 @@ func (mr *MockRemoteMockRecorder) Ranges(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ranges", reflect.TypeOf((*MockRemote)(nil).Ranges), arg0, arg1, arg2) } - -// MockDiffContainer is a mock of DiffContainer interface. -type MockDiffContainer struct { - ctrl *gomock.Controller - recorder *MockDiffContainerMockRecorder -} - -// MockDiffContainerMockRecorder is the mock recorder for MockDiffContainer. -type MockDiffContainerMockRecorder struct { - mock *MockDiffContainer -} - -// NewMockDiffContainer creates a new mock instance. -func NewMockDiffContainer(ctrl *gomock.Controller) *MockDiffContainer { - mock := &MockDiffContainer{ctrl: ctrl} - mock.recorder = &MockDiffContainerMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockDiffContainer) EXPECT() *MockDiffContainerMockRecorder { - return m.recorder -} - -// PrecalculatedDiff mocks base method. -func (m *MockDiffContainer) PrecalculatedDiff() ldiff.Diff { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PrecalculatedDiff") - ret0, _ := ret[0].(ldiff.Diff) - return ret0 -} - -// PrecalculatedDiff indicates an expected call of PrecalculatedDiff. -func (mr *MockDiffContainerMockRecorder) PrecalculatedDiff() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrecalculatedDiff", reflect.TypeOf((*MockDiffContainer)(nil).PrecalculatedDiff)) -} - -// RemoveId mocks base method. -func (m *MockDiffContainer) RemoveId(arg0 string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RemoveId", arg0) - ret0, _ := ret[0].(error) - return ret0 -} - -// RemoveId indicates an expected call of RemoveId. -func (mr *MockDiffContainerMockRecorder) RemoveId(arg0 any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveId", reflect.TypeOf((*MockDiffContainer)(nil).RemoveId), arg0) -} - -// Set mocks base method. -func (m *MockDiffContainer) Set(arg0 ...ldiff.Element) { - m.ctrl.T.Helper() - varargs := []any{} - for _, a := range arg0 { - varargs = append(varargs, a) - } - m.ctrl.Call(m, "Set", varargs...) -} - -// Set indicates an expected call of Set. -func (mr *MockDiffContainerMockRecorder) Set(arg0 ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockDiffContainer)(nil).Set), arg0...) -} diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index a5ec060c..2989702c 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -143,11 +143,10 @@ func TestDiffSyncer(t *testing.T) { newHeads := []string{"h1", "h2"} hash := "hash" fx.aclMock.EXPECT().Id().AnyTimes().Return("aclId") - fx.diffContainerMock.EXPECT().Set(ldiff.Element{ + fx.diffMock.EXPECT().Set(ldiff.Element{ Id: newId, Head: concatStrings(newHeads), }) - fx.diffContainerMock.EXPECT().PrecalculatedDiff().Return(fx.diffMock) fx.diffMock.EXPECT().Hash().Return(hash) fx.deletionStateMock.EXPECT().Exists(newId).Return(false) fx.storageMock.EXPECT().WriteSpaceHash(hash) diff --git a/commonspace/headsync/headsync_test.go b/commonspace/headsync/headsync_test.go index 092d5419..09107142 100644 --- a/commonspace/headsync/headsync_test.go +++ b/commonspace/headsync/headsync_test.go @@ -62,7 +62,6 @@ type headSyncFixture struct { deletionStateMock *mock_deletionstate.MockObjectDeletionState diffSyncerMock *mock_headsync.MockDiffSyncer treeSyncerMock *mock_treesyncer.MockTreeSyncer - diffContainerMock *mock_ldiff.MockDiffContainer diffMock *mock_ldiff.MockDiff clientMock *mock_spacesyncproto.MockDRPCSpaceSyncClient aclMock *mock_syncacl.MockSyncAcl @@ -90,7 +89,6 @@ func newHeadSyncFixture(t *testing.T) *headSyncFixture { diffSyncerMock := mock_headsync.NewMockDiffSyncer(ctrl) treeSyncerMock := mock_treesyncer.NewMockTreeSyncer(ctrl) treeSyncerMock.EXPECT().Name().AnyTimes().Return(treesyncer.CName) - diffContainerMock := mock_ldiff.NewMockDiffContainer(ctrl) diffMock := mock_ldiff.NewMockDiff(ctrl) clientMock := mock_spacesyncproto.NewMockDRPCSpaceSyncClient(ctrl) aclMock := mock_syncacl.NewMockSyncAcl(ctrl) @@ -123,7 +121,6 @@ func newHeadSyncFixture(t *testing.T) *headSyncFixture { headSync: hs, diffSyncerMock: diffSyncerMock, treeSyncerMock: treeSyncerMock, - diffContainerMock: diffContainerMock, diffMock: diffMock, clientMock: clientMock, aclMock: aclMock, @@ -137,7 +134,7 @@ func (fx *headSyncFixture) init(t *testing.T) { fx.diffSyncerMock.EXPECT().Init() err := fx.headSync.Init(fx.app) require.NoError(t, err) - + fx.headSync.diff = fx.diffMock } func (fx *headSyncFixture) stop() { @@ -159,11 +156,10 @@ func TestHeadSync(t *testing.T) { fx.aclMock.EXPECT().Id().AnyTimes().Return("aclId") fx.aclMock.EXPECT().Head().AnyTimes().Return(&list.AclRecord{Id: "headId"}) treeMock.EXPECT().Heads().Return([]string{"h1", "h2"}, nil) - fx.diffContainerMock.EXPECT().Set(ldiff.Element{ + fx.diffMock.EXPECT().Set(ldiff.Element{ Id: "id1", Head: "h1h2", }) - fx.diffContainerMock.EXPECT().PrecalculatedDiff().Return(fx.diffMock) fx.diffMock.EXPECT().Hash().Return("hash") fx.storageMock.EXPECT().WriteSpaceHash("hash").Return(nil) fx.diffSyncerMock.EXPECT().Sync(gomock.Any()).Return(nil) diff --git a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index eaa0815e..a882f458 100644 --- a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go +++ b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -104,7 +104,7 @@ func (mr *MockObjectTreeMockRecorder) AddRawChanges(arg0, arg1 any) *gomock.Call } // AddRawChangesWithUpdater mocks base method. -func (m *MockObjectTree) AddRawChangesWithUpdater(arg0 context.Context, arg1 objecttree.RawChangesPayload, arg2 objecttree.Updater) (objecttree.AddResult, error) { +func (m *MockObjectTree) AddRawChangesWithUpdater(arg0 context.Context, arg1 objecttree.RawChangesPayload, arg2 func(objecttree.ObjectTree, objecttree.Mode) error) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawChangesWithUpdater", arg0, arg1, arg2) ret0, _ := ret[0].(objecttree.AddResult) @@ -205,20 +205,6 @@ func (mr *MockObjectTreeMockRecorder) Delete() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockObjectTree)(nil).Delete)) } -// Flush mocks base method. -func (m *MockObjectTree) Flush() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Flush") - ret0, _ := ret[0].(error) - return ret0 -} - -// Flush indicates an expected call of Flush. -func (mr *MockObjectTreeMockRecorder) Flush() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Flush", reflect.TypeOf((*MockObjectTree)(nil).Flush)) -} - // GetChange mocks base method. func (m *MockObjectTree) GetChange(arg0 string) (*objecttree.Change, error) { m.ctrl.T.Helper() diff --git a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index f231e61f..b0284f33 100644 --- a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go +++ b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -128,7 +128,7 @@ func (mr *MockSyncTreeMockRecorder) AddRawChangesFromPeer(arg0, arg1, arg2 any) } // AddRawChangesWithUpdater mocks base method. -func (m *MockSyncTree) AddRawChangesWithUpdater(arg0 context.Context, arg1 objecttree.RawChangesPayload, arg2 objecttree.Updater) (objecttree.AddResult, error) { +func (m *MockSyncTree) AddRawChangesWithUpdater(arg0 context.Context, arg1 objecttree.RawChangesPayload, arg2 func(objecttree.ObjectTree, objecttree.Mode) error) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawChangesWithUpdater", arg0, arg1, arg2) ret0, _ := ret[0].(objecttree.AddResult) @@ -229,20 +229,6 @@ func (mr *MockSyncTreeMockRecorder) Delete() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockSyncTree)(nil).Delete)) } -// Flush mocks base method. -func (m *MockSyncTree) Flush() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Flush") - ret0, _ := ret[0].(error) - return ret0 -} - -// Flush indicates an expected call of Flush. -func (mr *MockSyncTreeMockRecorder) Flush() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Flush", reflect.TypeOf((*MockSyncTree)(nil).Flush)) -} - // GetChange mocks base method. func (m *MockSyncTree) GetChange(arg0 string) (*objecttree.Change, error) { m.ctrl.T.Helper()