diff --git a/client/document/textdocument/textdocument.go b/client/document/textdocument/textdocument.go index a96159f3..85fd9629 100644 --- a/client/document/textdocument/textdocument.go +++ b/client/document/textdocument/textdocument.go @@ -90,7 +90,7 @@ func (t *textDocument) Text() (text string, err error) { t.RLock() defer t.RUnlock() - err = t.Iterate( + err = t.IterateRoot( func(decrypted []byte) (any, error) { textChange := &textchange.TextData{} err = proto.Unmarshal(decrypted, textChange) diff --git a/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index 3c2b490a..d54ad8b6 100644 --- a/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go +++ b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -185,20 +185,6 @@ func (mr *MockObjectTreeMockRecorder) Id() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockObjectTree)(nil).Id)) } -// Iterate mocks base method. -func (m *MockObjectTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Iterate", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 -} - -// Iterate indicates an expected call of Iterate. -func (mr *MockObjectTreeMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockObjectTree)(nil).Iterate), arg0, arg1) -} - // IterateFrom mocks base method. func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() @@ -213,6 +199,20 @@ func (mr *MockObjectTreeMockRecorder) IterateFrom(arg0, arg1, arg2 interface{}) 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([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "IterateRoot", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// IterateRoot indicates an expected call of IterateRoot. +func (mr *MockObjectTreeMockRecorder) IterateRoot(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateRoot", reflect.TypeOf((*MockObjectTree)(nil).IterateRoot), arg0, arg1) +} + // Lock mocks base method. func (m *MockObjectTree) Lock() { m.ctrl.T.Helper() diff --git a/common/commonspace/object/tree/objecttree/objecttree.go b/common/commonspace/object/tree/objecttree/objecttree.go index 522564a8..81e311f3 100644 --- a/common/commonspace/object/tree/objecttree/objecttree.go +++ b/common/commonspace/object/tree/objecttree/objecttree.go @@ -54,7 +54,7 @@ type ObjectTree interface { HasChanges(...string) bool DebugDump() (string, error) - Iterate(convert ChangeConvertFunc, iterate ChangeIterateFunc) error + IterateRoot(convert ChangeConvertFunc, iterate ChangeIterateFunc) error IterateFrom(id string, convert ChangeConvertFunc, iterate ChangeIterateFunc) error SnapshotPath() []string @@ -458,7 +458,7 @@ func (ot *objectTree) createAddResult(oldHeads []string, mode Mode, treeChangesA return } -func (ot *objectTree) Iterate(convert ChangeConvertFunc, iterate ChangeIterateFunc) (err error) { +func (ot *objectTree) IterateRoot(convert ChangeConvertFunc, iterate ChangeIterateFunc) (err error) { return ot.IterateFrom(ot.tree.RootId(), convert, iterate) } diff --git a/common/commonspace/object/tree/objecttree/objecttree_test.go b/common/commonspace/object/tree/objecttree/objecttree_test.go index 41d4d98f..4e15ca10 100644 --- a/common/commonspace/object/tree/objecttree/objecttree_test.go +++ b/common/commonspace/object/tree/objecttree/objecttree_test.go @@ -133,7 +133,7 @@ func prepareTreeContext(t *testing.T, aclList list.AclList) testTreeContext { // check tree iterate var iterChangesId []string - err = objTree.Iterate(nil, func(change *Change) bool { + err = objTree.IterateRoot(nil, func(change *Change) bool { iterChangesId = append(iterChangesId, change.Id) return true }) @@ -179,7 +179,7 @@ func TestObjectTree(t *testing.T) { // check tree iterate var iterChangesId []string - err = objTree.Iterate(nil, func(change *Change) bool { + err = objTree.IterateRoot(nil, func(change *Change) bool { iterChangesId = append(iterChangesId, change.Id) return true }) @@ -277,7 +277,7 @@ func TestObjectTree(t *testing.T) { // check tree iterate var iterChangesId []string - err = objTree.Iterate(nil, func(change *Change) bool { + err = objTree.IterateRoot(nil, func(change *Change) bool { iterChangesId = append(iterChangesId, change.Id) return true }) @@ -523,7 +523,7 @@ func TestObjectTree(t *testing.T) { // check tree iterate var iterChangesId []string - err = objTree.Iterate(nil, func(change *Change) bool { + err = objTree.IterateRoot(nil, func(change *Change) bool { iterChangesId = append(iterChangesId, change.Id) return true }) diff --git a/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index 154a84ce..52b584e4 100644 --- a/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go +++ b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -323,20 +323,6 @@ func (mr *MockSyncTreeMockRecorder) Id() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSyncTree)(nil).Id)) } -// Iterate mocks base method. -func (m *MockSyncTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Iterate", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 -} - -// Iterate indicates an expected call of Iterate. -func (mr *MockSyncTreeMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockSyncTree)(nil).Iterate), arg0, arg1) -} - // IterateFrom mocks base method. func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() @@ -351,6 +337,20 @@ func (mr *MockSyncTreeMockRecorder) IterateFrom(arg0, arg1, arg2 interface{}) *g 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([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "IterateRoot", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// IterateRoot indicates an expected call of IterateRoot. +func (mr *MockSyncTreeMockRecorder) IterateRoot(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateRoot", reflect.TypeOf((*MockSyncTree)(nil).IterateRoot), arg0, arg1) +} + // Lock mocks base method. func (m *MockSyncTree) Lock() { m.ctrl.T.Helper() diff --git a/common/commonspace/object/tree/synctree/synctree.go b/common/commonspace/object/tree/synctree/synctree.go index 7e6f77c5..fc835427 100644 --- a/common/commonspace/object/tree/synctree/synctree.go +++ b/common/commonspace/object/tree/synctree/synctree.go @@ -200,11 +200,11 @@ func (s *syncTree) IterateFrom(id string, convert objecttree.ChangeConvertFunc, return s.ObjectTree.IterateFrom(id, convert, iterate) } -func (s *syncTree) Iterate(convert objecttree.ChangeConvertFunc, iterate objecttree.ChangeIterateFunc) (err error) { +func (s *syncTree) IterateRoot(convert objecttree.ChangeConvertFunc, iterate objecttree.ChangeIterateFunc) (err error) { if err = s.checkAlive(); err != nil { return } - return s.ObjectTree.Iterate(convert, iterate) + return s.ObjectTree.IterateRoot(convert, iterate) } func (s *syncTree) AddContent(ctx context.Context, content objecttree.SignableChangeContent) (res objecttree.AddResult, err error) {