From 4f27e8e48df310c9064e97fc2ced1759db8451ab Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 18 Jan 2023 08:36:54 +0100 Subject: [PATCH] Optimize interfaces --- commonspace/object/tree/objecttree/historytree.go | 11 +---------- commonspace/object/tree/objecttree/objecttree.go | 6 +++++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/commonspace/object/tree/objecttree/historytree.go b/commonspace/object/tree/objecttree/historytree.go index 94e21b99..d981292d 100644 --- a/commonspace/object/tree/objecttree/historytree.go +++ b/commonspace/object/tree/objecttree/historytree.go @@ -2,21 +2,12 @@ package objecttree import ( "errors" - "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" ) var ErrLoadBeforeRoot = errors.New("can't load before root") type HistoryTree interface { - RWLocker - - Id() string - Root() *Change - Heads() []string - IterateFrom(id string, convert ChangeConvertFunc, iterate ChangeIterateFunc) error - GetChange(string) (*Change, error) - Header() *treechangeproto.RawTreeChangeWithId - UnmarshalledHeader() *Change + ReadableObjectTree } type historyTree struct { diff --git a/commonspace/object/tree/objecttree/objecttree.go b/commonspace/object/tree/objecttree/objecttree.go index f96da1b4..9e5141b0 100644 --- a/commonspace/object/tree/objecttree/objecttree.go +++ b/commonspace/object/tree/objecttree/objecttree.go @@ -44,7 +44,7 @@ type RawChangesPayload struct { type ChangeIterateFunc = func(change *Change) bool type ChangeConvertFunc = func(decrypted []byte) (any, error) -type ObjectTree interface { +type ReadableObjectTree interface { RWLocker Id() string @@ -59,6 +59,10 @@ type ObjectTree interface { DebugDump(parser DescriptionParser) (string, error) IterateRoot(convert ChangeConvertFunc, iterate ChangeIterateFunc) error IterateFrom(id string, convert ChangeConvertFunc, iterate ChangeIterateFunc) error +} + +type ObjectTree interface { + ReadableObjectTree SnapshotPath() []string ChangesAfterCommonSnapshot(snapshotPath, heads []string) ([]*treechangeproto.RawTreeChangeWithId, error)