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

Add easy access to unmarshalled header

Browse Source
This commit is contained in:
mcrakhman 2023-01-03 18:55:43 +01:00 committed by Mikhail Iudin
parent df57a0230f
commit 15667b7ad8
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
4 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go
View File

@ -302,3 +302,17 @@ func (mr *MockObjectTreeMockRecorder) Unlock() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockObjectTree)(nil).Unlock))
}
// UnmarshalledHeader mocks base method.
func (m *MockObjectTree) UnmarshalledHeader() *objecttree.Change {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "UnmarshalledHeader")
ret0, _ := ret[0].(*objecttree.Change)
return ret0
}
// UnmarshalledHeader indicates an expected call of UnmarshalledHeader.
func (mr *MockObjectTreeMockRecorder) UnmarshalledHeader() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnmarshalledHeader", reflect.TypeOf((*MockObjectTree)(nil).UnmarshalledHeader))
}

8
common/commonspace/object/tree/objecttree/objecttree.go
View File

@ -48,6 +48,7 @@ type ObjectTree interface {
Id() string
Header() *treechangeproto.RawTreeChangeWithId
UnmarshalledHeader() *Change
Heads() []string
Root() *Change
HasChanges(...string) bool
@ -77,7 +78,8 @@ type objectTree struct {
aclList list2.AclList
id string
root *treechangeproto.RawTreeChangeWithId
rawRoot *treechangeproto.RawTreeChangeWithId
root *Change
tree *Tree
keys map[uint64]*symmetric.Key
@ -142,6 +144,10 @@ func (ot *objectTree) Id() string {
}
func (ot *objectTree) Header() *treechangeproto.RawTreeChangeWithId {
return ot.rawRoot
}
func (ot *objectTree) UnmarshalledHeader() *Change {
return ot.root
}

7
common/commonspace/object/tree/objecttree/objecttreefactory.go
View File

@ -150,18 +150,17 @@ func buildObjectTree(deps objectTreeDeps) (ObjectTree, error) {
}
objTree.id = objTree.treeStorage.Id()
objTree.id = objTree.treeStorage.Id()
objTree.root, err = objTree.treeStorage.Root()
objTree.rawRoot, err = objTree.treeStorage.Root()
if err != nil {
return nil, err
}
// verifying root
_, err = objTree.changeBuilder.ConvertFromRaw(objTree.root, true)
header, err := objTree.changeBuilder.ConvertFromRaw(objTree.rawRoot, true)
if err != nil {
return nil, err
}
objTree.root = header
return objTree, nil
}

14
common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go
View File

@ -455,6 +455,20 @@ func (mr *MockSyncTreeMockRecorder) Unlock() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockSyncTree)(nil).Unlock))
}
// UnmarshalledHeader mocks base method.
func (m *MockSyncTree) UnmarshalledHeader() *objecttree.Change {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "UnmarshalledHeader")
ret0, _ := ret[0].(*objecttree.Change)
return ret0
}
// UnmarshalledHeader indicates an expected call of UnmarshalledHeader.
func (mr *MockSyncTreeMockRecorder) UnmarshalledHeader() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnmarshalledHeader", reflect.TypeOf((*MockSyncTree)(nil).UnmarshalledHeader))
}
// MockReceiveQueue is a mock of ReceiveQueue interface.
type MockReceiveQueue struct {
ctrl *gomock.Controller