From 520f2cf4708520059ff21cd4988389c81cd71f42 Mon Sep 17 00:00:00 2001
From: mcrakhman <rakhmanov.m@gmail.com>
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 ++++
 4 files changed, 39 insertions(+)

diff --git a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go
index 12dd4a95..3298fc03 100644
--- a/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go
+++ b/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go
@@ -350,6 +350,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 170f183e..a345e441 100644
--- a/commonspace/object/tree/objecttree/objecttree.go
+++ b/commonspace/object/tree/objecttree/objecttree.go
@@ -82,6 +82,7 @@ type ObjectTree interface {
 
 	Delete() error
 	Close() error
+	TryClose() (bool, error)
 }
 
 type objectTree struct {
@@ -560,6 +561,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 e5ee2d8a..4e38c375 100644
--- a/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go
+++ b/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go
@@ -501,6 +501,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() {