benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from anyproto/update-tree-syncer

Browse Source
This commit is contained in:
Mikhail Rakhmanov 2023-05-26 20:35:05 +02:00 committed by GitHub
commit f442b21969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commonspace/headsync/diffsyncer.go
View File

@ -66,7 +66,7 @@ type diffSyncer struct {
func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) { func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) {
d.deletionState = deletionState d.deletionState = deletionState
d.deletionState.AddObserver(d.RemoveObjects) 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) { func (d *diffSyncer) RemoveObjects(ids []string) {

2
commonspace/headsync/diffsyncer_test.go
View File

@ -127,7 +127,7 @@ func TestDiffSyncer_Sync(t *testing.T) {
l := logger.NewNamed(spaceId) l := logger.NewNamed(spaceId)
diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l) diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l)
delState.EXPECT().AddObserver(gomock.Any()) delState.EXPECT().AddObserver(gomock.Any())
cacheMock.EXPECT().NewTreeSyncer(spaceId).Return(treeSyncerMock) cacheMock.EXPECT().NewTreeSyncer(spaceId, gomock.Any()).Return(treeSyncerMock)
diffSyncer.Init(delState) diffSyncer.Init(delState)
t.Run("diff syncer sync", func(t *testing.T) { t.Run("diff syncer sync", func(t *testing.T) {

8
commonspace/object/treemanager/mock_treemanager/mock_treemanager.go
View File

@ -123,17 +123,17 @@ func (mr *MockTreeManagerMockRecorder) Name() *gomock.Call {
} }
// NewTreeSyncer mocks base method. // 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() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "NewTreeSyncer", arg0) ret := m.ctrl.Call(m, "NewTreeSyncer", arg0, arg1)
ret0, _ := ret[0].(treemanager.TreeSyncer) ret0, _ := ret[0].(treemanager.TreeSyncer)
return ret0 return ret0
} }
// NewTreeSyncer indicates an expected call of NewTreeSyncer. // 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() 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. // Run mocks base method.

2
commonspace/object/treemanager/treemanager.go
View File

@ -14,7 +14,7 @@ type TreeManager interface {
GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error) GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error)
MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error
DeleteTree(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 { type TreeSyncer interface {

2
commonspace/spaceutils_test.go
View File

@ -238,7 +238,7 @@ type mockTreeManager struct {
markedIds []string markedIds []string
} }
func (t *mockTreeManager) NewTreeSyncer(spaceId string) treemanager.TreeSyncer { func (t *mockTreeManager) NewTreeSyncer(spaceId string, treeManager treemanager.TreeManager) treemanager.TreeSyncer {
return noOpSyncer{} return noOpSyncer{}
} }