diff --git a/accountservice/mock_accountservice/mock_accountservice.go b/accountservice/mock_accountservice/mock_accountservice.go index 7da43f91..632a9cb7 100644 --- a/accountservice/mock_accountservice/mock_accountservice.go +++ b/accountservice/mock_accountservice/mock_accountservice.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/accountservice (interfaces: Service) - +// +// Generated by this command: +// +// mockgen -destination mock_accountservice/mock_accountservice.go github.com/anyproto/any-sync/accountservice Service +// // Package mock_accountservice is a generated GoMock package. package mock_accountservice @@ -58,7 +62,7 @@ func (m *MockService) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockServiceMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockService)(nil).Init), arg0) } diff --git a/app/ldiff/mock_ldiff/mock_ldiff.go b/app/ldiff/mock_ldiff/mock_ldiff.go index 8e09ade9..f26cba47 100644 --- a/app/ldiff/mock_ldiff/mock_ldiff.go +++ b/app/ldiff/mock_ldiff/mock_ldiff.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // 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 +// // Package mock_ldiff is a generated GoMock package. package mock_ldiff @@ -47,7 +51,7 @@ func (m *MockDiff) Diff(arg0 context.Context, arg1 ldiff.Remote) ([]string, []st } // Diff indicates an expected call of Diff. -func (mr *MockDiffMockRecorder) Diff(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDiffMockRecorder) Diff(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Diff", reflect.TypeOf((*MockDiff)(nil).Diff), arg0, arg1) } @@ -62,7 +66,7 @@ func (m *MockDiff) Element(arg0 string) (ldiff.Element, error) { } // Element indicates an expected call of Element. -func (mr *MockDiffMockRecorder) Element(arg0 interface{}) *gomock.Call { +func (mr *MockDiffMockRecorder) Element(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Element", reflect.TypeOf((*MockDiff)(nil).Element), arg0) } @@ -133,7 +137,7 @@ func (m *MockDiff) Ranges(arg0 context.Context, arg1 []ldiff.Range, arg2 []ldiff } // Ranges indicates an expected call of Ranges. -func (mr *MockDiffMockRecorder) Ranges(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockDiffMockRecorder) Ranges(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ranges", reflect.TypeOf((*MockDiff)(nil).Ranges), arg0, arg1, arg2) } @@ -147,7 +151,7 @@ func (m *MockDiff) RemoveId(arg0 string) error { } // RemoveId indicates an expected call of RemoveId. -func (mr *MockDiffMockRecorder) RemoveId(arg0 interface{}) *gomock.Call { +func (mr *MockDiffMockRecorder) RemoveId(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveId", reflect.TypeOf((*MockDiff)(nil).RemoveId), arg0) } @@ -155,7 +159,7 @@ func (mr *MockDiffMockRecorder) RemoveId(arg0 interface{}) *gomock.Call { // Set mocks base method. func (m *MockDiff) Set(arg0 ...ldiff.Element) { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -163,7 +167,7 @@ func (m *MockDiff) Set(arg0 ...ldiff.Element) { } // Set indicates an expected call of Set. -func (mr *MockDiffMockRecorder) Set(arg0 ...interface{}) *gomock.Call { +func (mr *MockDiffMockRecorder) Set(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockDiff)(nil).Set), arg0...) } @@ -201,7 +205,7 @@ func (m *MockRemote) Ranges(arg0 context.Context, arg1 []ldiff.Range, arg2 []ldi } // Ranges indicates an expected call of Ranges. -func (mr *MockRemoteMockRecorder) Ranges(arg0, arg1, arg2 interface{}) *gomock.Call { +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) } diff --git a/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go index 18090381..00c3f139 100644 --- a/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go +++ b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/credentialprovider (interfaces: CredentialProvider) - +// +// Generated by this command: +// +// mockgen -destination mock_credentialprovider/mock_credentialprovider.go github.com/anyproto/any-sync/commonspace/credentialprovider CredentialProvider +// // Package mock_credentialprovider is a generated GoMock package. package mock_credentialprovider @@ -46,7 +50,7 @@ func (m *MockCredentialProvider) GetCredential(arg0 context.Context, arg1 *space } // GetCredential indicates an expected call of GetCredential. -func (mr *MockCredentialProviderMockRecorder) GetCredential(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCredentialProviderMockRecorder) GetCredential(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCredential", reflect.TypeOf((*MockCredentialProvider)(nil).GetCredential), arg0, arg1) } @@ -60,7 +64,7 @@ func (m *MockCredentialProvider) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockCredentialProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockCredentialProviderMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockCredentialProvider)(nil).Init), arg0) } diff --git a/commonspace/deletion_test.go b/commonspace/deletion_test.go index 235433da..3d1f2dc2 100644 --- a/commonspace/deletion_test.go +++ b/commonspace/deletion_test.go @@ -68,7 +68,7 @@ func TestSpaceDeleteIds(t *testing.T) { require.NotNil(t, sp) // initializing space - spc, err := fx.spaceService.NewSpace(ctx, sp) + spc, err := fx.spaceService.NewSpace(ctx, sp, Deps{TreeSyncer: mockTreeSyncer{}}) require.NoError(t, err) require.NotNil(t, spc) // adding space to tree manager @@ -146,7 +146,7 @@ func TestSpaceDeleteIdsIncorrectSnapshot(t *testing.T) { require.NotNil(t, sp) // initializing space - spc, err := fx.spaceService.NewSpace(ctx, sp) + spc, err := fx.spaceService.NewSpace(ctx, sp, Deps{TreeSyncer: mockTreeSyncer{}}) require.NoError(t, err) require.NotNil(t, spc) // adding space to tree manager @@ -186,7 +186,7 @@ func TestSpaceDeleteIdsIncorrectSnapshot(t *testing.T) { // now we replace the storage, so the trees are back, but the settings object says that they are deleted fx.storageProvider.(*spacestorage.InMemorySpaceStorageProvider).SetStorage(storageCopy) - spc, err = fx.spaceService.NewSpace(ctx, sp) + spc, err = fx.spaceService.NewSpace(ctx, sp, Deps{TreeSyncer: mockTreeSyncer{}}) require.NoError(t, err) require.NotNil(t, spc) fx.treeManager.waitLoad = make(chan struct{}) @@ -233,7 +233,7 @@ func TestSpaceDeleteIdsMarkDeleted(t *testing.T) { require.NotNil(t, sp) // initializing space - spc, err := fx.spaceService.NewSpace(ctx, sp) + spc, err := fx.spaceService.NewSpace(ctx, sp, Deps{TreeSyncer: mockTreeSyncer{}}) require.NoError(t, err) require.NotNil(t, spc) // adding space to tree manager @@ -266,7 +266,7 @@ func TestSpaceDeleteIdsMarkDeleted(t *testing.T) { // now we replace the storage, so the trees are back, but the settings object says that they are deleted fx.storageProvider.(*spacestorage.InMemorySpaceStorageProvider).SetStorage(storageCopy) - spc, err = fx.spaceService.NewSpace(ctx, sp) + spc, err = fx.spaceService.NewSpace(ctx, sp, Deps{TreeSyncer: mockTreeSyncer{}}) require.NoError(t, err) require.NotNil(t, spc) fx.treeManager.space = spc diff --git a/commonspace/deletionmanager/mock_deletionmanager/mock_deletionmanager.go b/commonspace/deletionmanager/mock_deletionmanager/mock_deletionmanager.go index 0f906f31..5e956f5a 100644 --- a/commonspace/deletionmanager/mock_deletionmanager/mock_deletionmanager.go +++ b/commonspace/deletionmanager/mock_deletionmanager/mock_deletionmanager.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/deletionmanager (interfaces: DeletionManager,Deleter) - +// +// Generated by this command: +// +// mockgen -destination mock_deletionmanager/mock_deletionmanager.go github.com/anyproto/any-sync/commonspace/deletionmanager DeletionManager,Deleter +// // Package mock_deletionmanager is a generated GoMock package. package mock_deletionmanager @@ -45,7 +49,7 @@ func (m *MockDeletionManager) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockDeletionManagerMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockDeletionManagerMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockDeletionManager)(nil).Close), arg0) } @@ -59,7 +63,7 @@ func (m *MockDeletionManager) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockDeletionManagerMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockDeletionManagerMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockDeletionManager)(nil).Init), arg0) } @@ -87,7 +91,7 @@ func (m *MockDeletionManager) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockDeletionManagerMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockDeletionManagerMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockDeletionManager)(nil).Run), arg0) } @@ -101,7 +105,7 @@ func (m *MockDeletionManager) UpdateState(arg0 context.Context, arg1 *settingsst } // UpdateState indicates an expected call of UpdateState. -func (mr *MockDeletionManagerMockRecorder) UpdateState(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDeletionManagerMockRecorder) UpdateState(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateState", reflect.TypeOf((*MockDeletionManager)(nil).UpdateState), arg0, arg1) } diff --git a/commonspace/deletionstate/mock_deletionstate/mock_deletionstate.go b/commonspace/deletionstate/mock_deletionstate/mock_deletionstate.go index 7706b004..1faf94a7 100644 --- a/commonspace/deletionstate/mock_deletionstate/mock_deletionstate.go +++ b/commonspace/deletionstate/mock_deletionstate/mock_deletionstate.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/deletionstate (interfaces: ObjectDeletionState) - +// +// Generated by this command: +// +// mockgen -destination mock_deletionstate/mock_deletionstate.go github.com/anyproto/any-sync/commonspace/deletionstate ObjectDeletionState +// // Package mock_deletionstate is a generated GoMock package. package mock_deletionstate @@ -42,7 +46,7 @@ func (m *MockObjectDeletionState) Add(arg0 map[string]struct{}) { } // Add indicates an expected call of Add. -func (mr *MockObjectDeletionStateMockRecorder) Add(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) Add(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockObjectDeletionState)(nil).Add), arg0) } @@ -54,7 +58,7 @@ func (m *MockObjectDeletionState) AddObserver(arg0 deletionstate.StateUpdateObse } // AddObserver indicates an expected call of AddObserver. -func (mr *MockObjectDeletionStateMockRecorder) AddObserver(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) AddObserver(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddObserver", reflect.TypeOf((*MockObjectDeletionState)(nil).AddObserver), arg0) } @@ -68,7 +72,7 @@ func (m *MockObjectDeletionState) Delete(arg0 string) error { } // Delete indicates an expected call of Delete. -func (mr *MockObjectDeletionStateMockRecorder) Delete(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) Delete(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockObjectDeletionState)(nil).Delete), arg0) } @@ -82,7 +86,7 @@ func (m *MockObjectDeletionState) Exists(arg0 string) bool { } // Exists indicates an expected call of Exists. -func (mr *MockObjectDeletionStateMockRecorder) Exists(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) Exists(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockObjectDeletionState)(nil).Exists), arg0) } @@ -96,7 +100,7 @@ func (m *MockObjectDeletionState) Filter(arg0 []string) []string { } // Filter indicates an expected call of Filter. -func (mr *MockObjectDeletionStateMockRecorder) Filter(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) Filter(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Filter", reflect.TypeOf((*MockObjectDeletionState)(nil).Filter), arg0) } @@ -124,7 +128,7 @@ func (m *MockObjectDeletionState) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockObjectDeletionStateMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockObjectDeletionStateMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockObjectDeletionState)(nil).Init), arg0) } diff --git a/commonspace/headsync/diffsyncer.go b/commonspace/headsync/diffsyncer.go index 2c54fecb..bdf070b7 100644 --- a/commonspace/headsync/diffsyncer.go +++ b/commonspace/headsync/diffsyncer.go @@ -2,6 +2,7 @@ package headsync import ( "context" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" "time" "github.com/anyproto/any-sync/app/ldiff" @@ -26,7 +27,6 @@ type DiffSyncer interface { RemoveObjects(ids []string) UpdateHeads(id string, heads []string) Init() - Close() error } const logPeriodSecs = 200 @@ -35,7 +35,6 @@ func newDiffSyncer(hs *headSync) DiffSyncer { return &diffSyncer{ diff: hs.diff, spaceId: hs.spaceId, - treeManager: hs.treeManager, storage: hs.storage, peerManager: hs.peerManager, clientFactory: spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceSyncClient), @@ -44,6 +43,7 @@ func newDiffSyncer(hs *headSync) DiffSyncer { syncStatus: hs.syncStatus, deletionState: hs.deletionState, syncAcl: hs.syncAcl, + treeSyncer: hs.treeSyncer, } } @@ -52,19 +52,18 @@ type diffSyncer struct { diff ldiff.Diff peerManager peermanager.PeerManager treeManager treemanager.TreeManager + treeSyncer treesyncer.TreeSyncer storage spacestorage.SpaceStorage clientFactory spacesyncproto.ClientFactory log syncLogger deletionState deletionstate.ObjectDeletionState credentialProvider credentialprovider.CredentialProvider syncStatus syncstatus.StatusUpdater - treeSyncer treemanager.TreeSyncer syncAcl syncacl.SyncAcl } func (d *diffSyncer) Init() { d.deletionState.AddObserver(d.RemoveObjects) - d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId, d.treeManager) } func (d *diffSyncer) RemoveObjects(ids []string) { @@ -246,7 +245,3 @@ func (d *diffSyncer) subscribe(ctx context.Context, peerId string) (err error) { Payload: payload, }) } - -func (d *diffSyncer) Close() error { - return d.treeSyncer.Close() -} diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index 14235537..986f5240 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -101,7 +101,6 @@ func (fx *headSyncFixture) initDiffSyncer(t *testing.T) { return fx.clientMock }) fx.deletionStateMock.EXPECT().AddObserver(gomock.Any()) - fx.treeManagerMock.EXPECT().NewTreeSyncer(fx.spaceState.SpaceId, fx.treeManagerMock).Return(fx.treeSyncerMock) fx.diffSyncer.Init() } diff --git a/commonspace/headsync/headsync.go b/commonspace/headsync/headsync.go index e3ad7251..5b576f37 100644 --- a/commonspace/headsync/headsync.go +++ b/commonspace/headsync/headsync.go @@ -3,6 +3,7 @@ package headsync import ( "context" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" "time" "github.com/anyproto/any-sync/app" @@ -12,7 +13,6 @@ import ( "github.com/anyproto/any-sync/commonspace/credentialprovider" "github.com/anyproto/any-sync/commonspace/deletionstate" "github.com/anyproto/any-sync/commonspace/object/acl/syncacl" - "github.com/anyproto/any-sync/commonspace/object/treemanager" "github.com/anyproto/any-sync/commonspace/peermanager" "github.com/anyproto/any-sync/commonspace/spacestate" "github.com/anyproto/any-sync/commonspace/spacestorage" @@ -54,7 +54,7 @@ type headSync struct { syncer DiffSyncer configuration nodeconf.NodeConf peerManager peermanager.PeerManager - treeManager treemanager.TreeManager + treeSyncer treesyncer.TreeSyncer credentialProvider credentialprovider.CredentialProvider syncStatus syncstatus.StatusService deletionState deletionstate.ObjectDeletionState @@ -80,7 +80,7 @@ func (h *headSync) Init(a *app.App) (err error) { h.peerManager = a.MustComponent(peermanager.CName).(peermanager.PeerManager) h.credentialProvider = a.MustComponent(credentialprovider.CName).(credentialprovider.CredentialProvider) h.syncStatus = a.MustComponent(syncstatus.CName).(syncstatus.StatusService) - h.treeManager = a.MustComponent(treemanager.CName).(treemanager.TreeManager) + h.treeSyncer = a.MustComponent(treesyncer.CName).(treesyncer.TreeSyncer) h.deletionState = a.MustComponent(deletionstate.CName).(deletionstate.ObjectDeletionState) h.syncer = createDiffSyncer(h) sync := func(ctx context.Context) (err error) { @@ -144,7 +144,7 @@ func (h *headSync) RemoveObjects(ids []string) { func (h *headSync) Close(ctx context.Context) (err error) { h.periodicSync.Close() - return h.syncer.Close() + return } func (h *headSync) fillDiff(objectIds []string) { diff --git a/commonspace/headsync/headsync_test.go b/commonspace/headsync/headsync_test.go index bff80a2f..064ea0d0 100644 --- a/commonspace/headsync/headsync_test.go +++ b/commonspace/headsync/headsync_test.go @@ -17,6 +17,8 @@ import ( "github.com/anyproto/any-sync/commonspace/object/tree/treestorage/mock_treestorage" "github.com/anyproto/any-sync/commonspace/object/treemanager" "github.com/anyproto/any-sync/commonspace/object/treemanager/mock_treemanager" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" + "github.com/anyproto/any-sync/commonspace/object/treesyncer/mock_treesyncer" "github.com/anyproto/any-sync/commonspace/peermanager" "github.com/anyproto/any-sync/commonspace/peermanager/mock_peermanager" "github.com/anyproto/any-sync/commonspace/spacestate" @@ -59,7 +61,7 @@ type headSyncFixture struct { treeManagerMock *mock_treemanager.MockTreeManager deletionStateMock *mock_deletionstate.MockObjectDeletionState diffSyncerMock *mock_headsync.MockDiffSyncer - treeSyncerMock *mock_treemanager.MockTreeSyncer + treeSyncerMock *mock_treesyncer.MockTreeSyncer diffMock *mock_ldiff.MockDiff clientMock *mock_spacesyncproto.MockDRPCSpaceSyncClient aclMock *mock_syncacl.MockSyncAcl @@ -86,7 +88,8 @@ func newHeadSyncFixture(t *testing.T) *headSyncFixture { deletionStateMock := mock_deletionstate.NewMockObjectDeletionState(ctrl) deletionStateMock.EXPECT().Name().AnyTimes().Return(deletionstate.CName) diffSyncerMock := mock_headsync.NewMockDiffSyncer(ctrl) - treeSyncerMock := mock_treemanager.NewMockTreeSyncer(ctrl) + treeSyncerMock := mock_treesyncer.NewMockTreeSyncer(ctrl) + treeSyncerMock.EXPECT().Name().AnyTimes().Return(treesyncer.CName) diffMock := mock_ldiff.NewMockDiff(ctrl) clientMock := mock_spacesyncproto.NewMockDRPCSpaceSyncClient(ctrl) aclMock := mock_syncacl.NewMockSyncAcl(ctrl) @@ -103,6 +106,7 @@ func newHeadSyncFixture(t *testing.T) *headSyncFixture { Register(credentialProviderMock). Register(syncStatus). Register(treeManagerMock). + Register(treeSyncerMock). Register(deletionStateMock). Register(hs) return &headSyncFixture{ @@ -161,7 +165,6 @@ func TestHeadSync(t *testing.T) { fx.diffMock.EXPECT().Hash().Return("hash") fx.storageMock.EXPECT().WriteSpaceHash("hash").Return(nil) fx.diffSyncerMock.EXPECT().Sync(gomock.Any()).Return(nil) - fx.diffSyncerMock.EXPECT().Close().Return(nil) err := fx.headSync.Run(ctx) require.NoError(t, err) err = fx.headSync.Close(ctx) diff --git a/commonspace/headsync/mock_headsync/mock_headsync.go b/commonspace/headsync/mock_headsync/mock_headsync.go index b569fde4..3be2b3c5 100644 --- a/commonspace/headsync/mock_headsync/mock_headsync.go +++ b/commonspace/headsync/mock_headsync/mock_headsync.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/headsync (interfaces: DiffSyncer) - +// +// Generated by this command: +// +// mockgen -destination mock_headsync/mock_headsync.go github.com/anyproto/any-sync/commonspace/headsync DiffSyncer +// // Package mock_headsync is a generated GoMock package. package mock_headsync @@ -34,20 +38,6 @@ func (m *MockDiffSyncer) EXPECT() *MockDiffSyncerMockRecorder { return m.recorder } -// Close mocks base method. -func (m *MockDiffSyncer) Close() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Close") - ret0, _ := ret[0].(error) - return ret0 -} - -// Close indicates an expected call of Close. -func (mr *MockDiffSyncerMockRecorder) Close() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockDiffSyncer)(nil).Close)) -} - // Init mocks base method. func (m *MockDiffSyncer) Init() { m.ctrl.T.Helper() @@ -67,7 +57,7 @@ func (m *MockDiffSyncer) RemoveObjects(arg0 []string) { } // RemoveObjects indicates an expected call of RemoveObjects. -func (mr *MockDiffSyncerMockRecorder) RemoveObjects(arg0 interface{}) *gomock.Call { +func (mr *MockDiffSyncerMockRecorder) RemoveObjects(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveObjects", reflect.TypeOf((*MockDiffSyncer)(nil).RemoveObjects), arg0) } @@ -81,7 +71,7 @@ func (m *MockDiffSyncer) Sync(arg0 context.Context) error { } // Sync indicates an expected call of Sync. -func (mr *MockDiffSyncerMockRecorder) Sync(arg0 interface{}) *gomock.Call { +func (mr *MockDiffSyncerMockRecorder) Sync(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sync", reflect.TypeOf((*MockDiffSyncer)(nil).Sync), arg0) } @@ -93,7 +83,7 @@ func (m *MockDiffSyncer) UpdateHeads(arg0 string, arg1 []string) { } // UpdateHeads indicates an expected call of UpdateHeads. -func (mr *MockDiffSyncerMockRecorder) UpdateHeads(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDiffSyncerMockRecorder) UpdateHeads(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateHeads", reflect.TypeOf((*MockDiffSyncer)(nil).UpdateHeads), arg0, arg1) } diff --git a/commonspace/mock_commonspace/mock_commonspace.go b/commonspace/mock_commonspace/mock_commonspace.go index 20c1e14b..7677eb83 100644 --- a/commonspace/mock_commonspace/mock_commonspace.go +++ b/commonspace/mock_commonspace/mock_commonspace.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace (interfaces: Space) - +// +// Generated by this command: +// +// mockgen -destination mock_commonspace/mock_commonspace.go github.com/anyproto/any-sync/commonspace Space +// // Package mock_commonspace is a generated GoMock package. package mock_commonspace @@ -12,6 +16,7 @@ import ( commonspace "github.com/anyproto/any-sync/commonspace" headsync "github.com/anyproto/any-sync/commonspace/headsync" syncacl "github.com/anyproto/any-sync/commonspace/object/acl/syncacl" + treesyncer "github.com/anyproto/any-sync/commonspace/object/treesyncer" objectsync "github.com/anyproto/any-sync/commonspace/objectsync" objecttreebuilder "github.com/anyproto/any-sync/commonspace/objecttreebuilder" spacestorage "github.com/anyproto/any-sync/commonspace/spacestorage" @@ -95,7 +100,7 @@ func (m *MockSpace) DeleteTree(arg0 context.Context, arg1 string) error { } // DeleteTree indicates an expected call of DeleteTree. -func (mr *MockSpaceMockRecorder) DeleteTree(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) DeleteTree(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTree", reflect.TypeOf((*MockSpace)(nil).DeleteTree), arg0, arg1) } @@ -125,7 +130,7 @@ func (m *MockSpace) GetNodePeers(arg0 context.Context) ([]peer.Peer, error) { } // GetNodePeers indicates an expected call of GetNodePeers. -func (mr *MockSpaceMockRecorder) GetNodePeers(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) GetNodePeers(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNodePeers", reflect.TypeOf((*MockSpace)(nil).GetNodePeers), arg0) } @@ -139,7 +144,7 @@ func (m *MockSpace) HandleMessage(arg0 context.Context, arg1 objectsync.HandleMe } // HandleMessage indicates an expected call of HandleMessage. -func (mr *MockSpaceMockRecorder) HandleMessage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) HandleMessage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockSpace)(nil).HandleMessage), arg0, arg1) } @@ -154,7 +159,7 @@ func (m *MockSpace) HandleRangeRequest(arg0 context.Context, arg1 *spacesyncprot } // HandleRangeRequest indicates an expected call of HandleRangeRequest. -func (mr *MockSpaceMockRecorder) HandleRangeRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) HandleRangeRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleRangeRequest", reflect.TypeOf((*MockSpace)(nil).HandleRangeRequest), arg0, arg1) } @@ -169,7 +174,7 @@ func (m *MockSpace) HandleSyncRequest(arg0 context.Context, arg1 *spacesyncproto } // HandleSyncRequest indicates an expected call of HandleSyncRequest. -func (mr *MockSpaceMockRecorder) HandleSyncRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) HandleSyncRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleSyncRequest", reflect.TypeOf((*MockSpace)(nil).HandleSyncRequest), arg0, arg1) } @@ -197,7 +202,7 @@ func (m *MockSpace) Init(arg0 context.Context) error { } // Init indicates an expected call of Init. -func (mr *MockSpaceMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpace)(nil).Init), arg0) } @@ -258,6 +263,20 @@ func (mr *MockSpaceMockRecorder) TreeBuilder() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeBuilder", reflect.TypeOf((*MockSpace)(nil).TreeBuilder)) } +// TreeSyncer mocks base method. +func (m *MockSpace) TreeSyncer() treesyncer.TreeSyncer { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeSyncer") + ret0, _ := ret[0].(treesyncer.TreeSyncer) + return ret0 +} + +// TreeSyncer indicates an expected call of TreeSyncer. +func (mr *MockSpaceMockRecorder) TreeSyncer() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeSyncer", reflect.TypeOf((*MockSpace)(nil).TreeSyncer)) +} + // TryClose mocks base method. func (m *MockSpace) TryClose(arg0 time.Duration) (bool, error) { m.ctrl.T.Helper() @@ -268,7 +287,7 @@ func (m *MockSpace) TryClose(arg0 time.Duration) (bool, error) { } // TryClose indicates an expected call of TryClose. -func (mr *MockSpaceMockRecorder) TryClose(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceMockRecorder) TryClose(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockSpace)(nil).TryClose), arg0) } diff --git a/commonspace/object/acl/list/mock_list/mock_list.go b/commonspace/object/acl/list/mock_list/mock_list.go index c7953ca1..1d99a50e 100644 --- a/commonspace/object/acl/list/mock_list/mock_list.go +++ b/commonspace/object/acl/list/mock_list/mock_list.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/acl/list (interfaces: AclList) - +// +// Generated by this command: +// +// mockgen -destination mock_list/mock_list.go github.com/anyproto/any-sync/commonspace/object/acl/list AclList +// // Package mock_list is a generated GoMock package. package mock_list @@ -60,7 +64,7 @@ func (m *MockAclList) AddRawRecord(arg0 *consensusproto.RawRecordWithId) error { } // AddRawRecord indicates an expected call of AddRawRecord. -func (mr *MockAclListMockRecorder) AddRawRecord(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) AddRawRecord(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockAclList)(nil).AddRawRecord), arg0) } @@ -74,7 +78,7 @@ func (m *MockAclList) AddRawRecords(arg0 []*consensusproto.RawRecordWithId) erro } // AddRawRecords indicates an expected call of AddRawRecords. -func (mr *MockAclListMockRecorder) AddRawRecords(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) AddRawRecords(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecords", reflect.TypeOf((*MockAclList)(nil).AddRawRecords), arg0) } @@ -88,7 +92,7 @@ func (m *MockAclList) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockAclListMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockAclList)(nil).Close), arg0) } @@ -103,7 +107,7 @@ func (m *MockAclList) Get(arg0 string) (*list.AclRecord, error) { } // Get indicates an expected call of Get. -func (mr *MockAclListMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) Get(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockAclList)(nil).Get), arg0) } @@ -118,7 +122,7 @@ func (m *MockAclList) GetIndex(arg0 int) (*list.AclRecord, error) { } // GetIndex indicates an expected call of GetIndex. -func (mr *MockAclListMockRecorder) GetIndex(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) GetIndex(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetIndex", reflect.TypeOf((*MockAclList)(nil).GetIndex), arg0) } @@ -132,7 +136,7 @@ func (m *MockAclList) HasHead(arg0 string) bool { } // HasHead indicates an expected call of HasHead. -func (mr *MockAclListMockRecorder) HasHead(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) HasHead(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasHead", reflect.TypeOf((*MockAclList)(nil).HasHead), arg0) } @@ -175,7 +179,7 @@ func (m *MockAclList) IsAfter(arg0, arg1 string) (bool, error) { } // IsAfter indicates an expected call of IsAfter. -func (mr *MockAclListMockRecorder) IsAfter(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) IsAfter(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAfter", reflect.TypeOf((*MockAclList)(nil).IsAfter), arg0, arg1) } @@ -187,7 +191,7 @@ func (m *MockAclList) Iterate(arg0 func(*list.AclRecord) bool) { } // Iterate indicates an expected call of Iterate. -func (mr *MockAclListMockRecorder) Iterate(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) Iterate(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockAclList)(nil).Iterate), arg0) } @@ -199,7 +203,7 @@ func (m *MockAclList) IterateFrom(arg0 string, arg1 func(*list.AclRecord) bool) } // IterateFrom indicates an expected call of IterateFrom. -func (mr *MockAclListMockRecorder) IterateFrom(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) IterateFrom(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockAclList)(nil).IterateFrom), arg0, arg1) } @@ -292,7 +296,7 @@ func (m *MockAclList) RecordsAfter(arg0 context.Context, arg1 string) ([]*consen } // RecordsAfter indicates an expected call of RecordsAfter. -func (mr *MockAclListMockRecorder) RecordsAfter(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) RecordsAfter(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordsAfter", reflect.TypeOf((*MockAclList)(nil).RecordsAfter), arg0, arg1) } @@ -307,7 +311,7 @@ func (m *MockAclList) RecordsBefore(arg0 context.Context, arg1 string) ([]*conse } // RecordsBefore indicates an expected call of RecordsBefore. -func (mr *MockAclListMockRecorder) RecordsBefore(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) RecordsBefore(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordsBefore", reflect.TypeOf((*MockAclList)(nil).RecordsBefore), arg0, arg1) } @@ -347,7 +351,7 @@ func (m *MockAclList) ValidateRawRecord(arg0 *consensusproto.RawRecord) error { } // ValidateRawRecord indicates an expected call of ValidateRawRecord. -func (mr *MockAclListMockRecorder) ValidateRawRecord(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) ValidateRawRecord(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRawRecord", reflect.TypeOf((*MockAclList)(nil).ValidateRawRecord), arg0) } diff --git a/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go b/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go index 52d00f50..000e63d9 100644 --- a/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go +++ b/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/acl/liststorage (interfaces: ListStorage) - +// +// Generated by this command: +// +// mockgen -destination mock_liststorage/mock_liststorage.go github.com/anyproto/any-sync/commonspace/object/acl/liststorage ListStorage +// // Package mock_liststorage is a generated GoMock package. package mock_liststorage @@ -44,7 +48,7 @@ func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *consensusprot } // AddRawRecord indicates an expected call of AddRawRecord. -func (mr *MockListStorageMockRecorder) AddRawRecord(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockListStorageMockRecorder) AddRawRecord(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockListStorage)(nil).AddRawRecord), arg0, arg1) } @@ -59,7 +63,7 @@ func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*cons } // GetRawRecord indicates an expected call of GetRawRecord. -func (mr *MockListStorageMockRecorder) GetRawRecord(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockListStorageMockRecorder) GetRawRecord(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRawRecord", reflect.TypeOf((*MockListStorage)(nil).GetRawRecord), arg0, arg1) } @@ -117,7 +121,7 @@ func (m *MockListStorage) SetHead(arg0 string) error { } // SetHead indicates an expected call of SetHead. -func (mr *MockListStorageMockRecorder) SetHead(arg0 interface{}) *gomock.Call { +func (mr *MockListStorageMockRecorder) SetHead(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHead", reflect.TypeOf((*MockListStorage)(nil).SetHead), arg0) } diff --git a/commonspace/object/acl/syncacl/mock_syncacl/mock_syncacl.go b/commonspace/object/acl/syncacl/mock_syncacl/mock_syncacl.go index 2c25a1ca..8639422f 100644 --- a/commonspace/object/acl/syncacl/mock_syncacl/mock_syncacl.go +++ b/commonspace/object/acl/syncacl/mock_syncacl/mock_syncacl.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/acl/syncacl (interfaces: SyncAcl,SyncClient,RequestFactory,AclSyncProtocol) - +// +// Generated by this command: +// +// mockgen -destination mock_syncacl/mock_syncacl.go github.com/anyproto/any-sync/commonspace/object/acl/syncacl SyncAcl,SyncClient,RequestFactory,AclSyncProtocol +// // Package mock_syncacl is a generated GoMock package. package mock_syncacl @@ -63,7 +67,7 @@ func (m *MockSyncAcl) AddRawRecord(arg0 *consensusproto.RawRecordWithId) error { } // AddRawRecord indicates an expected call of AddRawRecord. -func (mr *MockSyncAclMockRecorder) AddRawRecord(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) AddRawRecord(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockSyncAcl)(nil).AddRawRecord), arg0) } @@ -77,7 +81,7 @@ func (m *MockSyncAcl) AddRawRecords(arg0 []*consensusproto.RawRecordWithId) erro } // AddRawRecords indicates an expected call of AddRawRecords. -func (mr *MockSyncAclMockRecorder) AddRawRecords(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) AddRawRecords(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecords", reflect.TypeOf((*MockSyncAcl)(nil).AddRawRecords), arg0) } @@ -91,7 +95,7 @@ func (m *MockSyncAcl) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockSyncAclMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSyncAcl)(nil).Close), arg0) } @@ -106,7 +110,7 @@ func (m *MockSyncAcl) Get(arg0 string) (*list.AclRecord, error) { } // Get indicates an expected call of Get. -func (mr *MockSyncAclMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) Get(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSyncAcl)(nil).Get), arg0) } @@ -121,7 +125,7 @@ func (m *MockSyncAcl) GetIndex(arg0 int) (*list.AclRecord, error) { } // GetIndex indicates an expected call of GetIndex. -func (mr *MockSyncAclMockRecorder) GetIndex(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) GetIndex(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetIndex", reflect.TypeOf((*MockSyncAcl)(nil).GetIndex), arg0) } @@ -135,7 +139,7 @@ func (m *MockSyncAcl) HandleMessage(arg0 context.Context, arg1 string, arg2 *spa } // HandleMessage indicates an expected call of HandleMessage. -func (mr *MockSyncAclMockRecorder) HandleMessage(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) HandleMessage(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockSyncAcl)(nil).HandleMessage), arg0, arg1, arg2) } @@ -150,7 +154,7 @@ func (m *MockSyncAcl) HandleRequest(arg0 context.Context, arg1 string, arg2 *spa } // HandleRequest indicates an expected call of HandleRequest. -func (mr *MockSyncAclMockRecorder) HandleRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) HandleRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleRequest", reflect.TypeOf((*MockSyncAcl)(nil).HandleRequest), arg0, arg1, arg2) } @@ -164,7 +168,7 @@ func (m *MockSyncAcl) HasHead(arg0 string) bool { } // HasHead indicates an expected call of HasHead. -func (mr *MockSyncAclMockRecorder) HasHead(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) HasHead(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasHead", reflect.TypeOf((*MockSyncAcl)(nil).HasHead), arg0) } @@ -206,7 +210,7 @@ func (m *MockSyncAcl) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockSyncAclMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSyncAcl)(nil).Init), arg0) } @@ -221,7 +225,7 @@ func (m *MockSyncAcl) IsAfter(arg0, arg1 string) (bool, error) { } // IsAfter indicates an expected call of IsAfter. -func (mr *MockSyncAclMockRecorder) IsAfter(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) IsAfter(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAfter", reflect.TypeOf((*MockSyncAcl)(nil).IsAfter), arg0, arg1) } @@ -233,7 +237,7 @@ func (m *MockSyncAcl) Iterate(arg0 func(*list.AclRecord) bool) { } // Iterate indicates an expected call of Iterate. -func (mr *MockSyncAclMockRecorder) Iterate(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) Iterate(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockSyncAcl)(nil).Iterate), arg0) } @@ -245,7 +249,7 @@ func (m *MockSyncAcl) IterateFrom(arg0 string, arg1 func(*list.AclRecord) bool) } // IterateFrom indicates an expected call of IterateFrom. -func (mr *MockSyncAclMockRecorder) IterateFrom(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) IterateFrom(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockSyncAcl)(nil).IterateFrom), arg0, arg1) } @@ -352,7 +356,7 @@ func (m *MockSyncAcl) RecordsAfter(arg0 context.Context, arg1 string) ([]*consen } // RecordsAfter indicates an expected call of RecordsAfter. -func (mr *MockSyncAclMockRecorder) RecordsAfter(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) RecordsAfter(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordsAfter", reflect.TypeOf((*MockSyncAcl)(nil).RecordsAfter), arg0, arg1) } @@ -367,7 +371,7 @@ func (m *MockSyncAcl) RecordsBefore(arg0 context.Context, arg1 string) ([]*conse } // RecordsBefore indicates an expected call of RecordsBefore. -func (mr *MockSyncAclMockRecorder) RecordsBefore(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) RecordsBefore(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecordsBefore", reflect.TypeOf((*MockSyncAcl)(nil).RecordsBefore), arg0, arg1) } @@ -395,7 +399,7 @@ func (m *MockSyncAcl) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockSyncAclMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockSyncAcl)(nil).Run), arg0) } @@ -407,7 +411,7 @@ func (m *MockSyncAcl) SetAclUpdater(arg0 headupdater.AclUpdater) { } // SetAclUpdater indicates an expected call of SetAclUpdater. -func (mr *MockSyncAclMockRecorder) SetAclUpdater(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) SetAclUpdater(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAclUpdater", reflect.TypeOf((*MockSyncAcl)(nil).SetAclUpdater), arg0) } @@ -419,7 +423,7 @@ func (m *MockSyncAcl) SetHeadUpdater(arg0 headupdater.HeadUpdater) { } // SetHeadUpdater indicates an expected call of SetHeadUpdater. -func (mr *MockSyncAclMockRecorder) SetHeadUpdater(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) SetHeadUpdater(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeadUpdater", reflect.TypeOf((*MockSyncAcl)(nil).SetHeadUpdater), arg0) } @@ -433,7 +437,7 @@ func (m *MockSyncAcl) SyncWithPeer(arg0 context.Context, arg1 string) error { } // SyncWithPeer indicates an expected call of SyncWithPeer. -func (mr *MockSyncAclMockRecorder) SyncWithPeer(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) SyncWithPeer(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncWithPeer", reflect.TypeOf((*MockSyncAcl)(nil).SyncWithPeer), arg0, arg1) } @@ -459,7 +463,7 @@ func (m *MockSyncAcl) ValidateRawRecord(arg0 *consensusproto.RawRecord) error { } // ValidateRawRecord indicates an expected call of ValidateRawRecord. -func (mr *MockSyncAclMockRecorder) ValidateRawRecord(arg0 interface{}) *gomock.Call { +func (mr *MockSyncAclMockRecorder) ValidateRawRecord(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRawRecord", reflect.TypeOf((*MockSyncAcl)(nil).ValidateRawRecord), arg0) } @@ -494,7 +498,7 @@ func (m *MockSyncClient) Broadcast(arg0 *consensusproto.LogSyncMessage) { } // Broadcast indicates an expected call of Broadcast. -func (mr *MockSyncClientMockRecorder) Broadcast(arg0 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) Broadcast(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Broadcast", reflect.TypeOf((*MockSyncClient)(nil).Broadcast), arg0) } @@ -509,7 +513,7 @@ func (m *MockSyncClient) CreateFullSyncRequest(arg0 list.AclList, arg1 string) ( } // CreateFullSyncRequest indicates an expected call of CreateFullSyncRequest. -func (mr *MockSyncClientMockRecorder) CreateFullSyncRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateFullSyncRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncRequest", reflect.TypeOf((*MockSyncClient)(nil).CreateFullSyncRequest), arg0, arg1) } @@ -524,7 +528,7 @@ func (m *MockSyncClient) CreateFullSyncResponse(arg0 list.AclList, arg1 string) } // CreateFullSyncResponse indicates an expected call of CreateFullSyncResponse. -func (mr *MockSyncClientMockRecorder) CreateFullSyncResponse(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateFullSyncResponse(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncResponse", reflect.TypeOf((*MockSyncClient)(nil).CreateFullSyncResponse), arg0, arg1) } @@ -538,7 +542,7 @@ func (m *MockSyncClient) CreateHeadUpdate(arg0 list.AclList, arg1 []*consensuspr } // CreateHeadUpdate indicates an expected call of CreateHeadUpdate. -func (mr *MockSyncClientMockRecorder) CreateHeadUpdate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateHeadUpdate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateHeadUpdate", reflect.TypeOf((*MockSyncClient)(nil).CreateHeadUpdate), arg0, arg1) } @@ -552,7 +556,7 @@ func (m *MockSyncClient) QueueRequest(arg0 string, arg1 *consensusproto.LogSyncM } // QueueRequest indicates an expected call of QueueRequest. -func (mr *MockSyncClientMockRecorder) QueueRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) QueueRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueueRequest", reflect.TypeOf((*MockSyncClient)(nil).QueueRequest), arg0, arg1) } @@ -567,7 +571,7 @@ func (m *MockSyncClient) SendRequest(arg0 context.Context, arg1 string, arg2 *co } // SendRequest indicates an expected call of SendRequest. -func (mr *MockSyncClientMockRecorder) SendRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) SendRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendRequest", reflect.TypeOf((*MockSyncClient)(nil).SendRequest), arg0, arg1, arg2) } @@ -581,7 +585,7 @@ func (m *MockSyncClient) SendUpdate(arg0 string, arg1 *consensusproto.LogSyncMes } // SendUpdate indicates an expected call of SendUpdate. -func (mr *MockSyncClientMockRecorder) SendUpdate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) SendUpdate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendUpdate", reflect.TypeOf((*MockSyncClient)(nil).SendUpdate), arg0, arg1) } @@ -619,7 +623,7 @@ func (m *MockRequestFactory) CreateFullSyncRequest(arg0 list.AclList, arg1 strin } // CreateFullSyncRequest indicates an expected call of CreateFullSyncRequest. -func (mr *MockRequestFactoryMockRecorder) CreateFullSyncRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateFullSyncRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncRequest", reflect.TypeOf((*MockRequestFactory)(nil).CreateFullSyncRequest), arg0, arg1) } @@ -634,7 +638,7 @@ func (m *MockRequestFactory) CreateFullSyncResponse(arg0 list.AclList, arg1 stri } // CreateFullSyncResponse indicates an expected call of CreateFullSyncResponse. -func (mr *MockRequestFactoryMockRecorder) CreateFullSyncResponse(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateFullSyncResponse(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncResponse", reflect.TypeOf((*MockRequestFactory)(nil).CreateFullSyncResponse), arg0, arg1) } @@ -648,7 +652,7 @@ func (m *MockRequestFactory) CreateHeadUpdate(arg0 list.AclList, arg1 []*consens } // CreateHeadUpdate indicates an expected call of CreateHeadUpdate. -func (mr *MockRequestFactoryMockRecorder) CreateHeadUpdate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateHeadUpdate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateHeadUpdate", reflect.TypeOf((*MockRequestFactory)(nil).CreateHeadUpdate), arg0, arg1) } @@ -686,7 +690,7 @@ func (m *MockAclSyncProtocol) FullSyncRequest(arg0 context.Context, arg1 string, } // FullSyncRequest indicates an expected call of FullSyncRequest. -func (mr *MockAclSyncProtocolMockRecorder) FullSyncRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockAclSyncProtocolMockRecorder) FullSyncRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FullSyncRequest", reflect.TypeOf((*MockAclSyncProtocol)(nil).FullSyncRequest), arg0, arg1, arg2) } @@ -700,7 +704,7 @@ func (m *MockAclSyncProtocol) FullSyncResponse(arg0 context.Context, arg1 string } // FullSyncResponse indicates an expected call of FullSyncResponse. -func (mr *MockAclSyncProtocolMockRecorder) FullSyncResponse(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockAclSyncProtocolMockRecorder) FullSyncResponse(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FullSyncResponse", reflect.TypeOf((*MockAclSyncProtocol)(nil).FullSyncResponse), arg0, arg1, arg2) } @@ -715,7 +719,7 @@ func (m *MockAclSyncProtocol) HeadUpdate(arg0 context.Context, arg1 string, arg2 } // HeadUpdate indicates an expected call of HeadUpdate. -func (mr *MockAclSyncProtocolMockRecorder) HeadUpdate(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockAclSyncProtocolMockRecorder) HeadUpdate(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadUpdate", reflect.TypeOf((*MockAclSyncProtocol)(nil).HeadUpdate), arg0, arg1, arg2) } diff --git a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index 496936ab..2108cc72 100644 --- a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go +++ b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/tree/objecttree (interfaces: ObjectTree) - +// +// Generated by this command: +// +// mockgen -destination mock_objecttree/mock_objecttree.go github.com/anyproto/any-sync/commonspace/object/tree/objecttree ObjectTree +// // Package mock_objecttree is a generated GoMock package. package mock_objecttree @@ -63,7 +67,7 @@ func (m *MockObjectTree) AddContent(arg0 context.Context, arg1 objecttree.Signab } // AddContent indicates an expected call of AddContent. -func (mr *MockObjectTreeMockRecorder) AddContent(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) AddContent(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContent", reflect.TypeOf((*MockObjectTree)(nil).AddContent), arg0, arg1) } @@ -78,7 +82,7 @@ func (m *MockObjectTree) AddRawChanges(arg0 context.Context, arg1 objecttree.Raw } // AddRawChanges indicates an expected call of AddRawChanges. -func (mr *MockObjectTreeMockRecorder) AddRawChanges(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) AddRawChanges(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChanges", reflect.TypeOf((*MockObjectTree)(nil).AddRawChanges), arg0, arg1) } @@ -107,7 +111,7 @@ func (m *MockObjectTree) ChangesAfterCommonSnapshot(arg0, arg1 []string) ([]*tre } // ChangesAfterCommonSnapshot indicates an expected call of ChangesAfterCommonSnapshot. -func (mr *MockObjectTreeMockRecorder) ChangesAfterCommonSnapshot(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) ChangesAfterCommonSnapshot(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChangesAfterCommonSnapshot", reflect.TypeOf((*MockObjectTree)(nil).ChangesAfterCommonSnapshot), arg0, arg1) } @@ -136,7 +140,7 @@ func (m *MockObjectTree) Debug(arg0 objecttree.DescriptionParser) (objecttree.De } // Debug indicates an expected call of Debug. -func (mr *MockObjectTreeMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) Debug(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockObjectTree)(nil).Debug), arg0) } @@ -165,7 +169,7 @@ func (m *MockObjectTree) GetChange(arg0 string) (*objecttree.Change, error) { } // GetChange indicates an expected call of GetChange. -func (mr *MockObjectTreeMockRecorder) GetChange(arg0 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) GetChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChange", reflect.TypeOf((*MockObjectTree)(nil).GetChange), arg0) } @@ -173,7 +177,7 @@ func (mr *MockObjectTreeMockRecorder) GetChange(arg0 interface{}) *gomock.Call { // HasChanges mocks base method. func (m *MockObjectTree) HasChanges(arg0 ...string) bool { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -183,7 +187,7 @@ func (m *MockObjectTree) HasChanges(arg0 ...string) bool { } // HasChanges indicates an expected call of HasChanges. -func (mr *MockObjectTreeMockRecorder) HasChanges(arg0 ...interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) HasChanges(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasChanges", reflect.TypeOf((*MockObjectTree)(nil).HasChanges), arg0...) } @@ -245,7 +249,7 @@ func (mr *MockObjectTreeMockRecorder) IsDerived() *gomock.Call { } // IterateFrom mocks base method. -func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, []byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { +func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, []byte) (any, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateFrom", arg0, arg1, arg2) ret0, _ := ret[0].(error) @@ -253,13 +257,13 @@ func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, } // IterateFrom indicates an expected call of IterateFrom. -func (mr *MockObjectTreeMockRecorder) IterateFrom(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) IterateFrom(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockObjectTree)(nil).IterateFrom), arg0, arg1, arg2) } // IterateRoot mocks base method. -func (m *MockObjectTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { +func (m *MockObjectTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (any, error), arg1 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateRoot", arg0, arg1) ret0, _ := ret[0].(error) @@ -267,7 +271,7 @@ func (m *MockObjectTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (inte } // IterateRoot indicates an expected call of IterateRoot. -func (mr *MockObjectTreeMockRecorder) IterateRoot(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) IterateRoot(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateRoot", reflect.TypeOf((*MockObjectTree)(nil).IterateRoot), arg0, arg1) } @@ -308,7 +312,7 @@ func (m *MockObjectTree) PrepareChange(arg0 objecttree.SignableChangeContent) (* } // PrepareChange indicates an expected call of PrepareChange. -func (mr *MockObjectTreeMockRecorder) PrepareChange(arg0 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) PrepareChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareChange", reflect.TypeOf((*MockObjectTree)(nil).PrepareChange), arg0) } @@ -389,7 +393,7 @@ func (m *MockObjectTree) TryClose(arg0 time.Duration) (bool, error) { } // TryClose indicates an expected call of TryClose. -func (mr *MockObjectTreeMockRecorder) TryClose(arg0 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) TryClose(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockObjectTree)(nil).TryClose), arg0) } @@ -458,7 +462,7 @@ func (m *MockObjectTree) UnpackChange(arg0 *treechangeproto.RawTreeChangeWithId) } // UnpackChange indicates an expected call of UnpackChange. -func (mr *MockObjectTreeMockRecorder) UnpackChange(arg0 interface{}) *gomock.Call { +func (mr *MockObjectTreeMockRecorder) UnpackChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnpackChange", reflect.TypeOf((*MockObjectTree)(nil).UnpackChange), arg0) } diff --git a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index fb98846b..ee64834e 100644 --- a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go +++ b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/tree/synctree (interfaces: SyncTree,ReceiveQueue,HeadNotifiable,SyncClient,RequestFactory,TreeSyncProtocol) - +// +// Generated by this command: +// +// mockgen -destination mock_synctree/mock_synctree.go github.com/anyproto/any-sync/commonspace/object/tree/synctree SyncTree,ReceiveQueue,HeadNotifiable,SyncClient,RequestFactory,TreeSyncProtocol +// // Package mock_synctree is a generated GoMock package. package mock_synctree @@ -65,7 +69,7 @@ func (m *MockSyncTree) AddContent(arg0 context.Context, arg1 objecttree.Signable } // AddContent indicates an expected call of AddContent. -func (mr *MockSyncTreeMockRecorder) AddContent(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) AddContent(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddContent", reflect.TypeOf((*MockSyncTree)(nil).AddContent), arg0, arg1) } @@ -80,7 +84,7 @@ func (m *MockSyncTree) AddRawChanges(arg0 context.Context, arg1 objecttree.RawCh } // AddRawChanges indicates an expected call of AddRawChanges. -func (mr *MockSyncTreeMockRecorder) AddRawChanges(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) AddRawChanges(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChanges", reflect.TypeOf((*MockSyncTree)(nil).AddRawChanges), arg0, arg1) } @@ -109,7 +113,7 @@ func (m *MockSyncTree) ChangesAfterCommonSnapshot(arg0, arg1 []string) ([]*treec } // ChangesAfterCommonSnapshot indicates an expected call of ChangesAfterCommonSnapshot. -func (mr *MockSyncTreeMockRecorder) ChangesAfterCommonSnapshot(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) ChangesAfterCommonSnapshot(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChangesAfterCommonSnapshot", reflect.TypeOf((*MockSyncTree)(nil).ChangesAfterCommonSnapshot), arg0, arg1) } @@ -138,7 +142,7 @@ func (m *MockSyncTree) Debug(arg0 objecttree.DescriptionParser) (objecttree.Debu } // Debug indicates an expected call of Debug. -func (mr *MockSyncTreeMockRecorder) Debug(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) Debug(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockSyncTree)(nil).Debug), arg0) } @@ -167,7 +171,7 @@ func (m *MockSyncTree) GetChange(arg0 string) (*objecttree.Change, error) { } // GetChange indicates an expected call of GetChange. -func (mr *MockSyncTreeMockRecorder) GetChange(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) GetChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChange", reflect.TypeOf((*MockSyncTree)(nil).GetChange), arg0) } @@ -181,7 +185,7 @@ func (m *MockSyncTree) HandleMessage(arg0 context.Context, arg1 string, arg2 *sp } // HandleMessage indicates an expected call of HandleMessage. -func (mr *MockSyncTreeMockRecorder) HandleMessage(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) HandleMessage(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockSyncTree)(nil).HandleMessage), arg0, arg1, arg2) } @@ -196,7 +200,7 @@ func (m *MockSyncTree) HandleRequest(arg0 context.Context, arg1 string, arg2 *sp } // HandleRequest indicates an expected call of HandleRequest. -func (mr *MockSyncTreeMockRecorder) HandleRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) HandleRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleRequest", reflect.TypeOf((*MockSyncTree)(nil).HandleRequest), arg0, arg1, arg2) } @@ -204,7 +208,7 @@ func (mr *MockSyncTreeMockRecorder) HandleRequest(arg0, arg1, arg2 interface{}) // HasChanges mocks base method. func (m *MockSyncTree) HasChanges(arg0 ...string) bool { m.ctrl.T.Helper() - varargs := []interface{}{} + varargs := []any{} for _, a := range arg0 { varargs = append(varargs, a) } @@ -214,7 +218,7 @@ func (m *MockSyncTree) HasChanges(arg0 ...string) bool { } // HasChanges indicates an expected call of HasChanges. -func (mr *MockSyncTreeMockRecorder) HasChanges(arg0 ...interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) HasChanges(arg0 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasChanges", reflect.TypeOf((*MockSyncTree)(nil).HasChanges), arg0...) } @@ -276,7 +280,7 @@ func (mr *MockSyncTreeMockRecorder) IsDerived() *gomock.Call { } // IterateFrom mocks base method. -func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, []byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { +func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, []byte) (any, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateFrom", arg0, arg1, arg2) ret0, _ := ret[0].(error) @@ -284,13 +288,13 @@ func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func(*objecttree.Change, [] } // IterateFrom indicates an expected call of IterateFrom. -func (mr *MockSyncTreeMockRecorder) IterateFrom(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) IterateFrom(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockSyncTree)(nil).IterateFrom), arg0, arg1, arg2) } // IterateRoot mocks base method. -func (m *MockSyncTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { +func (m *MockSyncTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (any, error), arg1 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateRoot", arg0, arg1) ret0, _ := ret[0].(error) @@ -298,7 +302,7 @@ func (m *MockSyncTree) IterateRoot(arg0 func(*objecttree.Change, []byte) (interf } // IterateRoot indicates an expected call of IterateRoot. -func (mr *MockSyncTreeMockRecorder) IterateRoot(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) IterateRoot(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateRoot", reflect.TypeOf((*MockSyncTree)(nil).IterateRoot), arg0, arg1) } @@ -339,7 +343,7 @@ func (m *MockSyncTree) PrepareChange(arg0 objecttree.SignableChangeContent) (*tr } // PrepareChange indicates an expected call of PrepareChange. -func (mr *MockSyncTreeMockRecorder) PrepareChange(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) PrepareChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareChange", reflect.TypeOf((*MockSyncTree)(nil).PrepareChange), arg0) } @@ -389,7 +393,7 @@ func (m *MockSyncTree) SetListener(arg0 updatelistener.UpdateListener) { } // SetListener indicates an expected call of SetListener. -func (mr *MockSyncTreeMockRecorder) SetListener(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) SetListener(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetListener", reflect.TypeOf((*MockSyncTree)(nil).SetListener), arg0) } @@ -431,7 +435,7 @@ func (m *MockSyncTree) SyncWithPeer(arg0 context.Context, arg1 string) error { } // SyncWithPeer indicates an expected call of SyncWithPeer. -func (mr *MockSyncTreeMockRecorder) SyncWithPeer(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) SyncWithPeer(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncWithPeer", reflect.TypeOf((*MockSyncTree)(nil).SyncWithPeer), arg0, arg1) } @@ -446,7 +450,7 @@ func (m *MockSyncTree) TryClose(arg0 time.Duration) (bool, error) { } // TryClose indicates an expected call of TryClose. -func (mr *MockSyncTreeMockRecorder) TryClose(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) TryClose(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockSyncTree)(nil).TryClose), arg0) } @@ -515,7 +519,7 @@ func (m *MockSyncTree) UnpackChange(arg0 *treechangeproto.RawTreeChangeWithId) ( } // UnpackChange indicates an expected call of UnpackChange. -func (mr *MockSyncTreeMockRecorder) UnpackChange(arg0 interface{}) *gomock.Call { +func (mr *MockSyncTreeMockRecorder) UnpackChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnpackChange", reflect.TypeOf((*MockSyncTree)(nil).UnpackChange), arg0) } @@ -552,7 +556,7 @@ func (m *MockReceiveQueue) AddMessage(arg0 string, arg1 *treechangeproto.TreeSyn } // AddMessage indicates an expected call of AddMessage. -func (mr *MockReceiveQueueMockRecorder) AddMessage(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockReceiveQueueMockRecorder) AddMessage(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddMessage", reflect.TypeOf((*MockReceiveQueue)(nil).AddMessage), arg0, arg1, arg2) } @@ -564,7 +568,7 @@ func (m *MockReceiveQueue) ClearQueue(arg0 string) { } // ClearQueue indicates an expected call of ClearQueue. -func (mr *MockReceiveQueueMockRecorder) ClearQueue(arg0 interface{}) *gomock.Call { +func (mr *MockReceiveQueueMockRecorder) ClearQueue(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearQueue", reflect.TypeOf((*MockReceiveQueue)(nil).ClearQueue), arg0) } @@ -580,7 +584,7 @@ func (m *MockReceiveQueue) GetMessage(arg0 string) (*treechangeproto.TreeSyncMes } // GetMessage indicates an expected call of GetMessage. -func (mr *MockReceiveQueueMockRecorder) GetMessage(arg0 interface{}) *gomock.Call { +func (mr *MockReceiveQueueMockRecorder) GetMessage(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMessage", reflect.TypeOf((*MockReceiveQueue)(nil).GetMessage), arg0) } @@ -615,7 +619,7 @@ func (m *MockHeadNotifiable) UpdateHeads(arg0 string, arg1 []string) { } // UpdateHeads indicates an expected call of UpdateHeads. -func (mr *MockHeadNotifiableMockRecorder) UpdateHeads(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockHeadNotifiableMockRecorder) UpdateHeads(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateHeads", reflect.TypeOf((*MockHeadNotifiable)(nil).UpdateHeads), arg0, arg1) } @@ -650,7 +654,7 @@ func (m *MockSyncClient) Broadcast(arg0 *treechangeproto.TreeSyncMessage) { } // Broadcast indicates an expected call of Broadcast. -func (mr *MockSyncClientMockRecorder) Broadcast(arg0 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) Broadcast(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Broadcast", reflect.TypeOf((*MockSyncClient)(nil).Broadcast), arg0) } @@ -665,7 +669,7 @@ func (m *MockSyncClient) CreateFullSyncRequest(arg0 objecttree.ObjectTree, arg1, } // CreateFullSyncRequest indicates an expected call of CreateFullSyncRequest. -func (mr *MockSyncClientMockRecorder) CreateFullSyncRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateFullSyncRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncRequest", reflect.TypeOf((*MockSyncClient)(nil).CreateFullSyncRequest), arg0, arg1, arg2) } @@ -680,7 +684,7 @@ func (m *MockSyncClient) CreateFullSyncResponse(arg0 objecttree.ObjectTree, arg1 } // CreateFullSyncResponse indicates an expected call of CreateFullSyncResponse. -func (mr *MockSyncClientMockRecorder) CreateFullSyncResponse(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateFullSyncResponse(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncResponse", reflect.TypeOf((*MockSyncClient)(nil).CreateFullSyncResponse), arg0, arg1, arg2) } @@ -694,7 +698,7 @@ func (m *MockSyncClient) CreateHeadUpdate(arg0 objecttree.ObjectTree, arg1 []*tr } // CreateHeadUpdate indicates an expected call of CreateHeadUpdate. -func (mr *MockSyncClientMockRecorder) CreateHeadUpdate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) CreateHeadUpdate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateHeadUpdate", reflect.TypeOf((*MockSyncClient)(nil).CreateHeadUpdate), arg0, arg1) } @@ -722,7 +726,7 @@ func (m *MockSyncClient) QueueRequest(arg0, arg1 string, arg2 *treechangeproto.T } // QueueRequest indicates an expected call of QueueRequest. -func (mr *MockSyncClientMockRecorder) QueueRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) QueueRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueueRequest", reflect.TypeOf((*MockSyncClient)(nil).QueueRequest), arg0, arg1, arg2) } @@ -737,7 +741,7 @@ func (m *MockSyncClient) SendRequest(arg0 context.Context, arg1, arg2 string, ar } // SendRequest indicates an expected call of SendRequest. -func (mr *MockSyncClientMockRecorder) SendRequest(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) SendRequest(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendRequest", reflect.TypeOf((*MockSyncClient)(nil).SendRequest), arg0, arg1, arg2, arg3) } @@ -751,7 +755,7 @@ func (m *MockSyncClient) SendUpdate(arg0, arg1 string, arg2 *treechangeproto.Tre } // SendUpdate indicates an expected call of SendUpdate. -func (mr *MockSyncClientMockRecorder) SendUpdate(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockSyncClientMockRecorder) SendUpdate(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendUpdate", reflect.TypeOf((*MockSyncClient)(nil).SendUpdate), arg0, arg1, arg2) } @@ -789,7 +793,7 @@ func (m *MockRequestFactory) CreateFullSyncRequest(arg0 objecttree.ObjectTree, a } // CreateFullSyncRequest indicates an expected call of CreateFullSyncRequest. -func (mr *MockRequestFactoryMockRecorder) CreateFullSyncRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateFullSyncRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncRequest", reflect.TypeOf((*MockRequestFactory)(nil).CreateFullSyncRequest), arg0, arg1, arg2) } @@ -804,7 +808,7 @@ func (m *MockRequestFactory) CreateFullSyncResponse(arg0 objecttree.ObjectTree, } // CreateFullSyncResponse indicates an expected call of CreateFullSyncResponse. -func (mr *MockRequestFactoryMockRecorder) CreateFullSyncResponse(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateFullSyncResponse(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateFullSyncResponse", reflect.TypeOf((*MockRequestFactory)(nil).CreateFullSyncResponse), arg0, arg1, arg2) } @@ -818,7 +822,7 @@ func (m *MockRequestFactory) CreateHeadUpdate(arg0 objecttree.ObjectTree, arg1 [ } // CreateHeadUpdate indicates an expected call of CreateHeadUpdate. -func (mr *MockRequestFactoryMockRecorder) CreateHeadUpdate(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockRequestFactoryMockRecorder) CreateHeadUpdate(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateHeadUpdate", reflect.TypeOf((*MockRequestFactory)(nil).CreateHeadUpdate), arg0, arg1) } @@ -870,7 +874,7 @@ func (m *MockTreeSyncProtocol) FullSyncRequest(arg0 context.Context, arg1 string } // FullSyncRequest indicates an expected call of FullSyncRequest. -func (mr *MockTreeSyncProtocolMockRecorder) FullSyncRequest(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeSyncProtocolMockRecorder) FullSyncRequest(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FullSyncRequest", reflect.TypeOf((*MockTreeSyncProtocol)(nil).FullSyncRequest), arg0, arg1, arg2) } @@ -884,7 +888,7 @@ func (m *MockTreeSyncProtocol) FullSyncResponse(arg0 context.Context, arg1 strin } // FullSyncResponse indicates an expected call of FullSyncResponse. -func (mr *MockTreeSyncProtocolMockRecorder) FullSyncResponse(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeSyncProtocolMockRecorder) FullSyncResponse(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FullSyncResponse", reflect.TypeOf((*MockTreeSyncProtocol)(nil).FullSyncResponse), arg0, arg1, arg2) } @@ -899,7 +903,7 @@ func (m *MockTreeSyncProtocol) HeadUpdate(arg0 context.Context, arg1 string, arg } // HeadUpdate indicates an expected call of HeadUpdate. -func (mr *MockTreeSyncProtocolMockRecorder) HeadUpdate(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeSyncProtocolMockRecorder) HeadUpdate(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadUpdate", reflect.TypeOf((*MockTreeSyncProtocol)(nil).HeadUpdate), arg0, arg1, arg2) } diff --git a/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go b/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go index 050f458e..e86c77cb 100644 --- a/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go +++ b/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener (interfaces: UpdateListener) - +// +// Generated by this command: +// +// mockgen -destination mock_updatelistener/mock_updatelistener.go github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener UpdateListener +// // Package mock_updatelistener is a generated GoMock package. package mock_updatelistener @@ -41,7 +45,7 @@ func (m *MockUpdateListener) Rebuild(arg0 objecttree.ObjectTree) { } // Rebuild indicates an expected call of Rebuild. -func (mr *MockUpdateListenerMockRecorder) Rebuild(arg0 interface{}) *gomock.Call { +func (mr *MockUpdateListenerMockRecorder) Rebuild(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rebuild", reflect.TypeOf((*MockUpdateListener)(nil).Rebuild), arg0) } @@ -53,7 +57,7 @@ func (m *MockUpdateListener) Update(arg0 objecttree.ObjectTree) { } // Update indicates an expected call of Update. -func (mr *MockUpdateListenerMockRecorder) Update(arg0 interface{}) *gomock.Call { +func (mr *MockUpdateListenerMockRecorder) Update(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUpdateListener)(nil).Update), arg0) } diff --git a/commonspace/object/tree/treestorage/mock_treestorage/mock_treestorage.go b/commonspace/object/tree/treestorage/mock_treestorage/mock_treestorage.go index 3a20051d..7123b500 100644 --- a/commonspace/object/tree/treestorage/mock_treestorage/mock_treestorage.go +++ b/commonspace/object/tree/treestorage/mock_treestorage/mock_treestorage.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/object/tree/treestorage (interfaces: TreeStorage) - +// +// Generated by this command: +// +// mockgen -destination mock_treestorage/mock_treestorage.go github.com/anyproto/any-sync/commonspace/object/tree/treestorage TreeStorage +// // Package mock_treestorage is a generated GoMock package. package mock_treestorage @@ -44,7 +48,7 @@ func (m *MockTreeStorage) AddRawChange(arg0 *treechangeproto.RawTreeChangeWithId } // AddRawChange indicates an expected call of AddRawChange. -func (mr *MockTreeStorageMockRecorder) AddRawChange(arg0 interface{}) *gomock.Call { +func (mr *MockTreeStorageMockRecorder) AddRawChange(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChange", reflect.TypeOf((*MockTreeStorage)(nil).AddRawChange), arg0) } @@ -58,7 +62,7 @@ func (m *MockTreeStorage) AddRawChangesSetHeads(arg0 []*treechangeproto.RawTreeC } // AddRawChangesSetHeads indicates an expected call of AddRawChangesSetHeads. -func (mr *MockTreeStorageMockRecorder) AddRawChangesSetHeads(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTreeStorageMockRecorder) AddRawChangesSetHeads(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChangesSetHeads", reflect.TypeOf((*MockTreeStorage)(nil).AddRawChangesSetHeads), arg0, arg1) } @@ -87,7 +91,7 @@ func (m *MockTreeStorage) GetRawChange(arg0 context.Context, arg1 string) (*tree } // GetRawChange indicates an expected call of GetRawChange. -func (mr *MockTreeStorageMockRecorder) GetRawChange(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTreeStorageMockRecorder) GetRawChange(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRawChange", reflect.TypeOf((*MockTreeStorage)(nil).GetRawChange), arg0, arg1) } @@ -102,7 +106,7 @@ func (m *MockTreeStorage) HasChange(arg0 context.Context, arg1 string) (bool, er } // HasChange indicates an expected call of HasChange. -func (mr *MockTreeStorageMockRecorder) HasChange(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTreeStorageMockRecorder) HasChange(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasChange", reflect.TypeOf((*MockTreeStorage)(nil).HasChange), arg0, arg1) } @@ -160,7 +164,7 @@ func (m *MockTreeStorage) SetHeads(arg0 []string) error { } // SetHeads indicates an expected call of SetHeads. -func (mr *MockTreeStorageMockRecorder) SetHeads(arg0 interface{}) *gomock.Call { +func (mr *MockTreeStorageMockRecorder) SetHeads(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeads", reflect.TypeOf((*MockTreeStorage)(nil).SetHeads), arg0) } diff --git a/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go b/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go index 3ef2892f..8e0f34a6 100644 --- a/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go +++ b/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anyproto/any-sync/commonspace/object/treemanager (interfaces: TreeManager,TreeSyncer) - +// Source: github.com/anyproto/any-sync/commonspace/object/treemanager (interfaces: TreeManager) +// +// Generated by this command: +// +// mockgen -destination mock_treemanager/mock_treemanager.go github.com/anyproto/any-sync/commonspace/object/treemanager TreeManager +// // Package mock_treemanager is a generated GoMock package. package mock_treemanager @@ -10,7 +14,6 @@ import ( app "github.com/anyproto/any-sync/app" objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree" - treemanager "github.com/anyproto/any-sync/commonspace/object/treemanager" gomock "go.uber.org/mock/gomock" ) @@ -46,7 +49,7 @@ func (m *MockTreeManager) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockTreeManagerMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockTreeManager)(nil).Close), arg0) } @@ -60,7 +63,7 @@ func (m *MockTreeManager) DeleteTree(arg0 context.Context, arg1, arg2 string) er } // DeleteTree indicates an expected call of DeleteTree. -func (mr *MockTreeManagerMockRecorder) DeleteTree(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) DeleteTree(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteTree", reflect.TypeOf((*MockTreeManager)(nil).DeleteTree), arg0, arg1, arg2) } @@ -75,7 +78,7 @@ func (m *MockTreeManager) GetTree(arg0 context.Context, arg1, arg2 string) (obje } // GetTree indicates an expected call of GetTree. -func (mr *MockTreeManagerMockRecorder) GetTree(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) GetTree(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTree", reflect.TypeOf((*MockTreeManager)(nil).GetTree), arg0, arg1, arg2) } @@ -89,7 +92,7 @@ func (m *MockTreeManager) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockTreeManagerMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTreeManager)(nil).Init), arg0) } @@ -103,7 +106,7 @@ func (m *MockTreeManager) MarkTreeDeleted(arg0 context.Context, arg1, arg2 strin } // MarkTreeDeleted indicates an expected call of MarkTreeDeleted. -func (mr *MockTreeManagerMockRecorder) MarkTreeDeleted(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) MarkTreeDeleted(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarkTreeDeleted", reflect.TypeOf((*MockTreeManager)(nil).MarkTreeDeleted), arg0, arg1, arg2) } @@ -122,20 +125,6 @@ func (mr *MockTreeManagerMockRecorder) Name() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockTreeManager)(nil).Name)) } -// NewTreeSyncer mocks base method. -func (m *MockTreeManager) NewTreeSyncer(arg0 string, arg1 treemanager.TreeManager) treemanager.TreeSyncer { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewTreeSyncer", arg0, arg1) - ret0, _ := ret[0].(treemanager.TreeSyncer) - return ret0 -} - -// NewTreeSyncer indicates an expected call of NewTreeSyncer. -func (mr *MockTreeManagerMockRecorder) NewTreeSyncer(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTreeSyncer", reflect.TypeOf((*MockTreeManager)(nil).NewTreeSyncer), arg0, arg1) -} - // Run mocks base method. func (m *MockTreeManager) Run(arg0 context.Context) error { m.ctrl.T.Helper() @@ -145,70 +134,7 @@ func (m *MockTreeManager) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockTreeManagerMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockTreeManagerMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockTreeManager)(nil).Run), arg0) } - -// MockTreeSyncer is a mock of TreeSyncer interface. -type MockTreeSyncer struct { - ctrl *gomock.Controller - recorder *MockTreeSyncerMockRecorder -} - -// MockTreeSyncerMockRecorder is the mock recorder for MockTreeSyncer. -type MockTreeSyncerMockRecorder struct { - mock *MockTreeSyncer -} - -// NewMockTreeSyncer creates a new mock instance. -func NewMockTreeSyncer(ctrl *gomock.Controller) *MockTreeSyncer { - mock := &MockTreeSyncer{ctrl: ctrl} - mock.recorder = &MockTreeSyncerMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockTreeSyncer) EXPECT() *MockTreeSyncerMockRecorder { - return m.recorder -} - -// Close mocks base method. -func (m *MockTreeSyncer) Close() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Close") - ret0, _ := ret[0].(error) - return ret0 -} - -// Close indicates an expected call of Close. -func (mr *MockTreeSyncerMockRecorder) Close() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockTreeSyncer)(nil).Close)) -} - -// Init mocks base method. -func (m *MockTreeSyncer) Init() { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Init") -} - -// Init indicates an expected call of Init. -func (mr *MockTreeSyncerMockRecorder) Init() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTreeSyncer)(nil).Init)) -} - -// SyncAll mocks base method. -func (m *MockTreeSyncer) SyncAll(arg0 context.Context, arg1 string, arg2, arg3 []string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SyncAll", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(error) - return ret0 -} - -// SyncAll indicates an expected call of SyncAll. -func (mr *MockTreeSyncerMockRecorder) SyncAll(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncAll", reflect.TypeOf((*MockTreeSyncer)(nil).SyncAll), arg0, arg1, arg2, arg3) -} diff --git a/commonspace/object/treemanager/treemanager.go b/commonspace/object/treemanager/treemanager.go index eeaa50af..3fd9ab4c 100644 --- a/commonspace/object/treemanager/treemanager.go +++ b/commonspace/object/treemanager/treemanager.go @@ -1,4 +1,4 @@ -//go:generate mockgen -destination mock_treemanager/mock_treemanager.go github.com/anyproto/any-sync/commonspace/object/treemanager TreeManager,TreeSyncer +//go:generate mockgen -destination mock_treemanager/mock_treemanager.go github.com/anyproto/any-sync/commonspace/object/treemanager TreeManager package treemanager import ( @@ -14,11 +14,4 @@ type TreeManager interface { GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error) MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error DeleteTree(ctx context.Context, spaceId, treeId string) error - NewTreeSyncer(spaceId string, treeManager TreeManager) TreeSyncer -} - -type TreeSyncer interface { - Init() - SyncAll(ctx context.Context, peerId string, existing, missing []string) error - Close() error } diff --git a/commonspace/object/treesyncer/mock_treesyncer/mock_treesyncer.go b/commonspace/object/treesyncer/mock_treesyncer/mock_treesyncer.go new file mode 100644 index 00000000..db84556c --- /dev/null +++ b/commonspace/object/treesyncer/mock_treesyncer/mock_treesyncer.go @@ -0,0 +1,122 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anyproto/any-sync/commonspace/object/treesyncer (interfaces: TreeSyncer) +// +// Generated by this command: +// +// mockgen -destination mock_treesyncer/mock_treesyncer.go github.com/anyproto/any-sync/commonspace/object/treesyncer TreeSyncer +// +// Package mock_treesyncer is a generated GoMock package. +package mock_treesyncer + +import ( + context "context" + reflect "reflect" + + app "github.com/anyproto/any-sync/app" + gomock "go.uber.org/mock/gomock" +) + +// MockTreeSyncer is a mock of TreeSyncer interface. +type MockTreeSyncer struct { + ctrl *gomock.Controller + recorder *MockTreeSyncerMockRecorder +} + +// MockTreeSyncerMockRecorder is the mock recorder for MockTreeSyncer. +type MockTreeSyncerMockRecorder struct { + mock *MockTreeSyncer +} + +// NewMockTreeSyncer creates a new mock instance. +func NewMockTreeSyncer(ctrl *gomock.Controller) *MockTreeSyncer { + mock := &MockTreeSyncer{ctrl: ctrl} + mock.recorder = &MockTreeSyncerMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockTreeSyncer) EXPECT() *MockTreeSyncerMockRecorder { + return m.recorder +} + +// Close mocks base method. +func (m *MockTreeSyncer) Close(arg0 context.Context) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Close", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Close indicates an expected call of Close. +func (mr *MockTreeSyncerMockRecorder) Close(arg0 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockTreeSyncer)(nil).Close), arg0) +} + +// Init mocks base method. +func (m *MockTreeSyncer) Init(arg0 *app.App) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Init", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Init indicates an expected call of Init. +func (mr *MockTreeSyncerMockRecorder) Init(arg0 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTreeSyncer)(nil).Init), arg0) +} + +// Name mocks base method. +func (m *MockTreeSyncer) Name() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Name") + ret0, _ := ret[0].(string) + return ret0 +} + +// Name indicates an expected call of Name. +func (mr *MockTreeSyncerMockRecorder) Name() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockTreeSyncer)(nil).Name)) +} + +// Run mocks base method. +func (m *MockTreeSyncer) Run(arg0 context.Context) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Run", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Run indicates an expected call of Run. +func (mr *MockTreeSyncerMockRecorder) Run(arg0 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockTreeSyncer)(nil).Run), arg0) +} + +// StartSync mocks base method. +func (m *MockTreeSyncer) StartSync() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "StartSync") +} + +// StartSync indicates an expected call of StartSync. +func (mr *MockTreeSyncerMockRecorder) StartSync() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartSync", reflect.TypeOf((*MockTreeSyncer)(nil).StartSync)) +} + +// SyncAll mocks base method. +func (m *MockTreeSyncer) SyncAll(arg0 context.Context, arg1 string, arg2, arg3 []string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SyncAll", arg0, arg1, arg2, arg3) + ret0, _ := ret[0].(error) + return ret0 +} + +// SyncAll indicates an expected call of SyncAll. +func (mr *MockTreeSyncerMockRecorder) SyncAll(arg0, arg1, arg2, arg3 any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncAll", reflect.TypeOf((*MockTreeSyncer)(nil).SyncAll), arg0, arg1, arg2, arg3) +} diff --git a/commonspace/object/treesyncer/treesyncer.go b/commonspace/object/treesyncer/treesyncer.go new file mode 100644 index 00000000..76cbdae3 --- /dev/null +++ b/commonspace/object/treesyncer/treesyncer.go @@ -0,0 +1,16 @@ +//go:generate mockgen -destination mock_treesyncer/mock_treesyncer.go github.com/anyproto/any-sync/commonspace/object/treesyncer TreeSyncer +package treesyncer + +import ( + "context" + + "github.com/anyproto/any-sync/app" +) + +const CName = "common.object.treesyncer" + +type TreeSyncer interface { + app.ComponentRunnable + StartSync() + SyncAll(ctx context.Context, peerId string, existing, missing []string) error +} diff --git a/commonspace/objectsync/mock_objectsync/mock_objectsync.go b/commonspace/objectsync/mock_objectsync/mock_objectsync.go index d1c4666d..ede61e46 100644 --- a/commonspace/objectsync/mock_objectsync/mock_objectsync.go +++ b/commonspace/objectsync/mock_objectsync/mock_objectsync.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/objectsync (interfaces: ObjectSync) - +// +// Generated by this command: +// +// mockgen -destination mock_objectsync/mock_objectsync.go github.com/anyproto/any-sync/commonspace/objectsync ObjectSync +// // Package mock_objectsync is a generated GoMock package. package mock_objectsync @@ -47,7 +51,7 @@ func (m *MockObjectSync) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockObjectSyncMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockObjectSync)(nil).Close), arg0) } @@ -61,7 +65,7 @@ func (m *MockObjectSync) CloseThread(arg0 string) error { } // CloseThread indicates an expected call of CloseThread. -func (mr *MockObjectSyncMockRecorder) CloseThread(arg0 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) CloseThread(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseThread", reflect.TypeOf((*MockObjectSync)(nil).CloseThread), arg0) } @@ -75,7 +79,7 @@ func (m *MockObjectSync) HandleMessage(arg0 context.Context, arg1 objectsync.Han } // HandleMessage indicates an expected call of HandleMessage. -func (mr *MockObjectSyncMockRecorder) HandleMessage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) HandleMessage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleMessage", reflect.TypeOf((*MockObjectSync)(nil).HandleMessage), arg0, arg1) } @@ -90,7 +94,7 @@ func (m *MockObjectSync) HandleRequest(arg0 context.Context, arg1 *spacesyncprot } // HandleRequest indicates an expected call of HandleRequest. -func (mr *MockObjectSyncMockRecorder) HandleRequest(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) HandleRequest(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleRequest", reflect.TypeOf((*MockObjectSync)(nil).HandleRequest), arg0, arg1) } @@ -104,7 +108,7 @@ func (m *MockObjectSync) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockObjectSyncMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockObjectSync)(nil).Init), arg0) } @@ -146,7 +150,7 @@ func (m *MockObjectSync) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockObjectSyncMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockObjectSyncMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockObjectSync)(nil).Run), arg0) } diff --git a/commonspace/objecttreebuilder/mock_objecttreebuilder/mock_objecttreebuilder.go b/commonspace/objecttreebuilder/mock_objecttreebuilder/mock_objecttreebuilder.go index 213557e9..7aca0fc9 100644 --- a/commonspace/objecttreebuilder/mock_objecttreebuilder/mock_objecttreebuilder.go +++ b/commonspace/objecttreebuilder/mock_objecttreebuilder/mock_objecttreebuilder.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/objecttreebuilder (interfaces: TreeBuilder) - +// +// Generated by this command: +// +// mockgen -destination mock_objecttreebuilder/mock_objecttreebuilder.go github.com/anyproto/any-sync/commonspace/objecttreebuilder TreeBuilder +// // Package mock_objecttreebuilder is a generated GoMock package. package mock_objecttreebuilder @@ -48,7 +52,7 @@ func (m *MockTreeBuilder) BuildHistoryTree(arg0 context.Context, arg1 string, ar } // BuildHistoryTree indicates an expected call of BuildHistoryTree. -func (mr *MockTreeBuilderMockRecorder) BuildHistoryTree(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeBuilderMockRecorder) BuildHistoryTree(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuildHistoryTree", reflect.TypeOf((*MockTreeBuilder)(nil).BuildHistoryTree), arg0, arg1, arg2) } @@ -63,7 +67,7 @@ func (m *MockTreeBuilder) BuildTree(arg0 context.Context, arg1 string, arg2 obje } // BuildTree indicates an expected call of BuildTree. -func (mr *MockTreeBuilderMockRecorder) BuildTree(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeBuilderMockRecorder) BuildTree(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuildTree", reflect.TypeOf((*MockTreeBuilder)(nil).BuildTree), arg0, arg1, arg2) } @@ -78,7 +82,7 @@ func (m *MockTreeBuilder) CreateTree(arg0 context.Context, arg1 objecttree.Objec } // CreateTree indicates an expected call of CreateTree. -func (mr *MockTreeBuilderMockRecorder) CreateTree(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTreeBuilderMockRecorder) CreateTree(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTree", reflect.TypeOf((*MockTreeBuilder)(nil).CreateTree), arg0, arg1) } @@ -93,7 +97,7 @@ func (m *MockTreeBuilder) DeriveTree(arg0 context.Context, arg1 objecttree.Objec } // DeriveTree indicates an expected call of DeriveTree. -func (mr *MockTreeBuilderMockRecorder) DeriveTree(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTreeBuilderMockRecorder) DeriveTree(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeriveTree", reflect.TypeOf((*MockTreeBuilder)(nil).DeriveTree), arg0, arg1) } @@ -108,7 +112,7 @@ func (m *MockTreeBuilder) PutTree(arg0 context.Context, arg1 treestorage.TreeSto } // PutTree indicates an expected call of PutTree. -func (mr *MockTreeBuilderMockRecorder) PutTree(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockTreeBuilderMockRecorder) PutTree(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutTree", reflect.TypeOf((*MockTreeBuilder)(nil).PutTree), arg0, arg1, arg2) } diff --git a/commonspace/peermanager/mock_peermanager/mock_peermanager.go b/commonspace/peermanager/mock_peermanager/mock_peermanager.go index 115794ac..ee817a63 100644 --- a/commonspace/peermanager/mock_peermanager/mock_peermanager.go +++ b/commonspace/peermanager/mock_peermanager/mock_peermanager.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/peermanager (interfaces: PeerManager) - +// +// Generated by this command: +// +// mockgen -destination mock_peermanager/mock_peermanager.go github.com/anyproto/any-sync/commonspace/peermanager PeerManager +// // Package mock_peermanager is a generated GoMock package. package mock_peermanager @@ -46,7 +50,7 @@ func (m *MockPeerManager) Broadcast(arg0 context.Context, arg1 *spacesyncproto.O } // Broadcast indicates an expected call of Broadcast. -func (mr *MockPeerManagerMockRecorder) Broadcast(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPeerManagerMockRecorder) Broadcast(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Broadcast", reflect.TypeOf((*MockPeerManager)(nil).Broadcast), arg0, arg1) } @@ -61,7 +65,7 @@ func (m *MockPeerManager) GetNodePeers(arg0 context.Context) ([]peer.Peer, error } // GetNodePeers indicates an expected call of GetNodePeers. -func (mr *MockPeerManagerMockRecorder) GetNodePeers(arg0 interface{}) *gomock.Call { +func (mr *MockPeerManagerMockRecorder) GetNodePeers(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNodePeers", reflect.TypeOf((*MockPeerManager)(nil).GetNodePeers), arg0) } @@ -76,7 +80,7 @@ func (m *MockPeerManager) GetResponsiblePeers(arg0 context.Context) ([]peer.Peer } // GetResponsiblePeers indicates an expected call of GetResponsiblePeers. -func (mr *MockPeerManagerMockRecorder) GetResponsiblePeers(arg0 interface{}) *gomock.Call { +func (mr *MockPeerManagerMockRecorder) GetResponsiblePeers(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetResponsiblePeers", reflect.TypeOf((*MockPeerManager)(nil).GetResponsiblePeers), arg0) } @@ -90,7 +94,7 @@ func (m *MockPeerManager) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockPeerManagerMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockPeerManagerMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockPeerManager)(nil).Init), arg0) } @@ -118,7 +122,7 @@ func (m *MockPeerManager) SendPeer(arg0 context.Context, arg1 string, arg2 *spac } // SendPeer indicates an expected call of SendPeer. -func (mr *MockPeerManagerMockRecorder) SendPeer(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockPeerManagerMockRecorder) SendPeer(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendPeer", reflect.TypeOf((*MockPeerManager)(nil).SendPeer), arg0, arg1, arg2) } diff --git a/commonspace/settings/settingsstate/mock_settingsstate/mock_settingsstate.go b/commonspace/settings/settingsstate/mock_settingsstate/mock_settingsstate.go index a57b7ec9..8f64e354 100644 --- a/commonspace/settings/settingsstate/mock_settingsstate/mock_settingsstate.go +++ b/commonspace/settings/settingsstate/mock_settingsstate/mock_settingsstate.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/settings/settingsstate (interfaces: StateBuilder,ChangeFactory) - +// +// Generated by this command: +// +// mockgen -destination mock_settingsstate/mock_settingsstate.go github.com/anyproto/any-sync/commonspace/settings/settingsstate StateBuilder,ChangeFactory +// // Package mock_settingsstate is a generated GoMock package. package mock_settingsstate @@ -45,7 +49,7 @@ func (m *MockStateBuilder) Build(arg0 objecttree.ReadableObjectTree, arg1 *setti } // Build indicates an expected call of Build. -func (mr *MockStateBuilderMockRecorder) Build(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockStateBuilderMockRecorder) Build(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Build", reflect.TypeOf((*MockStateBuilder)(nil).Build), arg0, arg1) } @@ -83,7 +87,7 @@ func (m *MockChangeFactory) CreateObjectDeleteChange(arg0 string, arg1 *settings } // CreateObjectDeleteChange indicates an expected call of CreateObjectDeleteChange. -func (mr *MockChangeFactoryMockRecorder) CreateObjectDeleteChange(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockChangeFactoryMockRecorder) CreateObjectDeleteChange(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateObjectDeleteChange", reflect.TypeOf((*MockChangeFactory)(nil).CreateObjectDeleteChange), arg0, arg1, arg2) } diff --git a/commonspace/space.go b/commonspace/space.go index 8b7334a0..67bc1022 100644 --- a/commonspace/space.go +++ b/commonspace/space.go @@ -6,6 +6,7 @@ import ( "github.com/anyproto/any-sync/commonspace/headsync" "github.com/anyproto/any-sync/commonspace/object/acl/list" "github.com/anyproto/any-sync/commonspace/object/acl/syncacl" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" "github.com/anyproto/any-sync/commonspace/objectsync" "github.com/anyproto/any-sync/commonspace/objecttreebuilder" "github.com/anyproto/any-sync/commonspace/peermanager" @@ -69,6 +70,7 @@ type Space interface { Description() (desc SpaceDescription, err error) TreeBuilder() objecttreebuilder.TreeBuilder + TreeSyncer() treesyncer.TreeSyncer SyncStatus() syncstatus.StatusUpdater Storage() spacestorage.SpaceStorage @@ -91,6 +93,7 @@ type space struct { app *app.App treeBuilder objecttreebuilder.TreeBuilderComponent + treeSyncer treesyncer.TreeSyncer peerManager peermanager.PeerManager headSync headsync.HeadSync objectSync objectsync.ObjectSync @@ -149,6 +152,10 @@ func (s *space) TreeBuilder() objecttreebuilder.TreeBuilder { return s.treeBuilder } +func (s *space) TreeSyncer() treesyncer.TreeSyncer { + return s.treeSyncer +} + func (s *space) GetNodePeers(ctx context.Context) (peer []peer.Peer, err error) { return s.peerManager.GetNodePeers(ctx) } @@ -174,6 +181,7 @@ func (s *space) Init(ctx context.Context) (err error) { s.storage = s.app.MustComponent(spacestorage.CName).(spacestorage.SpaceStorage) s.peerManager = s.app.MustComponent(peermanager.CName).(peermanager.PeerManager) s.aclList = s.app.MustComponent(syncacl.CName).(list.AclList) + s.treeSyncer = s.app.MustComponent(treesyncer.CName).(treesyncer.TreeSyncer) s.header, err = s.storage.SpaceHeader() return } diff --git a/commonspace/spaceservice.go b/commonspace/spaceservice.go index 8d00eeb3..c4e3b657 100644 --- a/commonspace/spaceservice.go +++ b/commonspace/spaceservice.go @@ -4,6 +4,7 @@ package commonspace import ( "context" "github.com/anyproto/any-sync/commonspace/deletionmanager" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" "sync/atomic" "github.com/anyproto/any-sync/accountservice" @@ -52,10 +53,14 @@ type SpaceService interface { DeriveSpace(ctx context.Context, payload SpaceDerivePayload) (string, error) DeriveId(ctx context.Context, payload SpaceDerivePayload) (string, error) CreateSpace(ctx context.Context, payload SpaceCreatePayload) (string, error) - NewSpace(ctx context.Context, id string) (sp Space, err error) + NewSpace(ctx context.Context, id string, deps Deps) (sp Space, err error) app.Component } +type Deps struct { + TreeSyncer treesyncer.TreeSyncer +} + type spaceService struct { config config.Config account accountservice.Service @@ -129,7 +134,7 @@ func (s *spaceService) DeriveSpace(ctx context.Context, payload SpaceDerivePaylo return store.Id(), nil } -func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { +func (s *spaceService) NewSpace(ctx context.Context, id string, deps Deps) (Space, error) { st, err := s.storageProvider.WaitSpaceStorage(ctx, id) if err != nil { if err != spacestorage.ErrSpaceStorageMissing { @@ -175,6 +180,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { Register(deletionmanager.New()). Register(settings.New()). Register(objectmanager.New(s.treeManager)). + Register(deps.TreeSyncer). Register(objecttreebuilder.New()). Register(objectsync.New()). Register(headsync.New()) diff --git a/commonspace/spacestorage/mock_spacestorage/mock_spacestorage.go b/commonspace/spacestorage/mock_spacestorage/mock_spacestorage.go index a81d0a93..23bed04b 100644 --- a/commonspace/spacestorage/mock_spacestorage/mock_spacestorage.go +++ b/commonspace/spacestorage/mock_spacestorage/mock_spacestorage.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/spacestorage (interfaces: SpaceStorage) - +// +// Generated by this command: +// +// mockgen -destination mock_spacestorage/mock_spacestorage.go github.com/anyproto/any-sync/commonspace/spacestorage SpaceStorage +// // Package mock_spacestorage is a generated GoMock package. package mock_spacestorage @@ -63,7 +67,7 @@ func (m *MockSpaceStorage) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockSpaceStorageMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSpaceStorage)(nil).Close), arg0) } @@ -78,7 +82,7 @@ func (m *MockSpaceStorage) CreateTreeStorage(arg0 treestorage.TreeStorageCreateP } // CreateTreeStorage indicates an expected call of CreateTreeStorage. -func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).CreateTreeStorage), arg0) } @@ -93,7 +97,7 @@ func (m *MockSpaceStorage) HasTree(arg0 string) (bool, error) { } // HasTree indicates an expected call of HasTree. -func (mr *MockSpaceStorageMockRecorder) HasTree(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) HasTree(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasTree", reflect.TypeOf((*MockSpaceStorage)(nil).HasTree), arg0) } @@ -121,7 +125,7 @@ func (m *MockSpaceStorage) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockSpaceStorageMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpaceStorage)(nil).Init), arg0) } @@ -179,7 +183,7 @@ func (m *MockSpaceStorage) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockSpaceStorageMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockSpaceStorage)(nil).Run), arg0) } @@ -207,7 +211,7 @@ func (m *MockSpaceStorage) SetTreeDeletedStatus(arg0, arg1 string) error { } // SetTreeDeletedStatus indicates an expected call of SetTreeDeletedStatus. -func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).SetTreeDeletedStatus), arg0, arg1) } @@ -266,7 +270,7 @@ func (m *MockSpaceStorage) TreeDeletedStatus(arg0 string) (string, error) { } // TreeDeletedStatus indicates an expected call of TreeDeletedStatus. -func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).TreeDeletedStatus), arg0) } @@ -281,7 +285,7 @@ func (m *MockSpaceStorage) TreeRoot(arg0 string) (*treechangeproto.RawTreeChange } // TreeRoot indicates an expected call of TreeRoot. -func (mr *MockSpaceStorageMockRecorder) TreeRoot(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) TreeRoot(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeRoot", reflect.TypeOf((*MockSpaceStorage)(nil).TreeRoot), arg0) } @@ -296,7 +300,7 @@ func (m *MockSpaceStorage) TreeStorage(arg0 string) (treestorage.TreeStorage, er } // TreeStorage indicates an expected call of TreeStorage. -func (mr *MockSpaceStorageMockRecorder) TreeStorage(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) TreeStorage(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).TreeStorage), arg0) } @@ -310,7 +314,7 @@ func (m *MockSpaceStorage) WriteSpaceHash(arg0 string) error { } // WriteSpaceHash indicates an expected call of WriteSpaceHash. -func (mr *MockSpaceStorageMockRecorder) WriteSpaceHash(arg0 interface{}) *gomock.Call { +func (mr *MockSpaceStorageMockRecorder) WriteSpaceHash(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteSpaceHash", reflect.TypeOf((*MockSpaceStorage)(nil).WriteSpaceHash), arg0) } diff --git a/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go b/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go index 5c1aa7d1..4da83682 100644 --- a/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go +++ b/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/commonspace/spacesyncproto (interfaces: DRPCSpaceSyncClient) - +// +// Generated by this command: +// +// mockgen -destination mock_spacesyncproto/mock_spacesyncproto.go github.com/anyproto/any-sync/commonspace/spacesyncproto DRPCSpaceSyncClient +// // Package mock_spacesyncproto is a generated GoMock package. package mock_spacesyncproto @@ -46,7 +50,7 @@ func (m *MockDRPCSpaceSyncClient) AclAddRecord(arg0 context.Context, arg1 *space } // AclAddRecord indicates an expected call of AclAddRecord. -func (mr *MockDRPCSpaceSyncClientMockRecorder) AclAddRecord(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) AclAddRecord(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AclAddRecord", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).AclAddRecord), arg0, arg1) } @@ -61,7 +65,7 @@ func (m *MockDRPCSpaceSyncClient) AclGetRecords(arg0 context.Context, arg1 *spac } // AclGetRecords indicates an expected call of AclGetRecords. -func (mr *MockDRPCSpaceSyncClientMockRecorder) AclGetRecords(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) AclGetRecords(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AclGetRecords", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).AclGetRecords), arg0, arg1) } @@ -90,7 +94,7 @@ func (m *MockDRPCSpaceSyncClient) HeadSync(arg0 context.Context, arg1 *spacesync } // HeadSync indicates an expected call of HeadSync. -func (mr *MockDRPCSpaceSyncClientMockRecorder) HeadSync(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) HeadSync(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadSync", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).HeadSync), arg0, arg1) } @@ -105,7 +109,7 @@ func (m *MockDRPCSpaceSyncClient) ObjectSync(arg0 context.Context, arg1 *spacesy } // ObjectSync indicates an expected call of ObjectSync. -func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSync(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSync(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ObjectSync", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).ObjectSync), arg0, arg1) } @@ -120,7 +124,7 @@ func (m *MockDRPCSpaceSyncClient) ObjectSyncStream(arg0 context.Context) (spaces } // ObjectSyncStream indicates an expected call of ObjectSyncStream. -func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSyncStream(arg0 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSyncStream(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ObjectSyncStream", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).ObjectSyncStream), arg0) } @@ -135,7 +139,7 @@ func (m *MockDRPCSpaceSyncClient) SpacePull(arg0 context.Context, arg1 *spacesyn } // SpacePull indicates an expected call of SpacePull. -func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePull(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePull(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpacePull", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).SpacePull), arg0, arg1) } @@ -150,7 +154,7 @@ func (m *MockDRPCSpaceSyncClient) SpacePush(arg0 context.Context, arg1 *spacesyn } // SpacePush indicates an expected call of SpacePush. -func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePush(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePush(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpacePush", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).SpacePush), arg0, arg1) } diff --git a/commonspace/spaceutils_test.go b/commonspace/spaceutils_test.go index b7454b09..f19ce78f 100644 --- a/commonspace/spaceutils_test.go +++ b/commonspace/spaceutils_test.go @@ -10,6 +10,7 @@ import ( "github.com/anyproto/any-sync/commonspace/credentialprovider" "github.com/anyproto/any-sync/commonspace/object/tree/objecttree" "github.com/anyproto/any-sync/commonspace/object/treemanager" + "github.com/anyproto/any-sync/commonspace/object/treesyncer" "github.com/anyproto/any-sync/commonspace/objecttreebuilder" "github.com/anyproto/any-sync/commonspace/peermanager" "github.com/anyproto/any-sync/commonspace/spacestorage" @@ -269,6 +270,32 @@ func (n noOpSyncer) Close() error { return nil } +type mockTreeSyncer struct { +} + +func (m mockTreeSyncer) Init(a *app.App) (err error) { + return nil +} + +func (m mockTreeSyncer) Name() (name string) { + return treesyncer.CName +} + +func (m mockTreeSyncer) Run(ctx context.Context) (err error) { + return nil +} + +func (m mockTreeSyncer) Close(ctx context.Context) (err error) { + return nil +} + +func (m mockTreeSyncer) StartSync() { +} + +func (m mockTreeSyncer) SyncAll(ctx context.Context, peerId string, existing, missing []string) error { + return nil +} + type mockTreeManager struct { space Space cache ocache.OCache @@ -277,10 +304,6 @@ type mockTreeManager struct { waitLoad chan struct{} } -func (t *mockTreeManager) NewTreeSyncer(spaceId string, treeManager treemanager.TreeManager) treemanager.TreeSyncer { - return noOpSyncer{} -} - func (t *mockTreeManager) MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error { t.markedIds = append(t.markedIds, treeId) return nil diff --git a/consensus/consensusclient/mock_consensusclient/mock_consensusclient.go b/consensus/consensusclient/mock_consensusclient/mock_consensusclient.go index c752c2e1..d3a8ddda 100644 --- a/consensus/consensusclient/mock_consensusclient/mock_consensusclient.go +++ b/consensus/consensusclient/mock_consensusclient/mock_consensusclient.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/consensus/consensusclient (interfaces: Service) - +// +// Generated by this command: +// +// mockgen -destination mock_consensusclient/mock_consensusclient.go github.com/anyproto/any-sync/consensus/consensusclient Service +// // Package mock_consensusclient is a generated GoMock package. package mock_consensusclient @@ -46,7 +50,7 @@ func (m *MockService) AddLog(arg0 context.Context, arg1 *consensusproto.RawRecor } // AddLog indicates an expected call of AddLog. -func (mr *MockServiceMockRecorder) AddLog(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) AddLog(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddLog", reflect.TypeOf((*MockService)(nil).AddLog), arg0, arg1) } @@ -61,7 +65,7 @@ func (m *MockService) AddRecord(arg0 context.Context, arg1 string, arg2 *consens } // AddRecord indicates an expected call of AddRecord. -func (mr *MockServiceMockRecorder) AddRecord(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) AddRecord(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRecord", reflect.TypeOf((*MockService)(nil).AddRecord), arg0, arg1, arg2) } @@ -75,7 +79,7 @@ func (m *MockService) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockServiceMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockService)(nil).Close), arg0) } @@ -89,7 +93,7 @@ func (m *MockService) DeleteLog(arg0 context.Context, arg1 string) error { } // DeleteLog indicates an expected call of DeleteLog. -func (mr *MockServiceMockRecorder) DeleteLog(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteLog(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteLog", reflect.TypeOf((*MockService)(nil).DeleteLog), arg0, arg1) } @@ -103,7 +107,7 @@ func (m *MockService) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockServiceMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockService)(nil).Init), arg0) } @@ -131,7 +135,7 @@ func (m *MockService) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockServiceMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockService)(nil).Run), arg0) } @@ -145,7 +149,7 @@ func (m *MockService) UnWatch(arg0 string) error { } // UnWatch indicates an expected call of UnWatch. -func (mr *MockServiceMockRecorder) UnWatch(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UnWatch(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnWatch", reflect.TypeOf((*MockService)(nil).UnWatch), arg0) } @@ -159,7 +163,7 @@ func (m *MockService) Watch(arg0 string, arg1 consensusclient.Watcher) error { } // Watch indicates an expected call of Watch. -func (mr *MockServiceMockRecorder) Watch(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Watch(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockService)(nil).Watch), arg0, arg1) } diff --git a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go index 0e961924..e8c11dc3 100644 --- a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go +++ b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/coordinator/coordinatorclient (interfaces: CoordinatorClient) - +// +// Generated by this command: +// +// mockgen -destination mock_coordinatorclient/mock_coordinatorclient.go github.com/anyproto/any-sync/coordinator/coordinatorclient CoordinatorClient +// // Package mock_coordinatorclient is a generated GoMock package. package mock_coordinatorclient @@ -47,7 +51,7 @@ func (m *MockCoordinatorClient) ChangeStatus(arg0 context.Context, arg1 string, } // ChangeStatus indicates an expected call of ChangeStatus. -func (mr *MockCoordinatorClientMockRecorder) ChangeStatus(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) ChangeStatus(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChangeStatus", reflect.TypeOf((*MockCoordinatorClient)(nil).ChangeStatus), arg0, arg1, arg2) } @@ -62,7 +66,7 @@ func (m *MockCoordinatorClient) DeletionLog(arg0 context.Context, arg1 string, a } // DeletionLog indicates an expected call of DeletionLog. -func (mr *MockCoordinatorClientMockRecorder) DeletionLog(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) DeletionLog(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletionLog", reflect.TypeOf((*MockCoordinatorClient)(nil).DeletionLog), arg0, arg1, arg2) } @@ -77,7 +81,7 @@ func (m *MockCoordinatorClient) FileLimitCheck(arg0 context.Context, arg1 string } // FileLimitCheck indicates an expected call of FileLimitCheck. -func (mr *MockCoordinatorClientMockRecorder) FileLimitCheck(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) FileLimitCheck(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FileLimitCheck", reflect.TypeOf((*MockCoordinatorClient)(nil).FileLimitCheck), arg0, arg1, arg2) } @@ -91,7 +95,7 @@ func (m *MockCoordinatorClient) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockCoordinatorClientMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockCoordinatorClient)(nil).Init), arg0) } @@ -120,7 +124,7 @@ func (m *MockCoordinatorClient) NetworkConfiguration(arg0 context.Context, arg1 } // NetworkConfiguration indicates an expected call of NetworkConfiguration. -func (mr *MockCoordinatorClientMockRecorder) NetworkConfiguration(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) NetworkConfiguration(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NetworkConfiguration", reflect.TypeOf((*MockCoordinatorClient)(nil).NetworkConfiguration), arg0, arg1) } @@ -135,7 +139,7 @@ func (m *MockCoordinatorClient) SpaceSign(arg0 context.Context, arg1 coordinator } // SpaceSign indicates an expected call of SpaceSign. -func (mr *MockCoordinatorClientMockRecorder) SpaceSign(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) SpaceSign(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSign", reflect.TypeOf((*MockCoordinatorClient)(nil).SpaceSign), arg0, arg1) } @@ -150,7 +154,7 @@ func (m *MockCoordinatorClient) StatusCheck(arg0 context.Context, arg1 string) ( } // StatusCheck indicates an expected call of StatusCheck. -func (mr *MockCoordinatorClientMockRecorder) StatusCheck(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) StatusCheck(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StatusCheck", reflect.TypeOf((*MockCoordinatorClient)(nil).StatusCheck), arg0, arg1) } @@ -165,7 +169,7 @@ func (m *MockCoordinatorClient) StatusCheckMany(arg0 context.Context, arg1 []str } // StatusCheckMany indicates an expected call of StatusCheckMany. -func (mr *MockCoordinatorClientMockRecorder) StatusCheckMany(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) StatusCheckMany(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StatusCheckMany", reflect.TypeOf((*MockCoordinatorClient)(nil).StatusCheckMany), arg0, arg1) } diff --git a/net/peer/mock_peer/mock_peer.go b/net/peer/mock_peer/mock_peer.go index 12592cbf..6522ca18 100644 --- a/net/peer/mock_peer/mock_peer.go +++ b/net/peer/mock_peer/mock_peer.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/net/peer (interfaces: Peer) - +// +// Generated by this command: +// +// mockgen -destination mock_peer/mock_peer.go github.com/anyproto/any-sync/net/peer Peer +// // Package mock_peer is a generated GoMock package. package mock_peer @@ -46,7 +50,7 @@ func (m *MockPeer) AcquireDrpcConn(arg0 context.Context) (drpc.Conn, error) { } // AcquireDrpcConn indicates an expected call of AcquireDrpcConn. -func (mr *MockPeerMockRecorder) AcquireDrpcConn(arg0 interface{}) *gomock.Call { +func (mr *MockPeerMockRecorder) AcquireDrpcConn(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AcquireDrpcConn", reflect.TypeOf((*MockPeer)(nil).AcquireDrpcConn), arg0) } @@ -88,7 +92,7 @@ func (m *MockPeer) DoDrpc(arg0 context.Context, arg1 func(drpc.Conn) error) erro } // DoDrpc indicates an expected call of DoDrpc. -func (mr *MockPeerMockRecorder) DoDrpc(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPeerMockRecorder) DoDrpc(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DoDrpc", reflect.TypeOf((*MockPeer)(nil).DoDrpc), arg0, arg1) } @@ -128,7 +132,7 @@ func (m *MockPeer) ReleaseDrpcConn(arg0 drpc.Conn) { } // ReleaseDrpcConn indicates an expected call of ReleaseDrpcConn. -func (mr *MockPeerMockRecorder) ReleaseDrpcConn(arg0 interface{}) *gomock.Call { +func (mr *MockPeerMockRecorder) ReleaseDrpcConn(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReleaseDrpcConn", reflect.TypeOf((*MockPeer)(nil).ReleaseDrpcConn), arg0) } @@ -140,7 +144,7 @@ func (m *MockPeer) SetTTL(arg0 time.Duration) { } // SetTTL indicates an expected call of SetTTL. -func (mr *MockPeerMockRecorder) SetTTL(arg0 interface{}) *gomock.Call { +func (mr *MockPeerMockRecorder) SetTTL(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTTL", reflect.TypeOf((*MockPeer)(nil).SetTTL), arg0) } @@ -155,7 +159,7 @@ func (m *MockPeer) TryClose(arg0 time.Duration) (bool, error) { } // TryClose indicates an expected call of TryClose. -func (mr *MockPeerMockRecorder) TryClose(arg0 interface{}) *gomock.Call { +func (mr *MockPeerMockRecorder) TryClose(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockPeer)(nil).TryClose), arg0) } diff --git a/net/pool/mock_pool/mock_pool.go b/net/pool/mock_pool/mock_pool.go index 7a304053..aeaa0a70 100644 --- a/net/pool/mock_pool/mock_pool.go +++ b/net/pool/mock_pool/mock_pool.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/net/pool (interfaces: Pool) - +// +// Generated by this command: +// +// mockgen -destination mock_pool/mock_pool.go github.com/anyproto/any-sync/net/pool Pool +// // Package mock_pool is a generated GoMock package. package mock_pool @@ -44,7 +48,7 @@ func (m *MockPool) AddPeer(arg0 context.Context, arg1 peer.Peer) error { } // AddPeer indicates an expected call of AddPeer. -func (mr *MockPoolMockRecorder) AddPeer(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPoolMockRecorder) AddPeer(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPeer", reflect.TypeOf((*MockPool)(nil).AddPeer), arg0, arg1) } @@ -59,7 +63,7 @@ func (m *MockPool) Get(arg0 context.Context, arg1 string) (peer.Peer, error) { } // Get indicates an expected call of Get. -func (mr *MockPoolMockRecorder) Get(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPoolMockRecorder) Get(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockPool)(nil).Get), arg0, arg1) } @@ -74,7 +78,7 @@ func (m *MockPool) GetOneOf(arg0 context.Context, arg1 []string) (peer.Peer, err } // GetOneOf indicates an expected call of GetOneOf. -func (mr *MockPoolMockRecorder) GetOneOf(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockPoolMockRecorder) GetOneOf(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOneOf", reflect.TypeOf((*MockPool)(nil).GetOneOf), arg0, arg1) } diff --git a/net/transport/mock_transport/mock_transport.go b/net/transport/mock_transport/mock_transport.go index ddc13ea4..bbd948bf 100644 --- a/net/transport/mock_transport/mock_transport.go +++ b/net/transport/mock_transport/mock_transport.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/net/transport (interfaces: Transport,MultiConn) - +// +// Generated by this command: +// +// mockgen -destination mock_transport/mock_transport.go github.com/anyproto/any-sync/net/transport Transport,MultiConn +// // Package mock_transport is a generated GoMock package. package mock_transport @@ -46,7 +50,7 @@ func (m *MockTransport) Dial(arg0 context.Context, arg1 string) (transport.Multi } // Dial indicates an expected call of Dial. -func (mr *MockTransportMockRecorder) Dial(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockTransportMockRecorder) Dial(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Dial", reflect.TypeOf((*MockTransport)(nil).Dial), arg0, arg1) } @@ -58,7 +62,7 @@ func (m *MockTransport) SetAccepter(arg0 transport.Accepter) { } // SetAccepter indicates an expected call of SetAccepter. -func (mr *MockTransportMockRecorder) SetAccepter(arg0 interface{}) *gomock.Call { +func (mr *MockTransportMockRecorder) SetAccepter(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccepter", reflect.TypeOf((*MockTransport)(nil).SetAccepter), arg0) } @@ -167,7 +171,7 @@ func (m *MockMultiConn) Open(arg0 context.Context) (net.Conn, error) { } // Open indicates an expected call of Open. -func (mr *MockMultiConnMockRecorder) Open(arg0 interface{}) *gomock.Call { +func (mr *MockMultiConnMockRecorder) Open(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Open", reflect.TypeOf((*MockMultiConn)(nil).Open), arg0) } diff --git a/nodeconf/mock_nodeconf/mock_nodeconf.go b/nodeconf/mock_nodeconf/mock_nodeconf.go index 9b4c7d58..d9c2fa0d 100644 --- a/nodeconf/mock_nodeconf/mock_nodeconf.go +++ b/nodeconf/mock_nodeconf/mock_nodeconf.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/nodeconf (interfaces: Service) - +// +// Generated by this command: +// +// mockgen -destination mock_nodeconf/mock_nodeconf.go github.com/anyproto/any-sync/nodeconf Service +// // Package mock_nodeconf is a generated GoMock package. package mock_nodeconf @@ -60,7 +64,7 @@ func (m *MockService) Close(arg0 context.Context) error { } // Close indicates an expected call of Close. -func (mr *MockServiceMockRecorder) Close(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Close(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockService)(nil).Close), arg0) } @@ -144,7 +148,7 @@ func (m *MockService) Init(arg0 *app.App) error { } // Init indicates an expected call of Init. -func (mr *MockServiceMockRecorder) Init(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Init(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockService)(nil).Init), arg0) } @@ -158,7 +162,7 @@ func (m *MockService) IsResponsible(arg0 string) bool { } // IsResponsible indicates an expected call of IsResponsible. -func (mr *MockServiceMockRecorder) IsResponsible(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) IsResponsible(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsResponsible", reflect.TypeOf((*MockService)(nil).IsResponsible), arg0) } @@ -200,7 +204,7 @@ func (m *MockService) NodeIds(arg0 string) []string { } // NodeIds indicates an expected call of NodeIds. -func (mr *MockServiceMockRecorder) NodeIds(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) NodeIds(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeIds", reflect.TypeOf((*MockService)(nil).NodeIds), arg0) } @@ -214,7 +218,7 @@ func (m *MockService) NodeTypes(arg0 string) []nodeconf.NodeType { } // NodeTypes indicates an expected call of NodeTypes. -func (mr *MockServiceMockRecorder) NodeTypes(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) NodeTypes(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NodeTypes", reflect.TypeOf((*MockService)(nil).NodeTypes), arg0) } @@ -228,7 +232,7 @@ func (m *MockService) Partition(arg0 string) int { } // Partition indicates an expected call of Partition. -func (mr *MockServiceMockRecorder) Partition(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Partition(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Partition", reflect.TypeOf((*MockService)(nil).Partition), arg0) } @@ -243,7 +247,7 @@ func (m *MockService) PeerAddresses(arg0 string) ([]string, bool) { } // PeerAddresses indicates an expected call of PeerAddresses. -func (mr *MockServiceMockRecorder) PeerAddresses(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) PeerAddresses(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerAddresses", reflect.TypeOf((*MockService)(nil).PeerAddresses), arg0) } @@ -257,7 +261,7 @@ func (m *MockService) Run(arg0 context.Context) error { } // Run indicates an expected call of Run. -func (mr *MockServiceMockRecorder) Run(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) Run(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockService)(nil).Run), arg0) } diff --git a/util/periodicsync/mock_periodicsync/mock_periodicsync.go b/util/periodicsync/mock_periodicsync/mock_periodicsync.go index 909b32e1..4039cda8 100644 --- a/util/periodicsync/mock_periodicsync/mock_periodicsync.go +++ b/util/periodicsync/mock_periodicsync/mock_periodicsync.go @@ -1,6 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/anyproto/any-sync/util/periodicsync (interfaces: PeriodicSync) - +// +// Generated by this command: +// +// mockgen -destination mock_periodicsync/mock_periodicsync.go github.com/anyproto/any-sync/util/periodicsync PeriodicSync +// // Package mock_periodicsync is a generated GoMock package. package mock_periodicsync