From 0c797412166d0080f8bd675d560ab1a8f7cadfe0 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 9 Mar 2023 23:09:26 +0100 Subject: [PATCH] Update objecttree with tryclose --- .../objecttree/mock_objecttree/mock_objecttree.go | 15 +++++++++++++++ commonspace/object/tree/objecttree/objecttree.go | 5 +++++ .../tree/synctree/mock_synctree/mock_synctree.go | 15 +++++++++++++++ commonspace/object/tree/synctree/synctree.go | 4 ++++ .../mock_coordinatorclient.go | 11 ++++++----- 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index 541fa779..d64e7dea 100644 --- a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go +++ b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -336,6 +336,21 @@ func (mr *MockObjectTreeMockRecorder) Storage() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Storage", reflect.TypeOf((*MockObjectTree)(nil).Storage)) } +// TryClose mocks base method. +func (m *MockObjectTree) TryClose() (bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TryClose") + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TryClose indicates an expected call of TryClose. +func (mr *MockObjectTreeMockRecorder) TryClose() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockObjectTree)(nil).TryClose)) +} + // TryLock mocks base method. func (m *MockObjectTree) TryLock() bool { m.ctrl.T.Helper() diff --git a/commonspace/object/tree/objecttree/objecttree.go b/commonspace/object/tree/objecttree/objecttree.go index 31abc01a..003cdd39 100644 --- a/commonspace/object/tree/objecttree/objecttree.go +++ b/commonspace/object/tree/objecttree/objecttree.go @@ -81,6 +81,7 @@ type ObjectTree interface { Delete() error Close() error + TryClose() (bool, error) } type objectTree struct { @@ -555,6 +556,10 @@ func (ot *objectTree) Root() *Change { return ot.tree.Root() } +func (ot *objectTree) TryClose() (bool, error) { + return true, ot.Close() +} + func (ot *objectTree) Close() error { return nil } diff --git a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index d7fe181f..31ee3607 100644 --- a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go +++ b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -487,6 +487,21 @@ func (mr *MockSyncTreeMockRecorder) SyncWithPeer(arg0, arg1 interface{}) *gomock return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncWithPeer", reflect.TypeOf((*MockSyncTree)(nil).SyncWithPeer), arg0, arg1) } +// TryClose mocks base method. +func (m *MockSyncTree) TryClose() (bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TryClose") + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TryClose indicates an expected call of TryClose. +func (mr *MockSyncTreeMockRecorder) TryClose() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TryClose", reflect.TypeOf((*MockSyncTree)(nil).TryClose)) +} + // TryLock mocks base method. func (m *MockSyncTree) TryLock() bool { m.ctrl.T.Helper() diff --git a/commonspace/object/tree/synctree/synctree.go b/commonspace/object/tree/synctree/synctree.go index f25e14d0..fe429768 100644 --- a/commonspace/object/tree/synctree/synctree.go +++ b/commonspace/object/tree/synctree/synctree.go @@ -209,6 +209,10 @@ func (s *syncTree) Delete() (err error) { return } +func (s *syncTree) TryClose() (bool, error) { + return true, s.Close() +} + func (s *syncTree) Close() (err error) { log.Debug("closing sync tree", zap.String("id", s.Id())) defer func() { diff --git a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go index b6b6931e..7216e1eb 100644 --- a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go +++ b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go @@ -38,11 +38,12 @@ func (m *MockCoordinatorClient) EXPECT() *MockCoordinatorClientMockRecorder { } // ChangeStatus mocks base method. -func (m *MockCoordinatorClient) ChangeStatus(arg0 context.Context, arg1 string, arg2 *treechangeproto.RawTreeChangeWithId) error { +func (m *MockCoordinatorClient) ChangeStatus(arg0 context.Context, arg1 string, arg2 *treechangeproto.RawTreeChangeWithId) (*coordinatorproto.SpaceStatusPayload, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ChangeStatus", arg0, arg1, arg2) - ret0, _ := ret[0].(error) - return ret0 + ret0, _ := ret[0].(*coordinatorproto.SpaceStatusPayload) + ret1, _ := ret[1].(error) + return ret0, ret1 } // ChangeStatus indicates an expected call of ChangeStatus. @@ -110,10 +111,10 @@ func (mr *MockCoordinatorClientMockRecorder) SpaceSign(arg0, arg1, arg2 interfac } // StatusCheck mocks base method. -func (m *MockCoordinatorClient) StatusCheck(arg0 context.Context, arg1 string) (*coordinatorproto.SpaceStatusCheckResponse, error) { +func (m *MockCoordinatorClient) StatusCheck(arg0 context.Context, arg1 string) (*coordinatorproto.SpaceStatusPayload, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StatusCheck", arg0, arg1) - ret0, _ := ret[0].(*coordinatorproto.SpaceStatusCheckResponse) + ret0, _ := ret[0].(*coordinatorproto.SpaceStatusPayload) ret1, _ := ret[1].(error) return ret0, ret1 }