From 1fab89e15423b2c58505686b76b552e07cf802d4 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 26 Oct 2022 22:05:55 +0200 Subject: [PATCH] Fix mocks and formatting --- .../storage/mock_storage/mock_storage.go | 5 ++--- .../synctree/mock_synctree/mock_synctree.go | 15 --------------- common/commonspace/synctree/synctree.go | 13 +++---------- .../pkg/acl/storage/mock_storage/mock_storage.go | 10 ++++------ 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/common/commonspace/storage/mock_storage/mock_storage.go b/common/commonspace/storage/mock_storage/mock_storage.go index 422af081..fb76ad05 100644 --- a/common/commonspace/storage/mock_storage/mock_storage.go +++ b/common/commonspace/storage/mock_storage/mock_storage.go @@ -163,12 +163,11 @@ func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 interface{}) *gom } // ID mocks base method. -func (m *MockSpaceStorage) ID() (string, error) { +func (m *MockSpaceStorage) ID() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID") ret0, _ := ret[0].(string) - ret1, _ := ret[1].(error) - return ret0, ret1 + return ret0 } // ID indicates an expected call of ID. diff --git a/common/commonspace/synctree/mock_synctree/mock_synctree.go b/common/commonspace/synctree/mock_synctree/mock_synctree.go index 61cf4401..914a6ec1 100644 --- a/common/commonspace/synctree/mock_synctree/mock_synctree.go +++ b/common/commonspace/synctree/mock_synctree/mock_synctree.go @@ -6,7 +6,6 @@ package mock_synctree import ( reflect "reflect" - time "time" tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" @@ -122,20 +121,6 @@ func (mr *MockSyncClientMockRecorder) CreateNewTreeRequest() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateNewTreeRequest", reflect.TypeOf((*MockSyncClient)(nil).CreateNewTreeRequest)) } -// LastUsage mocks base method. -func (m *MockSyncClient) LastUsage() time.Time { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "LastUsage") - ret0, _ := ret[0].(time.Time) - return ret0 -} - -// LastUsage indicates an expected call of LastUsage. -func (mr *MockSyncClientMockRecorder) LastUsage() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LastUsage", reflect.TypeOf((*MockSyncClient)(nil).LastUsage)) -} - // SendAsync mocks base method. func (m *MockSyncClient) SendAsync(arg0 string, arg1 *treechangeproto.TreeSyncMessage, arg2 string) error { m.ctrl.T.Helper() diff --git a/common/commonspace/synctree/synctree.go b/common/commonspace/synctree/synctree.go index 451b9a16..909ea82c 100644 --- a/common/commonspace/synctree/synctree.go +++ b/common/commonspace/synctree/synctree.go @@ -57,9 +57,7 @@ type BuildDeps struct { TreeStorage storage.TreeStorage } -func DeriveSyncTree( - ctx context.Context, - deps CreateDeps) (t tree.ObjectTree, err error) { +func DeriveSyncTree(ctx context.Context, deps CreateDeps) (t tree.ObjectTree, err error) { t, err = createDerivedObjectTree(deps.Payload, deps.AclList, deps.CreateStorage) if err != nil { return @@ -84,9 +82,7 @@ func DeriveSyncTree( return } -func CreateSyncTree( - ctx context.Context, - deps CreateDeps) (t tree.ObjectTree, err error) { +func CreateSyncTree(ctx context.Context, deps CreateDeps) (t tree.ObjectTree, err error) { t, err = createObjectTree(deps.Payload, deps.AclList, deps.CreateStorage) if err != nil { return @@ -167,10 +163,7 @@ func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t return buildSyncTree(ctx, true, deps) } -func buildSyncTree( - ctx context.Context, - isFirstBuild bool, - deps BuildDeps) (t tree.ObjectTree, err error) { +func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t tree.ObjectTree, err error) { t, err = buildObjectTree(deps.TreeStorage, deps.AclList) if err != nil { diff --git a/common/pkg/acl/storage/mock_storage/mock_storage.go b/common/pkg/acl/storage/mock_storage/mock_storage.go index bd562720..38f8a2b2 100644 --- a/common/pkg/acl/storage/mock_storage/mock_storage.go +++ b/common/pkg/acl/storage/mock_storage/mock_storage.go @@ -81,12 +81,11 @@ func (mr *MockListStorageMockRecorder) Head() *gomock.Call { } // ID mocks base method. -func (m *MockListStorage) ID() (string, error) { +func (m *MockListStorage) ID() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID") ret0, _ := ret[0].(string) - ret1, _ := ret[1].(error) - return ret0, ret1 + return ret0 } // ID indicates an expected call of ID. @@ -207,12 +206,11 @@ func (mr *MockTreeStorageMockRecorder) Heads() *gomock.Call { } // ID mocks base method. -func (m *MockTreeStorage) ID() (string, error) { +func (m *MockTreeStorage) ID() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID") ret0, _ := ret[0].(string) - ret1, _ := ret[1].(error) - return ret0, ret1 + return ret0 } // ID indicates an expected call of ID.