From e9ea4e1d3ef87c7085d0ca86f5db3fcf98edc274 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Fri, 26 May 2023 20:21:07 +0200 Subject: [PATCH] Provide treemanager from outside for settings id --- commonspace/headsync/diffsyncer.go | 2 +- commonspace/headsync/diffsyncer_test.go | 2 +- .../treemanager/mock_treemanager/mock_treemanager.go | 8 ++++---- commonspace/object/treemanager/treemanager.go | 2 +- commonspace/spaceutils_test.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commonspace/headsync/diffsyncer.go b/commonspace/headsync/diffsyncer.go index e9eb2abe..8b59c743 100644 --- a/commonspace/headsync/diffsyncer.go +++ b/commonspace/headsync/diffsyncer.go @@ -66,7 +66,7 @@ type diffSyncer struct { func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) { d.deletionState = deletionState d.deletionState.AddObserver(d.RemoveObjects) - d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId) + d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId, d.treeManager) } func (d *diffSyncer) RemoveObjects(ids []string) { diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index cafb7a5f..fb1ad49c 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -127,7 +127,7 @@ func TestDiffSyncer_Sync(t *testing.T) { l := logger.NewNamed(spaceId) diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l) delState.EXPECT().AddObserver(gomock.Any()) - cacheMock.EXPECT().NewTreeSyncer(spaceId).Return(treeSyncerMock) + cacheMock.EXPECT().NewTreeSyncer(spaceId, gomock.Any()).Return(treeSyncerMock) diffSyncer.Init(delState) t.Run("diff syncer sync", func(t *testing.T) { diff --git a/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go b/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go index e1035ae1..ee285aac 100644 --- a/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go +++ b/commonspace/object/treemanager/mock_treemanager/mock_treemanager.go @@ -123,17 +123,17 @@ func (mr *MockTreeManagerMockRecorder) Name() *gomock.Call { } // NewTreeSyncer mocks base method. -func (m *MockTreeManager) NewTreeSyncer(arg0 string) treemanager.TreeSyncer { +func (m *MockTreeManager) NewTreeSyncer(arg0 string, arg1 treemanager.TreeManager) treemanager.TreeSyncer { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewTreeSyncer", arg0) + 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 interface{}) *gomock.Call { +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) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTreeSyncer", reflect.TypeOf((*MockTreeManager)(nil).NewTreeSyncer), arg0, arg1) } // Run mocks base method. diff --git a/commonspace/object/treemanager/treemanager.go b/commonspace/object/treemanager/treemanager.go index d0a79e51..eeaa50af 100644 --- a/commonspace/object/treemanager/treemanager.go +++ b/commonspace/object/treemanager/treemanager.go @@ -14,7 +14,7 @@ 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) TreeSyncer + NewTreeSyncer(spaceId string, treeManager TreeManager) TreeSyncer } type TreeSyncer interface { diff --git a/commonspace/spaceutils_test.go b/commonspace/spaceutils_test.go index 0fc0977f..000d571c 100644 --- a/commonspace/spaceutils_test.go +++ b/commonspace/spaceutils_test.go @@ -238,7 +238,7 @@ type mockTreeManager struct { markedIds []string } -func (t *mockTreeManager) NewTreeSyncer(spaceId string) treemanager.TreeSyncer { +func (t *mockTreeManager) NewTreeSyncer(spaceId string, treeManager treemanager.TreeManager) treemanager.TreeSyncer { return noOpSyncer{} }