From 3c30f72cd54463ca4cb4c755d90c1919f659bee9 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Sun, 25 Dec 2022 15:08:26 +0100 Subject: [PATCH 01/17] WIP refactoring syncstatus headsync --- client/clientspace/statusreceiver.go | 6 +- client/document/service.go | 5 +- common/commonspace/commongetter.go | 6 +- .../{diffservice => headsync}/diffsyncer.go | 29 +++--- .../diffsyncer_test.go | 15 ++- .../diffservice.go => headsync/headsync.go} | 41 ++++---- .../headsync_test.go} | 10 +- .../mock_headsync/mock_headsync.go} | 8 +- .../{remotediff => headsync}/remotediff.go | 2 +- .../remotediff_test.go | 2 +- common/commonspace/rpchandler.go | 4 +- common/commonspace/service.go | 19 ++-- .../deleteloop.go | 2 +- .../{settingsdocument => settings}/deleter.go | 4 +- .../deleter_test.go | 4 +- .../deletionstate/deletionstate.go | 2 +- .../deletionstate/deletionstate_test.go | 0 .../mock_deletionstate/mock_deletionstate.go | 4 +- .../idprovider.go | 2 +- .../idprovider_test.go | 2 +- .../settings/mock_settings/mock_settings.go | 86 +++++++++++++++++ .../mock_settings}/mock_settingsdocument.go | 6 +- .../settings.go} | 38 ++++---- .../settings_test.go} | 30 +++--- common/commonspace/space.go | 94 +++++++++---------- common/commonspace/statusservice/noop.go | 40 -------- common/commonspace/syncstatus/noop.go | 30 ++++++ .../syncstatus.go} | 92 ++++++++++++------ common/commonspace/synctree/synctree.go | 40 ++++---- common/commonspace/synctree/synctree_test.go | 18 ++-- .../commonspace/synctree/synctreehandler.go | 25 +++-- .../synctree/synctreehandler_test.go | 10 +- 32 files changed, 390 insertions(+), 286 deletions(-) rename common/commonspace/{diffservice => headsync}/diffsyncer.go (88%) rename common/commonspace/{diffservice => headsync}/diffsyncer_test.go (92%) rename common/commonspace/{diffservice/diffservice.go => headsync/headsync.go} (71%) rename common/commonspace/{diffservice/diffservice_test.go => headsync/headsync_test.go} (91%) rename common/commonspace/{diffservice/mock_diffservice/mock_diffservice.go => headsync/mock_headsync/mock_headsync.go} (92%) rename common/commonspace/{remotediff => headsync}/remotediff.go (99%) rename common/commonspace/{remotediff => headsync}/remotediff_test.go (98%) rename common/commonspace/{settingsdocument => settings}/deleteloop.go (97%) rename common/commonspace/{settingsdocument => settings}/deleter.go (94%) rename common/commonspace/{settingsdocument => settings}/deleter_test.go (94%) rename common/commonspace/{settingsdocument => settings}/deletionstate/deletionstate.go (98%) rename common/commonspace/{settingsdocument => settings}/deletionstate/deletionstate_test.go (100%) rename common/commonspace/{settingsdocument => settings}/deletionstate/mock_deletionstate/mock_deletionstate.go (96%) rename common/commonspace/{settingsdocument => settings}/idprovider.go (98%) rename common/commonspace/{settingsdocument => settings}/idprovider_test.go (99%) create mode 100644 common/commonspace/settings/mock_settings/mock_settings.go rename common/commonspace/{settingsdocument/mock_settingsdocument => settings/mock_settings}/mock_settingsdocument.go (93%) rename common/commonspace/{settingsdocument/settingsdocument.go => settings/settings.go} (77%) rename common/commonspace/{settingsdocument/settingsdocument_test.go => settings/settings_test.go} (88%) delete mode 100644 common/commonspace/statusservice/noop.go create mode 100644 common/commonspace/syncstatus/noop.go rename common/commonspace/{statusservice/statusservice.go => syncstatus/syncstatus.go} (69%) diff --git a/client/clientspace/statusreceiver.go b/client/clientspace/statusreceiver.go index 5a22130e..c43ef434 100644 --- a/client/clientspace/statusreceiver.go +++ b/client/clientspace/statusreceiver.go @@ -2,15 +2,15 @@ package clientspace import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "go.uber.org/zap" ) type statusReceiver struct { } -func (s *statusReceiver) UpdateTree(ctx context.Context, treeId string, status statusservice.SyncStatus) (err error) { - log.With(zap.String("treeId", treeId), zap.Bool("synced", status == statusservice.SyncStatusSynced)). +func (s *statusReceiver) UpdateTree(ctx context.Context, treeId string, status syncstatus.SyncStatus) (err error) { + log.With(zap.String("treeId", treeId), zap.Bool("synced", status == syncstatus.SyncStatusSynced)). Debug("updating sync status") return nil } diff --git a/client/document/service.go b/client/document/service.go index 23dff39e..50cffa3e 100644 --- a/client/document/service.go +++ b/client/document/service.go @@ -8,7 +8,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" ) @@ -17,7 +16,7 @@ type Service interface { CreateDocument(spaceId string) (id string, err error) DeleteDocument(spaceId, documentId string) (err error) AllDocumentIds(spaceId string) (ids []string, err error) - AllDocumentHeads(spaceId string) (ids []diffservice.TreeHeads, err error) + AllDocumentHeads(spaceId string) (ids []headsync.TreeHeads, err error) AddText(spaceId, documentId, text string, isSnapshot bool) (root, head string, err error) DumpDocumentTree(spaceId, documentId string) (dump string, err error) TreeParams(spaceId, documentId string) (root string, head []string, err error) @@ -74,7 +73,7 @@ func (s *service) AllDocumentIds(spaceId string) (ids []string, err error) { return } -func (s *service) AllDocumentHeads(spaceId string) (ids []diffservice.TreeHeads, err error) { +func (s *service) AllDocumentHeads(spaceId string) (ids []headsync.TreeHeads, err error) { space, err := s.spaceService.GetSpace(context.Background(), spaceId) if err != nil { return diff --git a/common/commonspace/commongetter.go b/common/commonspace/commongetter.go index 6b6a857e..6dbeb99c 100644 --- a/common/commonspace/commongetter.go +++ b/common/commonspace/commongetter.go @@ -3,7 +3,7 @@ package commonspace import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectgetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" ) @@ -12,10 +12,10 @@ type commonSpaceGetter struct { spaceId string aclList *syncacl.SyncACL treeGetter treegetter.TreeGetter - settings settingsdocument.SettingsDocument + settings settings.SettingsObject } -func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settingsdocument.SettingsDocument) objectgetter.ObjectGetter { +func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settings.SettingsObject) objectgetter.ObjectGetter { return &commonSpaceGetter{ spaceId: spaceId, aclList: aclList, diff --git a/common/commonspace/diffservice/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go similarity index 88% rename from common/commonspace/diffservice/diffsyncer.go rename to common/commonspace/headsync/diffsyncer.go index 9dc3beda..0cd0143d 100644 --- a/common/commonspace/diffservice/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -1,12 +1,11 @@ -package diffservice +package headsync import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/remotediff" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" @@ -31,7 +30,7 @@ func newDiffSyncer( cache treegetter.TreeGetter, storage storage.SpaceStorage, clientFactory spacesyncproto.ClientFactory, - statusService statusservice.StatusService, + syncStatus syncstatus.SyncStatusUpdater, log *zap.Logger) DiffSyncer { return &diffSyncer{ diff: diff, @@ -41,7 +40,7 @@ func newDiffSyncer( confConnector: confConnector, clientFactory: clientFactory, log: log, - statusService: statusService, + syncStatus: syncStatus, } } @@ -54,7 +53,7 @@ type diffSyncer struct { clientFactory spacesyncproto.ClientFactory log *zap.Logger deletionState deletionstate.DeletionState - statusService statusservice.StatusService + syncStatus syncstatus.SyncStatusUpdater } func (d *diffSyncer) Init(deletionState deletionstate.DeletionState) { @@ -96,26 +95,28 @@ func (d *diffSyncer) Sync(ctx context.Context) error { func (d *diffSyncer) syncWithPeer(ctx context.Context, p peer.Peer) (err error) { var ( - cl = d.clientFactory.Client(p) - rdiff = remotediff.NewRemoteDiff(d.spaceId, cl) - stateCounter uint64 = 0 + cl = d.clientFactory.Client(p) + rdiff = NewRemoteDiff(d.spaceId, cl) + stateCounter = d.syncStatus.StateCounter() ) - stateCounter = d.statusService.StateCounter() + newIds, changedIds, removedIds, err := d.diff.Diff(ctx, rdiff) err = rpcerr.Unwrap(err) if err != nil && err != spacesyncproto.ErrSpaceMissing { - d.statusService.SetNodesOnline(p.Id(), false) + d.syncStatus.SetNodesOnline(p.Id(), false) return err } - d.statusService.SetNodesOnline(p.Id(), true) + d.syncStatus.SetNodesOnline(p.Id(), true) + if err == spacesyncproto.ErrSpaceMissing { return d.sendPushSpaceRequest(ctx, cl) } + totalLen := len(newIds) + len(changedIds) + len(removedIds) // not syncing ids which were removed through settings document filteredIds := d.deletionState.FilterJoin(newIds, changedIds, removedIds) - d.statusService.RemoveAllExcept(p.Id(), filteredIds, stateCounter) + d.syncStatus.RemoveAllExcept(p.Id(), filteredIds, stateCounter) ctx = peer.CtxWithPeerId(ctx, p.Id()) d.pingTreesInCache(ctx, filteredIds) diff --git a/common/commonspace/diffservice/diffsyncer_test.go b/common/commonspace/headsync/diffsyncer_test.go similarity index 92% rename from common/commonspace/diffservice/diffsyncer_test.go rename to common/commonspace/headsync/diffsyncer_test.go index c7711528..bcdf3c30 100644 --- a/common/commonspace/diffservice/diffsyncer_test.go +++ b/common/commonspace/headsync/diffsyncer_test.go @@ -1,15 +1,14 @@ -package diffservice +package headsync import ( "context" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/remotediff" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto/mock_spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf/mock_nodeconf" @@ -111,7 +110,7 @@ func TestDiffSyncer_Sync(t *testing.T) { spaceId := "spaceId" aclRootId := "aclRootId" l := logger.NewNamed(spaceId) - diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, statusservice.NewNoOpStatusService(), l) + diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), l) delState.EXPECT().AddObserver(gomock.Any()) diffSyncer.Init(delState) @@ -120,7 +119,7 @@ func TestDiffSyncer_Sync(t *testing.T) { GetResponsiblePeers(gomock.Any(), spaceId). Return([]peer.Peer{mockPeer{}}, nil) diffMock.EXPECT(). - Diff(gomock.Any(), gomock.Eq(remotediff.NewRemoteDiff(spaceId, clientMock))). + Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))). Return([]string{"new"}, []string{"changed"}, nil, nil) delState.EXPECT().FilterJoin(gomock.Any()).Return([]string{"new", "changed"}) for _, arg := range []string{"new", "changed"} { @@ -175,7 +174,7 @@ func TestDiffSyncer_Sync(t *testing.T) { GetResponsiblePeers(gomock.Any(), spaceId). Return([]peer.Peer{mockPeer{}}, nil) diffMock.EXPECT(). - Diff(gomock.Any(), gomock.Eq(remotediff.NewRemoteDiff(spaceId, clientMock))). + Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))). Return(nil, nil, nil, spacesyncproto.ErrSpaceMissing) stMock.EXPECT().ACLStorage().Return(aclStorageMock, nil) @@ -199,7 +198,7 @@ func TestDiffSyncer_Sync(t *testing.T) { GetResponsiblePeers(gomock.Any(), spaceId). Return([]peer.Peer{mockPeer{}}, nil) diffMock.EXPECT(). - Diff(gomock.Any(), gomock.Eq(remotediff.NewRemoteDiff(spaceId, clientMock))). + Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))). Return(nil, nil, nil, spacesyncproto.ErrUnexpected) require.NoError(t, diffSyncer.Sync(ctx)) diff --git a/common/commonspace/diffservice/diffservice.go b/common/commonspace/headsync/headsync.go similarity index 71% rename from common/commonspace/diffservice/diffservice.go rename to common/commonspace/headsync/headsync.go index 5e277fdb..163387a9 100644 --- a/common/commonspace/diffservice/diffservice.go +++ b/common/commonspace/headsync/headsync.go @@ -1,13 +1,12 @@ -//go:generate mockgen -destination mock_diffservice/mock_diffservice.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice DiffSyncer -package diffservice +//go:generate mockgen -destination mock_headsync/mock_headsync.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync DiffSyncer +package headsync import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/remotediff" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" @@ -22,7 +21,7 @@ type TreeHeads struct { Heads []string } -type DiffService interface { +type HeadSync interface { UpdateHeads(id string, heads []string) HandleRangeRequest(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (resp *spacesyncproto.HeadSyncResponse, err error) RemoveObjects(ids []string) @@ -33,7 +32,7 @@ type DiffService interface { Close() (err error) } -type diffService struct { +type headSync struct { spaceId string periodicSync periodicsync.PeriodicSync storage storage.SpaceStorage @@ -44,22 +43,22 @@ type diffService struct { syncPeriod int } -func NewDiffService( +func NewHeadSync( spaceId string, syncPeriod int, storage storage.SpaceStorage, confConnector nodeconf.ConfConnector, cache treegetter.TreeGetter, - statusService statusservice.StatusService, - log *zap.Logger) DiffService { + syncStatus syncstatus.SyncStatusUpdater, + log *zap.Logger) HeadSync { diff := ldiff.New(16, 16) l := log.With(zap.String("spaceId", spaceId)) factory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceClient) - syncer := newDiffSyncer(spaceId, diff, confConnector, cache, storage, factory, statusService, l) + syncer := newDiffSyncer(spaceId, diff, confConnector, cache, storage, factory, syncStatus, l) periodicSync := periodicsync.NewPeriodicSync(syncPeriod, time.Minute, syncer.Sync, l) - return &diffService{ + return &headSync{ spaceId: spaceId, storage: storage, syncer: syncer, @@ -70,25 +69,25 @@ func NewDiffService( } } -func (d *diffService) Init(objectIds []string, deletionState deletionstate.DeletionState) { +func (d *headSync) Init(objectIds []string, deletionState deletionstate.DeletionState) { d.fillDiff(objectIds) d.syncer.Init(deletionState) d.periodicSync.Run() } -func (d *diffService) HandleRangeRequest(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (resp *spacesyncproto.HeadSyncResponse, err error) { - return remotediff.HandleRangeRequest(ctx, d.diff, req) +func (d *headSync) HandleRangeRequest(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (resp *spacesyncproto.HeadSyncResponse, err error) { + return HandleRangeRequest(ctx, d.diff, req) } -func (d *diffService) UpdateHeads(id string, heads []string) { +func (d *headSync) UpdateHeads(id string, heads []string) { d.syncer.UpdateHeads(id, heads) } -func (d *diffService) AllIds() []string { +func (d *headSync) AllIds() []string { return d.diff.Ids() } -func (d *diffService) DebugAllHeads() (res []TreeHeads) { +func (d *headSync) DebugAllHeads() (res []TreeHeads) { els := d.diff.Elements() for _, el := range els { idHead := TreeHeads{ @@ -100,16 +99,16 @@ func (d *diffService) DebugAllHeads() (res []TreeHeads) { return } -func (d *diffService) RemoveObjects(ids []string) { +func (d *headSync) RemoveObjects(ids []string) { d.syncer.RemoveObjects(ids) } -func (d *diffService) Close() (err error) { +func (d *headSync) Close() (err error) { d.periodicSync.Close() return nil } -func (d *diffService) fillDiff(objectIds []string) { +func (d *headSync) fillDiff(objectIds []string) { var els = make([]ldiff.Element, 0, len(objectIds)) for _, id := range objectIds { st, err := d.storage.TreeStorage(id) diff --git a/common/commonspace/diffservice/diffservice_test.go b/common/commonspace/headsync/headsync_test.go similarity index 91% rename from common/commonspace/diffservice/diffservice_test.go rename to common/commonspace/headsync/headsync_test.go index 6cc21d90..005c18c2 100644 --- a/common/commonspace/diffservice/diffservice_test.go +++ b/common/commonspace/headsync/headsync_test.go @@ -1,9 +1,9 @@ -package diffservice +package headsync import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice/mock_diffservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync/mock_headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" mock_storage2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" @@ -23,12 +23,12 @@ func TestDiffService(t *testing.T) { storageMock := mock_storage.NewMockSpaceStorage(ctrl) treeStorageMock := mock_storage2.NewMockTreeStorage(ctrl) diffMock := mock_ldiff.NewMockDiff(ctrl) - syncer := mock_diffservice.NewMockDiffSyncer(ctrl) + syncer := mock_headsync.NewMockDiffSyncer(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl) syncPeriod := 1 initId := "initId" - service := &diffService{ + service := &headSync{ spaceId: spaceId, storage: storageMock, periodicSync: pSyncMock, diff --git a/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go b/common/commonspace/headsync/mock_headsync/mock_headsync.go similarity index 92% rename from common/commonspace/diffservice/mock_diffservice/mock_diffservice.go rename to common/commonspace/headsync/mock_headsync/mock_headsync.go index 1bca9970..f4cd3eb4 100644 --- a/common/commonspace/diffservice/mock_diffservice/mock_diffservice.go +++ b/common/commonspace/headsync/mock_headsync/mock_headsync.go @@ -1,14 +1,14 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice (interfaces: DiffSyncer) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync (interfaces: DiffSyncer) -// Package mock_diffservice is a generated GoMock package. -package mock_diffservice +// Package mock_headsync is a generated GoMock package. +package mock_headsync import ( context "context" reflect "reflect" - deletionstate "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + deletionstate "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" gomock "github.com/golang/mock/gomock" ) diff --git a/common/commonspace/remotediff/remotediff.go b/common/commonspace/headsync/remotediff.go similarity index 99% rename from common/commonspace/remotediff/remotediff.go rename to common/commonspace/headsync/remotediff.go index e11606ec..4fda2241 100644 --- a/common/commonspace/remotediff/remotediff.go +++ b/common/commonspace/headsync/remotediff.go @@ -1,4 +1,4 @@ -package remotediff +package headsync import ( "context" diff --git a/common/commonspace/remotediff/remotediff_test.go b/common/commonspace/headsync/remotediff_test.go similarity index 98% rename from common/commonspace/remotediff/remotediff_test.go rename to common/commonspace/headsync/remotediff_test.go index 11473aeb..aae8e392 100644 --- a/common/commonspace/remotediff/remotediff_test.go +++ b/common/commonspace/headsync/remotediff_test.go @@ -1,4 +1,4 @@ -package remotediff +package headsync import ( "context" diff --git a/common/commonspace/rpchandler.go b/common/commonspace/rpchandler.go index c8b1dbd4..99f506bf 100644 --- a/common/commonspace/rpchandler.go +++ b/common/commonspace/rpchandler.go @@ -15,10 +15,10 @@ type rpcHandler struct { } func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) { - return r.s.DiffService().HandleRangeRequest(ctx, req) + return r.s.HeadSync().HandleRangeRequest(ctx, req) } func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpace_StreamStream) (err error) { // TODO: if needed we can launch full sync here - return r.s.SyncService().StreamPool().AddAndReadStreamSync(stream) + return r.s.ObjectSync().StreamPool().AddAndReadStreamSync(stream) } diff --git a/common/commonspace/service.go b/common/commonspace/service.go index b9e11357..5b0f443b 100644 --- a/common/commonspace/service.go +++ b/common/commonspace/service.go @@ -5,11 +5,11 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" @@ -110,19 +110,20 @@ func (s *service) NewSpace(ctx context.Context, id string) (Space, error) { lastConfiguration := s.configurationService.GetLast() confConnector := nodeconf.NewConfConnector(lastConfiguration, s.pool) - statusService := statusservice.NewNoOpStatusService() + syncStatus := syncstatus.NewNoOpSyncStatus() // this will work only for clients, not the best solution, but... if !lastConfiguration.IsResponsible(st.Id()) { - statusService = statusservice.NewStatusService(st.Id(), lastConfiguration, st) + // TODO: move it to the client package and add possibility to inject SyncStatusProvider from the client + syncStatus = syncstatus.NewSyncStatusProvider(st.Id(), syncstatus.DefaultDeps(lastConfiguration, st)) } - diffService := diffservice.NewDiffService(id, s.config.SyncPeriod, st, confConnector, s.treeGetter, statusService, log) - syncService := syncservice.NewSyncService(id, confConnector, s.config.SyncPeriod) + headSync := headsync.NewHeadSync(id, s.config.SyncPeriod, st, confConnector, s.treeGetter, syncStatus, log) + objectSync := syncservice.NewSyncService(id, confConnector, s.config.SyncPeriod) sp := &space{ id: id, - syncService: syncService, - diffService: diffService, - statusService: statusService, + objectSync: objectSync, + headSync: headSync, + syncStatus: syncStatus, cache: s.treeGetter, account: s.account, configuration: lastConfiguration, diff --git a/common/commonspace/settingsdocument/deleteloop.go b/common/commonspace/settings/deleteloop.go similarity index 97% rename from common/commonspace/settingsdocument/deleteloop.go rename to common/commonspace/settings/deleteloop.go index f122fd83..b479020c 100644 --- a/common/commonspace/settingsdocument/deleteloop.go +++ b/common/commonspace/settings/deleteloop.go @@ -1,4 +1,4 @@ -package settingsdocument +package settings import ( "context" diff --git a/common/commonspace/settingsdocument/deleter.go b/common/commonspace/settings/deleter.go similarity index 94% rename from common/commonspace/settingsdocument/deleter.go rename to common/commonspace/settings/deleter.go index f1b5ca45..3a07fe16 100644 --- a/common/commonspace/settingsdocument/deleter.go +++ b/common/commonspace/settings/deleter.go @@ -1,8 +1,8 @@ -package settingsdocument +package settings import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "go.uber.org/zap" diff --git a/common/commonspace/settingsdocument/deleter_test.go b/common/commonspace/settings/deleter_test.go similarity index 94% rename from common/commonspace/settingsdocument/deleter_test.go rename to common/commonspace/settings/deleter_test.go index 669180d7..f2784bfc 100644 --- a/common/commonspace/settingsdocument/deleter_test.go +++ b/common/commonspace/settings/deleter_test.go @@ -1,8 +1,8 @@ -package settingsdocument +package settings import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" diff --git a/common/commonspace/settingsdocument/deletionstate/deletionstate.go b/common/commonspace/settings/deletionstate/deletionstate.go similarity index 98% rename from common/commonspace/settingsdocument/deletionstate/deletionstate.go rename to common/commonspace/settings/deletionstate/deletionstate.go index 92f60cc3..e3d30f15 100644 --- a/common/commonspace/settingsdocument/deletionstate/deletionstate.go +++ b/common/commonspace/settings/deletionstate/deletionstate.go @@ -1,4 +1,4 @@ -//go:generate mockgen -destination mock_deletionstate/mock_deletionstate.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate DeletionState +//go:generate mockgen -destination mock_deletionstate/mock_deletionstate.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate DeletionState package deletionstate import ( diff --git a/common/commonspace/settingsdocument/deletionstate/deletionstate_test.go b/common/commonspace/settings/deletionstate/deletionstate_test.go similarity index 100% rename from common/commonspace/settingsdocument/deletionstate/deletionstate_test.go rename to common/commonspace/settings/deletionstate/deletionstate_test.go diff --git a/common/commonspace/settingsdocument/deletionstate/mock_deletionstate/mock_deletionstate.go b/common/commonspace/settings/deletionstate/mock_deletionstate/mock_deletionstate.go similarity index 96% rename from common/commonspace/settingsdocument/deletionstate/mock_deletionstate/mock_deletionstate.go rename to common/commonspace/settings/deletionstate/mock_deletionstate/mock_deletionstate.go index 12d2ce56..13e4dfb1 100644 --- a/common/commonspace/settingsdocument/deletionstate/mock_deletionstate/mock_deletionstate.go +++ b/common/commonspace/settings/deletionstate/mock_deletionstate/mock_deletionstate.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate (interfaces: DeletionState) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate (interfaces: DeletionState) // Package mock_deletionstate is a generated GoMock package. package mock_deletionstate @@ -7,7 +7,7 @@ package mock_deletionstate import ( reflect "reflect" - deletionstate "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + deletionstate "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" gomock "github.com/golang/mock/gomock" ) diff --git a/common/commonspace/settingsdocument/idprovider.go b/common/commonspace/settings/idprovider.go similarity index 98% rename from common/commonspace/settingsdocument/idprovider.go rename to common/commonspace/settings/idprovider.go index fd8e1f39..1d15afb0 100644 --- a/common/commonspace/settingsdocument/idprovider.go +++ b/common/commonspace/settings/idprovider.go @@ -1,4 +1,4 @@ -package settingsdocument +package settings import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" diff --git a/common/commonspace/settingsdocument/idprovider_test.go b/common/commonspace/settings/idprovider_test.go similarity index 99% rename from common/commonspace/settingsdocument/idprovider_test.go rename to common/commonspace/settings/idprovider_test.go index 435fe210..5f412ec0 100644 --- a/common/commonspace/settingsdocument/idprovider_test.go +++ b/common/commonspace/settings/idprovider_test.go @@ -1,4 +1,4 @@ -package settingsdocument +package settings import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" diff --git a/common/commonspace/settings/mock_settings/mock_settings.go b/common/commonspace/settings/mock_settings/mock_settings.go new file mode 100644 index 00000000..c9814bfd --- /dev/null +++ b/common/commonspace/settings/mock_settings/mock_settings.go @@ -0,0 +1,86 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings (interfaces: DeletedIdsProvider,Deleter) + +// Package mock_settings is a generated GoMock package. +package mock_settings + +import ( + reflect "reflect" + + tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + gomock "github.com/golang/mock/gomock" +) + +// MockDeletedIdsProvider is a mock of DeletedIdsProvider interface. +type MockDeletedIdsProvider struct { + ctrl *gomock.Controller + recorder *MockDeletedIdsProviderMockRecorder +} + +// MockDeletedIdsProviderMockRecorder is the mock recorder for MockDeletedIdsProvider. +type MockDeletedIdsProviderMockRecorder struct { + mock *MockDeletedIdsProvider +} + +// NewMockDeletedIdsProvider creates a new mock instance. +func NewMockDeletedIdsProvider(ctrl *gomock.Controller) *MockDeletedIdsProvider { + mock := &MockDeletedIdsProvider{ctrl: ctrl} + mock.recorder = &MockDeletedIdsProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockDeletedIdsProvider) EXPECT() *MockDeletedIdsProviderMockRecorder { + return m.recorder +} + +// ProvideIds mocks base method. +func (m *MockDeletedIdsProvider) ProvideIds(arg0 tree.ObjectTree, arg1 string) ([]string, string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ProvideIds", arg0, arg1) + ret0, _ := ret[0].([]string) + ret1, _ := ret[1].(string) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 +} + +// ProvideIds indicates an expected call of ProvideIds. +func (mr *MockDeletedIdsProviderMockRecorder) ProvideIds(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProvideIds", reflect.TypeOf((*MockDeletedIdsProvider)(nil).ProvideIds), arg0, arg1) +} + +// MockDeleter is a mock of Deleter interface. +type MockDeleter struct { + ctrl *gomock.Controller + recorder *MockDeleterMockRecorder +} + +// MockDeleterMockRecorder is the mock recorder for MockDeleter. +type MockDeleterMockRecorder struct { + mock *MockDeleter +} + +// NewMockDeleter creates a new mock instance. +func NewMockDeleter(ctrl *gomock.Controller) *MockDeleter { + mock := &MockDeleter{ctrl: ctrl} + mock.recorder = &MockDeleterMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockDeleter) EXPECT() *MockDeleterMockRecorder { + return m.recorder +} + +// Delete mocks base method. +func (m *MockDeleter) Delete() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Delete") +} + +// Delete indicates an expected call of Delete. +func (mr *MockDeleterMockRecorder) Delete() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDeleter)(nil).Delete)) +} diff --git a/common/commonspace/settingsdocument/mock_settingsdocument/mock_settingsdocument.go b/common/commonspace/settings/mock_settings/mock_settingsdocument.go similarity index 93% rename from common/commonspace/settingsdocument/mock_settingsdocument/mock_settingsdocument.go rename to common/commonspace/settings/mock_settings/mock_settingsdocument.go index 7d950895..c9814bfd 100644 --- a/common/commonspace/settingsdocument/mock_settingsdocument/mock_settingsdocument.go +++ b/common/commonspace/settings/mock_settings/mock_settingsdocument.go @@ -1,8 +1,8 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument (interfaces: DeletedIdsProvider,Deleter) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings (interfaces: DeletedIdsProvider,Deleter) -// Package mock_settingsdocument is a generated GoMock package. -package mock_settingsdocument +// Package mock_settings is a generated GoMock package. +package mock_settings import ( reflect "reflect" diff --git a/common/commonspace/settingsdocument/settingsdocument.go b/common/commonspace/settings/settings.go similarity index 77% rename from common/commonspace/settingsdocument/settingsdocument.go rename to common/commonspace/settings/settings.go index f8f3fda6..33ce129d 100644 --- a/common/commonspace/settingsdocument/settingsdocument.go +++ b/common/commonspace/settings/settings.go @@ -1,12 +1,12 @@ -//go:generate mockgen -destination mock_settingsdocument/mock_settingsdocument.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument DeletedIdsProvider,Deleter -package settingsdocument +//go:generate mockgen -destination mock_settings/mock_settings.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings DeletedIdsProvider,Deleter +package settings import ( "context" "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" @@ -15,18 +15,18 @@ import ( "go.uber.org/zap" ) -var log = logger.NewNamed("commonspace.settingsdocument") +var log = logger.NewNamed("commonspace.settings") -type SettingsDocument interface { +type SettingsObject interface { synctree.SyncTree Init(ctx context.Context) (err error) DeleteObject(id string) (err error) } var ( - ErrDeleteSelf = errors.New("cannot delete seld") - ErrAlreadyDeleted = errors.New("the document is already deleted") - ErrDocDoesNotExist = errors.New("the document does not exist") + ErrDeleteSelf = errors.New("cannot delete self") + ErrAlreadyDeleted = errors.New("the object is already deleted") + ErrObjDoesNotExist = errors.New("the object does not exist") ) type BuildTreeFunc func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t synctree.SyncTree, err error) @@ -42,7 +42,7 @@ type Deps struct { del Deleter } -type settingsDocument struct { +type settingsObject struct { synctree.SyncTree account account.Service spaceId string @@ -56,7 +56,7 @@ type settingsDocument struct { lastChangeId string } -func NewSettingsDocument(deps Deps, spaceId string) (doc SettingsDocument) { +func NewSettingsObject(deps Deps, spaceId string) (obj SettingsObject) { var deleter Deleter if deps.del == nil { deleter = newDeleter(deps.Store, deps.DeletionState, deps.TreeGetter) @@ -71,7 +71,7 @@ func NewSettingsDocument(deps Deps, spaceId string) (doc SettingsDocument) { loop.notify() }) - s := &settingsDocument{ + s := &settingsObject{ loop: loop, spaceId: spaceId, account: deps.Account, @@ -88,11 +88,11 @@ func NewSettingsDocument(deps Deps, spaceId string) (doc SettingsDocument) { s.prov = deps.prov } - doc = s + obj = s return } -func (s *settingsDocument) updateIds(tr tree.ObjectTree, lastChangeId string) { +func (s *settingsObject) updateIds(tr tree.ObjectTree, lastChangeId string) { s.lastChangeId = lastChangeId ids, lastId, err := s.prov.ProvideIds(tr, s.lastChangeId) if err != nil { @@ -106,17 +106,17 @@ func (s *settingsDocument) updateIds(tr tree.ObjectTree, lastChangeId string) { } // Update is called as part of UpdateListener interface -func (s *settingsDocument) Update(tr tree.ObjectTree) { +func (s *settingsObject) Update(tr tree.ObjectTree) { s.updateIds(tr, s.lastChangeId) } // Rebuild is called as part of UpdateListener interface (including when the object is built for the first time, e.g. on Init call) -func (s *settingsDocument) Rebuild(tr tree.ObjectTree) { +func (s *settingsObject) Rebuild(tr tree.ObjectTree) { // at initial build "s" may not contain the object tree, so it is safer to provide it from the function parameter s.updateIds(tr, "") } -func (s *settingsDocument) Init(ctx context.Context) (err error) { +func (s *settingsObject) Init(ctx context.Context) (err error) { settingsId := s.store.SpaceSettingsId() log.Debug("space settings id", zap.String("id", settingsId)) s.SyncTree, err = s.buildFunc(ctx, settingsId, s) @@ -128,12 +128,12 @@ func (s *settingsDocument) Init(ctx context.Context) (err error) { return } -func (s *settingsDocument) Close() error { +func (s *settingsObject) Close() error { s.loop.Close() return s.SyncTree.Close() } -func (s *settingsDocument) DeleteObject(id string) (err error) { +func (s *settingsObject) DeleteObject(id string) (err error) { s.Lock() defer s.Unlock() if s.ID() == id { @@ -146,7 +146,7 @@ func (s *settingsDocument) DeleteObject(id string) (err error) { } _, err = s.store.TreeStorage(id) if err != nil { - err = ErrDocDoesNotExist + err = ErrObjDoesNotExist return } diff --git a/common/commonspace/settingsdocument/settingsdocument_test.go b/common/commonspace/settings/settings_test.go similarity index 88% rename from common/commonspace/settingsdocument/settingsdocument_test.go rename to common/commonspace/settings/settings_test.go index 8b69fe7a..ef9d4ac1 100644 --- a/common/commonspace/settingsdocument/settingsdocument_test.go +++ b/common/commonspace/settings/settings_test.go @@ -1,10 +1,10 @@ -package settingsdocument +package settings import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account/mock_account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/mock_settingsdocument" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/mock_settings" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" @@ -42,12 +42,12 @@ func (t *testSyncTreeMock) Unlock() { type settingsFixture struct { spaceId string docId string - doc *settingsDocument + doc *settingsObject ctrl *gomock.Controller treeGetter *mock_treegetter.MockTreeGetter spaceStorage *mock_storage.MockSpaceStorage - provider *mock_settingsdocument.MockDeletedIdsProvider - deleter *mock_settingsdocument.MockDeleter + provider *mock_settings.MockDeletedIdsProvider + deleter *mock_settings.MockDeleter syncTree *mock_synctree.MockSyncTree delState *mock_deletionstate.MockDeletionState account *mock_account.MockService @@ -55,21 +55,21 @@ type settingsFixture struct { func newSettingsFixture(t *testing.T) *settingsFixture { spaceId := "spaceId" - docId := "documentId" + objectId := "objectId" ctrl := gomock.NewController(t) acc := mock_account.NewMockService(ctrl) treeGetter := mock_treegetter.NewMockTreeGetter(ctrl) st := mock_storage.NewMockSpaceStorage(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl) - prov := mock_settingsdocument.NewMockDeletedIdsProvider(ctrl) + prov := mock_settings.NewMockDeletedIdsProvider(ctrl) syncTree := mock_synctree.NewMockSyncTree(ctrl) - del := mock_settingsdocument.NewMockDeleter(ctrl) + del := mock_settings.NewMockDeleter(ctrl) delState.EXPECT().AddObserver(gomock.Any()) buildFunc := BuildTreeFunc(func(ctx context.Context, id string, listener updatelistener.UpdateListener) (synctree.SyncTree, error) { - require.Equal(t, docId, id) + require.Equal(t, objectId, id) return newTestObjMock(syncTree), nil }) @@ -82,10 +82,10 @@ func newSettingsFixture(t *testing.T) *settingsFixture { prov: prov, del: del, } - doc := NewSettingsDocument(deps, spaceId).(*settingsDocument) + doc := NewSettingsObject(deps, spaceId).(*settingsObject) return &settingsFixture{ spaceId: spaceId, - docId: docId, + docId: objectId, doc: doc, ctrl: ctrl, treeGetter: treeGetter, @@ -102,7 +102,7 @@ func (fx *settingsFixture) stop() { fx.ctrl.Finish() } -func TestSettingsDocument_Init(t *testing.T) { +func TestSettingsObject_Init(t *testing.T) { fx := newSettingsFixture(t) defer fx.stop() @@ -116,7 +116,7 @@ func TestSettingsDocument_Init(t *testing.T) { require.NoError(t, err) } -func TestSettingsDocument_DeleteObject(t *testing.T) { +func TestSettingsObject_DeleteObject(t *testing.T) { fx := newSettingsFixture(t) defer fx.stop() @@ -164,7 +164,7 @@ func TestSettingsDocument_DeleteObject(t *testing.T) { require.NoError(t, err) } -func TestSettingsDocument_Rebuild(t *testing.T) { +func TestSettingsObject_Rebuild(t *testing.T) { fx := newSettingsFixture(t) defer fx.stop() diff --git a/common/commonspace/space.go b/common/commonspace/space.go index 512eb054..09e11ebb 100644 --- a/common/commonspace/space.go +++ b/common/commonspace/space.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" @@ -71,7 +71,7 @@ type Space interface { Init(ctx context.Context) error StoredIds() []string - DebugAllHeads() []diffservice.TreeHeads + DebugAllHeads() []headsync.TreeHeads Description() (SpaceDescription, error) SpaceSyncRpc() RpcHandler @@ -81,7 +81,7 @@ type Space interface { BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (tree.ObjectTree, error) DeleteTree(ctx context.Context, id string) (err error) - StatusService() statusservice.StatusService + StatusService() syncstatus.SyncStatusUpdater Close() error } @@ -93,22 +93,22 @@ type space struct { rpc *rpcHandler - syncService syncservice.SyncService - diffService diffservice.DiffService - statusService statusservice.StatusService - storage storage.SpaceStorage - cache treegetter.TreeGetter - account account.Service - aclList *syncacl.SyncACL - configuration nodeconf.Configuration - settingsDocument settingsdocument.SettingsDocument + objectSync syncservice.SyncService + headSync headsync.HeadSync + syncStatus syncstatus.SyncStatusUpdater + storage storage.SpaceStorage + cache treegetter.TreeGetter + account account.Service + aclList *syncacl.SyncACL + configuration nodeconf.Configuration + settingsObject settings.SettingsObject isClosed atomic.Bool treesUsed atomic.Int32 } func (s *space) LastUsage() time.Time { - return s.syncService.LastUsage() + return s.objectSync.LastUsage() } func (s *space) Locked() bool { @@ -164,10 +164,10 @@ func (s *space) Init(ctx context.Context) (err error) { if err != nil { return } - s.aclList = syncacl.NewSyncACL(aclList, s.syncService.StreamPool()) + s.aclList = syncacl.NewSyncACL(aclList, s.objectSync.StreamPool()) deletionState := deletionstate.NewDeletionState(s.storage) - deps := settingsdocument.Deps{ + deps := settings.Deps{ BuildFunc: func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t synctree.SyncTree, err error) { res, err := s.BuildTree(ctx, id, listener) if err != nil { @@ -181,16 +181,16 @@ func (s *space) Init(ctx context.Context) (err error) { Store: s.storage, DeletionState: deletionState, } - s.settingsDocument = settingsdocument.NewSettingsDocument(deps, s.id) + s.settingsObject = settings.NewSettingsObject(deps, s.id) - objectGetter := newCommonSpaceGetter(s.id, s.aclList, s.cache, s.settingsDocument) - s.syncService.Init(objectGetter) - s.diffService.Init(initialIds, deletionState) - err = s.settingsDocument.Init(ctx) + objectGetter := newCommonSpaceGetter(s.id, s.aclList, s.cache, s.settingsObject) + s.objectSync.Init(objectGetter) + s.headSync.Init(initialIds, deletionState) + err = s.settingsObject.Init(ctx) if err != nil { return } - s.statusService.Run() + s.syncStatus.Run() return nil } @@ -199,24 +199,24 @@ func (s *space) SpaceSyncRpc() RpcHandler { return s.rpc } -func (s *space) SyncService() syncservice.SyncService { - return s.syncService +func (s *space) ObjectSync() syncservice.SyncService { + return s.objectSync } -func (s *space) DiffService() diffservice.DiffService { - return s.diffService +func (s *space) HeadSync() headsync.HeadSync { + return s.headSync } -func (s *space) StatusService() statusservice.StatusService { - return s.statusService +func (s *space) StatusService() syncstatus.SyncStatusUpdater { + return s.syncStatus } func (s *space) StoredIds() []string { - return s.diffService.AllIds() + return s.headSync.AllIds() } -func (s *space) DebugAllHeads() []diffservice.TreeHeads { - return s.diffService.DebugAllHeads() +func (s *space) DebugAllHeads() []headsync.TreeHeads { + return s.headSync.DebugAllHeads() } func (s *space) DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePayload) (id string, err error) { @@ -227,12 +227,12 @@ func (s *space) DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePay deps := synctree.CreateDeps{ SpaceId: s.id, Payload: payload, - SyncService: s.syncService, + SyncService: s.objectSync, Configuration: s.configuration, AclList: s.aclList, SpaceStorage: s.storage, - StatusService: s.statusService, - HeadNotifiable: s.diffService, + SyncStatus: s.syncStatus, + HeadNotifiable: s.headSync, } return synctree.DeriveSyncTree(ctx, deps) } @@ -245,12 +245,12 @@ func (s *space) CreateTree(ctx context.Context, payload tree.ObjectTreeCreatePay deps := synctree.CreateDeps{ SpaceId: s.id, Payload: payload, - SyncService: s.syncService, + SyncService: s.objectSync, Configuration: s.configuration, AclList: s.aclList, SpaceStorage: s.storage, - StatusService: s.statusService, - HeadNotifiable: s.diffService, + SyncStatus: s.syncStatus, + HeadNotifiable: s.headSync, } return synctree.CreateSyncTree(ctx, deps) } @@ -262,20 +262,20 @@ func (s *space) BuildTree(ctx context.Context, id string, listener updatelistene } deps := synctree.BuildDeps{ SpaceId: s.id, - SyncService: s.syncService, + SyncService: s.objectSync, Configuration: s.configuration, - HeadNotifiable: s.diffService, + HeadNotifiable: s.headSync, Listener: listener, AclList: s.aclList, SpaceStorage: s.storage, TreeUsage: &s.treesUsed, - StatusService: s.statusService, + SyncStatus: s.syncStatus, } return synctree.BuildSyncTreeOrGetRemote(ctx, id, deps) } func (s *space) DeleteTree(ctx context.Context, id string) (err error) { - return s.settingsDocument.DeleteObject(id) + return s.settingsObject.DeleteObject(id) } func (s *space) Close() error { @@ -285,13 +285,13 @@ func (s *space) Close() error { log.With(zap.String("id", s.id)).Debug("space closed") }() var mError errs.Group - if err := s.diffService.Close(); err != nil { + if err := s.headSync.Close(); err != nil { mError.Add(err) } - if err := s.syncService.Close(); err != nil { + if err := s.objectSync.Close(); err != nil { mError.Add(err) } - if err := s.settingsDocument.Close(); err != nil { + if err := s.settingsObject.Close(); err != nil { mError.Add(err) } if err := s.aclList.Close(); err != nil { @@ -300,7 +300,7 @@ func (s *space) Close() error { if err := s.storage.Close(); err != nil { mError.Add(err) } - if err := s.statusService.Close(); err != nil { + if err := s.syncStatus.Close(); err != nil { mError.Add(err) } diff --git a/common/commonspace/statusservice/noop.go b/common/commonspace/statusservice/noop.go deleted file mode 100644 index 80455d9f..00000000 --- a/common/commonspace/statusservice/noop.go +++ /dev/null @@ -1,40 +0,0 @@ -package statusservice - -type noOpStatusService struct{} - -func NewNoOpStatusService() StatusService { - return &noOpStatusService{} -} - -func (n *noOpStatusService) HeadsChange(treeId string, heads []string) { -} - -func (n *noOpStatusService) HeadsReceive(senderId, treeId string, heads []string) { -} - -func (n *noOpStatusService) Watch(treeId string) (err error) { - return -} - -func (n *noOpStatusService) Unwatch(treeId string) { -} - -func (n *noOpStatusService) SetNodesOnline(senderId string, online bool) { -} - -func (n *noOpStatusService) StateCounter() uint64 { - return 0 -} - -func (n *noOpStatusService) RemoveAllExcept(senderId string, differentRemoteIds []string, stateCounter uint64) { -} - -func (n *noOpStatusService) SetUpdateReceiver(updater UpdateReceiver) { -} - -func (n *noOpStatusService) Run() { -} - -func (n *noOpStatusService) Close() error { - return nil -} diff --git a/common/commonspace/syncstatus/noop.go b/common/commonspace/syncstatus/noop.go new file mode 100644 index 00000000..ac978e54 --- /dev/null +++ b/common/commonspace/syncstatus/noop.go @@ -0,0 +1,30 @@ +package syncstatus + +type noOpSyncStatus struct{} + +func NewNoOpSyncStatus() SyncStatusUpdater { + return &noOpSyncStatus{} +} + +func (n *noOpSyncStatus) HeadsChange(treeId string, heads []string) { +} + +func (n *noOpSyncStatus) HeadsReceive(senderId, treeId string, heads []string) { +} + +func (n *noOpSyncStatus) SetNodesOnline(senderId string, online bool) { +} + +func (n *noOpSyncStatus) StateCounter() uint64 { + return 0 +} + +func (n *noOpSyncStatus) RemoveAllExcept(senderId string, differentRemoteIds []string, stateCounter uint64) { +} + +func (n *noOpSyncStatus) Run() { +} + +func (n *noOpSyncStatus) Close() error { + return nil +} diff --git a/common/commonspace/statusservice/statusservice.go b/common/commonspace/syncstatus/syncstatus.go similarity index 69% rename from common/commonspace/statusservice/statusservice.go rename to common/commonspace/syncstatus/syncstatus.go index a43bec29..16f41aad 100644 --- a/common/commonspace/statusservice/statusservice.go +++ b/common/commonspace/syncstatus/syncstatus.go @@ -1,4 +1,4 @@ -package statusservice +package syncstatus import ( "context" @@ -15,31 +15,40 @@ import ( ) const ( - statusServiceUpdateInterval = 5 - statusServiceTimeout = time.Second + syncUpdateInterval = 5 + syncTimeout = time.Second ) -var log = logger.NewNamed("commonspace.statusservice") +var log = logger.NewNamed("commonspace.syncstatus") type UpdateReceiver interface { UpdateTree(ctx context.Context, treeId string, status SyncStatus) (err error) UpdateNodeConnection(online bool) } -type StatusService interface { +type SyncStatusUpdater interface { HeadsChange(treeId string, heads []string) HeadsReceive(senderId, treeId string, heads []string) - Watch(treeId string) (err error) - Unwatch(treeId string) + SetNodesOnline(senderId string, online bool) StateCounter() uint64 RemoveAllExcept(senderId string, differentRemoteIds []string, stateCounter uint64) - SetUpdateReceiver(updater UpdateReceiver) Run() Close() error } +type SyncStatusWatcher interface { + Watch(treeId string) (err error) + Unwatch(treeId string) + SetUpdateReceiver(updater UpdateReceiver) +} + +type SyncStatusProvider interface { + SyncStatusUpdater + SyncStatusWatcher +} + type SyncStatus int const ( @@ -60,7 +69,7 @@ type treeStatus struct { heads []string } -type statusService struct { +type syncStatusProvider struct { sync.Mutex configuration nodeconf.Configuration periodicSync periodicsync.PeriodicSync @@ -74,36 +83,57 @@ type statusService struct { nodesOnline bool treeStatusBuf []treeStatus + + updateIntervalSecs int + updateTimeout time.Duration } -func NewStatusService(spaceId string, configuration nodeconf.Configuration, store storage.SpaceStorage) StatusService { - return &statusService{ - spaceId: spaceId, - treeHeads: map[string]treeHeadsEntry{}, - watchers: map[string]struct{}{}, - configuration: configuration, - storage: store, - stateCounter: 0, +type SyncStatusDeps struct { + UpdateIntervalSecs int + UpdateTimeout time.Duration + Configuration nodeconf.Configuration + Storage storage.SpaceStorage +} + +func DefaultDeps(configuration nodeconf.Configuration, store storage.SpaceStorage) SyncStatusDeps { + return SyncStatusDeps{ + UpdateIntervalSecs: syncUpdateInterval, + UpdateTimeout: syncTimeout, + Configuration: configuration, + Storage: store, } } -func (s *statusService) SetUpdateReceiver(updater UpdateReceiver) { +func NewSyncStatusProvider(spaceId string, deps SyncStatusDeps) SyncStatusProvider { + return &syncStatusProvider{ + spaceId: spaceId, + treeHeads: map[string]treeHeadsEntry{}, + watchers: map[string]struct{}{}, + updateIntervalSecs: deps.UpdateIntervalSecs, + updateTimeout: deps.UpdateTimeout, + configuration: deps.Configuration, + storage: deps.Storage, + stateCounter: 0, + } +} + +func (s *syncStatusProvider) SetUpdateReceiver(updater UpdateReceiver) { s.Lock() defer s.Unlock() s.updateReceiver = updater } -func (s *statusService) Run() { +func (s *syncStatusProvider) Run() { s.periodicSync = periodicsync.NewPeriodicSync( - statusServiceUpdateInterval, - statusServiceTimeout, + s.updateIntervalSecs, + s.updateTimeout, s.update, log) s.periodicSync.Run() } -func (s *statusService) HeadsChange(treeId string, heads []string) { +func (s *syncStatusProvider) HeadsChange(treeId string, heads []string) { s.Lock() defer s.Unlock() @@ -118,7 +148,7 @@ func (s *statusService) HeadsChange(treeId string, heads []string) { s.stateCounter++ } -func (s *statusService) SetNodesOnline(senderId string, online bool) { +func (s *syncStatusProvider) SetNodesOnline(senderId string, online bool) { if !s.isSenderResponsible(senderId) { return } @@ -129,7 +159,7 @@ func (s *statusService) SetNodesOnline(senderId string, online bool) { s.nodesOnline = online } -func (s *statusService) update(ctx context.Context) (err error) { +func (s *syncStatusProvider) update(ctx context.Context) (err error) { s.treeStatusBuf = s.treeStatusBuf[:0] s.Lock() @@ -158,7 +188,7 @@ func (s *statusService) update(ctx context.Context) (err error) { return } -func (s *statusService) HeadsReceive(senderId, treeId string, heads []string) { +func (s *syncStatusProvider) HeadsReceive(senderId, treeId string, heads []string) { s.Lock() defer s.Unlock() @@ -187,7 +217,7 @@ func (s *statusService) HeadsReceive(senderId, treeId string, heads []string) { s.treeHeads[treeId] = curTreeHeads } -func (s *statusService) Watch(treeId string) (err error) { +func (s *syncStatusProvider) Watch(treeId string) (err error) { s.Lock() defer s.Unlock() _, ok := s.treeHeads[treeId] @@ -217,7 +247,7 @@ func (s *statusService) Watch(treeId string) (err error) { return } -func (s *statusService) Unwatch(treeId string) { +func (s *syncStatusProvider) Unwatch(treeId string) { s.Lock() defer s.Unlock() @@ -226,19 +256,19 @@ func (s *statusService) Unwatch(treeId string) { } } -func (s *statusService) Close() (err error) { +func (s *syncStatusProvider) Close() (err error) { s.periodicSync.Close() return } -func (s *statusService) StateCounter() uint64 { +func (s *syncStatusProvider) StateCounter() uint64 { s.Lock() defer s.Unlock() return s.stateCounter } -func (s *statusService) RemoveAllExcept(senderId string, differentRemoteIds []string, stateCounter uint64) { +func (s *syncStatusProvider) RemoveAllExcept(senderId string, differentRemoteIds []string, stateCounter uint64) { // if sender is not a responsible node, then this should have no effect if !s.isSenderResponsible(senderId) { return @@ -261,6 +291,6 @@ func (s *statusService) RemoveAllExcept(senderId string, differentRemoteIds []st } } -func (s *statusService) isSenderResponsible(senderId string) bool { +func (s *syncStatusProvider) isSenderResponsible(senderId string) bool { return slices.Contains(s.configuration.NodeIds(s.spaceId), senderId) } diff --git a/common/commonspace/synctree/synctree.go b/common/commonspace/synctree/synctree.go index 2dfe90d4..86b140ef 100644 --- a/common/commonspace/synctree/synctree.go +++ b/common/commonspace/synctree/synctree.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" @@ -40,13 +40,13 @@ type SyncTree interface { type syncTree struct { tree.ObjectTree synchandler.SyncHandler - syncClient SyncClient - statusService statusservice.StatusService - notifiable HeadNotifiable - listener updatelistener.UpdateListener - treeUsage *atomic.Int32 - isClosed bool - isDeleted bool + syncClient SyncClient + syncStatus syncstatus.SyncStatusUpdater + notifiable HeadNotifiable + listener updatelistener.UpdateListener + treeUsage *atomic.Int32 + isClosed bool + isDeleted bool } var log = logger.NewNamed("commonspace.synctree").Sugar() @@ -63,7 +63,7 @@ type CreateDeps struct { SyncService syncservice.SyncService AclList list.ACLList SpaceStorage spacestorage.SpaceStorage - StatusService statusservice.StatusService + SyncStatus syncstatus.SyncStatusUpdater HeadNotifiable HeadNotifiable } @@ -77,7 +77,7 @@ type BuildDeps struct { SpaceStorage spacestorage.SpaceStorage TreeStorage storage.TreeStorage TreeUsage *atomic.Int32 - StatusService statusservice.StatusService + SyncStatus syncstatus.SyncStatusUpdater } func newWrappedSyncClient( @@ -106,7 +106,7 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.HeadNotifiable.UpdateHeads(id, heads) headUpdate := syncClient.CreateHeadUpdate(objTree, nil) - deps.StatusService.HeadsChange(id, heads) + deps.SyncStatus.HeadsChange(id, heads) syncClient.BroadcastAsync(headUpdate) return } @@ -127,7 +127,7 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.HeadNotifiable.UpdateHeads(id, heads) headUpdate := syncClient.CreateHeadUpdate(objTree, nil) - deps.StatusService.HeadsChange(id, heads) + deps.SyncStatus.HeadsChange(id, heads) syncClient.BroadcastAsync(headUpdate) return } @@ -219,14 +219,14 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t Sy deps.SyncService, deps.Configuration) syncTree := &syncTree{ - ObjectTree: objTree, - syncClient: syncClient, - notifiable: deps.HeadNotifiable, - treeUsage: deps.TreeUsage, - listener: deps.Listener, - statusService: deps.StatusService, + ObjectTree: objTree, + syncClient: syncClient, + notifiable: deps.HeadNotifiable, + treeUsage: deps.TreeUsage, + listener: deps.Listener, + syncStatus: deps.SyncStatus, } - syncHandler := newSyncTreeHandler(syncTree, syncClient, deps.StatusService) + syncHandler := newSyncTreeHandler(syncTree, syncClient, deps.SyncStatus) syncTree.SyncHandler = syncHandler t = syncTree syncTree.Lock() @@ -266,7 +266,7 @@ func (s *syncTree) AddContent(ctx context.Context, content tree.SignableChangeCo if s.notifiable != nil { s.notifiable.UpdateHeads(s.ID(), res.Heads) } - s.statusService.HeadsChange(s.ID(), res.Heads) + s.syncStatus.HeadsChange(s.ID(), res.Heads) headUpdate := s.syncClient.CreateHeadUpdate(s, res.Added) err = s.syncClient.BroadcastAsync(headUpdate) return diff --git a/common/commonspace/synctree/synctree_test.go b/common/commonspace/synctree/synctree_test.go index e005c9e7..e19eaa1e 100644 --- a/common/commonspace/synctree/synctree_test.go +++ b/common/commonspace/synctree/synctree_test.go @@ -2,9 +2,9 @@ package synctree import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener/mock_updatelistener" @@ -72,7 +72,7 @@ func Test_DeriveSyncTree(t *testing.T) { SpaceId: spaceId, Payload: expectedPayload, SpaceStorage: spaceStorageMock, - StatusService: statusservice.NewNoOpStatusService(), + SyncStatus: syncstatus.NewNoOpSyncStatus(), HeadNotifiable: headNotifiableMock, } objTreeMock.EXPECT().ID().Return("id") @@ -111,7 +111,7 @@ func Test_CreateSyncTree(t *testing.T) { SpaceId: spaceId, Payload: expectedPayload, SpaceStorage: spaceStorageMock, - StatusService: statusservice.NewNoOpStatusService(), + SyncStatus: syncstatus.NewNoOpSyncStatus(), HeadNotifiable: headNotifiableMock, } @@ -128,12 +128,12 @@ func Test_BuildSyncTree(t *testing.T) { syncClientMock := mock_synctree.NewMockSyncClient(ctrl) objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) tr := &syncTree{ - ObjectTree: objTreeMock, - SyncHandler: nil, - syncClient: syncClientMock, - listener: updateListenerMock, - isClosed: false, - statusService: statusservice.NewNoOpStatusService(), + ObjectTree: objTreeMock, + SyncHandler: nil, + syncClient: syncClientMock, + listener: updateListenerMock, + isClosed: false, + syncStatus: syncstatus.NewNoOpSyncStatus(), } headUpdate := &treechangeproto.TreeSyncMessage{} diff --git a/common/commonspace/synctree/synctreehandler.go b/common/commonspace/synctree/synctreehandler.go index c1d37298..e6471257 100644 --- a/common/commonspace/synctree/synctreehandler.go +++ b/common/commonspace/synctree/synctreehandler.go @@ -3,8 +3,8 @@ package synctree import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" @@ -14,33 +14,32 @@ import ( ) type syncTreeHandler struct { - objTree tree.ObjectTree - syncClient SyncClient - statusService statusservice.StatusService - handlerLock sync.Mutex - queue ReceiveQueue + objTree tree.ObjectTree + syncClient SyncClient + syncStatus syncstatus.SyncStatusUpdater + handlerLock sync.Mutex + queue ReceiveQueue } const maxQueueSize = 5 -func newSyncTreeHandler(objTree tree.ObjectTree, syncClient SyncClient, statusService statusservice.StatusService) synchandler.SyncHandler { +func newSyncTreeHandler(objTree tree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.SyncStatusUpdater) synchandler.SyncHandler { return &syncTreeHandler{ - objTree: objTree, - syncClient: syncClient, - statusService: statusService, - queue: newReceiveQueue(maxQueueSize), + objTree: objTree, + syncClient: syncClient, + syncStatus: syncStatus, + queue: newReceiveQueue(maxQueueSize), } } func (s *syncTreeHandler) HandleMessage(ctx context.Context, senderId string, msg *spacesyncproto.ObjectSyncMessage) (err error) { - // TODO: when implementing sync status check msg heads before sending into queue unmarshalled := &treechangeproto.TreeSyncMessage{} err = proto.Unmarshal(msg.Payload, unmarshalled) if err != nil { return } - s.statusService.HeadsReceive(senderId, msg.ObjectId, treechangeproto.GetHeads(unmarshalled)) + s.syncStatus.HeadsReceive(senderId, msg.ObjectId, treechangeproto.GetHeads(unmarshalled)) queueFull := s.queue.AddMessage(senderId, unmarshalled, msg.ReplyId) if queueFull { diff --git a/common/commonspace/synctree/synctreehandler_test.go b/common/commonspace/synctree/synctreehandler_test.go index c1a71982..8223f6db 100644 --- a/common/commonspace/synctree/synctreehandler_test.go +++ b/common/commonspace/synctree/synctreehandler_test.go @@ -3,7 +3,7 @@ package synctree import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree/mock_objecttree" @@ -50,10 +50,10 @@ func newSyncHandlerFixture(t *testing.T) *syncHandlerFixture { receiveQueueMock := mock_synctree.NewMockReceiveQueue(ctrl) syncHandler := &syncTreeHandler{ - objTree: objectTreeMock, - syncClient: syncClientMock, - queue: receiveQueueMock, - statusService: statusservice.NewNoOpStatusService(), + objTree: objectTreeMock, + syncClient: syncClientMock, + queue: receiveQueueMock, + syncStatus: syncstatus.NewNoOpSyncStatus(), } return &syncHandlerFixture{ ctrl: ctrl, From 50dcc735c7aa49788097568a3c77d9266f2b1bcd Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Sun, 25 Dec 2022 20:27:37 +0100 Subject: [PATCH 02/17] Moving around files and refactoring of common --- client/account/service.go | 10 +- client/clientspace/clientcache/treecache.go | 18 +- client/clientspace/service.go | 15 +- client/cmd/client.go | 8 +- .../clientdebugrpc/clientdebugrpc.go} | 28 +- .../clientdebugrpcproto}/api.pb.go | 2 +- .../clientdebugrpcproto}/api_drpc.pb.go | 2 +- .../clientdebugrpcproto}/protos/api.proto | 0 .../clientdebugrpc}/rpchandler.go | 78 ++--- client/document/service.go | 9 +- .../textchangeproto/protos}/test.proto | 4 +- .../document/textchangeproto}/test.pb.go | 2 +- client/document/textdocument/textdocument.go | 38 +-- client/filestorage/rpcstore/clientmgr.go | 2 +- client/storage/keys.go | 24 +- client/storage/liststorage.go | 10 +- client/storage/liststorage_test.go | 8 +- client/storage/spacestorage.go | 11 +- client/storage/spacestorage_test.go | 6 +- client/storage/storageservice.go | 10 +- client/storage/treestorage.go | 22 +- client/storage/treestorage_test.go | 12 +- .../accountservice.go} | 8 +- .../mock_accountservice.go} | 12 +- common/{pkg => app}/ldiff/diff.go | 2 +- common/{pkg => app}/ldiff/diff_test.go | 0 .../ldiff/mock_ldiff/mock_ldiff.go | 4 +- common/{pkg => app}/ocache/metrics.go | 0 common/{pkg => app}/ocache/ocache.go | 6 +- common/{pkg => app}/ocache/ocache_test.go | 0 common/commonspace/commongetter.go | 14 +- common/commonspace/commonstorage.go | 10 +- common/commonspace/headsync/diffsyncer.go | 12 +- .../commonspace/headsync/diffsyncer_test.go | 19 +- common/commonspace/headsync/headsync.go | 10 +- common/commonspace/headsync/headsync_test.go | 12 +- common/commonspace/headsync/remotediff.go | 2 +- .../commonspace/headsync/remotediff_test.go | 2 +- .../object/accountdata}/accountdata.go | 2 +- .../acl/aclrecordproto/aclreadkeyderive.go | 0 .../acl/aclrecordproto/aclrecord.pb.go | 0 .../acl/aclrecordproto/protos/aclrecord.proto | 0 .../object}/acl/list/aclrecordbuilder.go | 14 +- .../object}/acl/list/aclrecordbuilder_test.go | 30 +- .../object}/acl/list/aclstate.go | 96 +++---- .../object}/acl/list/aclstatebuilder.go | 4 +- .../object}/acl/list/list.go | 24 +- .../object}/acl/list/list_test.go | 4 +- .../object}/acl/list/mock_list/mock_list.go | 6 +- .../object}/acl/list/record.go | 0 .../object/acl/liststorage/inmemory.go | 78 +++++ .../object/acl/liststorage}/liststorage.go | 14 +- .../mock_liststorage/mock_liststorage.go | 123 ++++++++ .../{ => object/acl}/syncacl/syncacl.go | 10 +- .../acl}/syncacl/syncaclhandler.go | 4 +- .../acl/testutils/acllistbuilder/keychain.go | 32 +-- .../acllistbuilder/liststoragebuilder.go | 16 +- .../acllistbuilder/liststoragebuildergraph.go | 0 .../liststoragebuildergraph_nix.go | 2 +- .../testutils/acllistbuilder/ymlentities.go | 0 .../object}/acl/testutils/yamltests/path.go | 0 .../testutils/yamltests/userjoinexample.yml | 0 .../testutils/yamltests/userremoveexample.yml | 0 .../commonspace/object/keychain/keychain.go | 28 ++ .../syncobjectgetter/syncobjectgetter.go | 14 + .../object/tree/objecttree}/change.go | 4 +- .../object/tree/objecttree}/changebuilder.go | 18 +- .../tree/objecttree}/changevalidator.go | 6 +- .../tree/objecttree}/descriptionparser.go | 2 +- .../mock_objecttree/mock_objecttree.go | 32 +-- .../object/tree/objecttree}/objecttree.go | 36 +-- .../tree/objecttree}/objecttree_test.go | 16 +- .../tree/objecttree}/objecttreefactory.go | 22 +- .../object/tree/objecttree}/rawloader.go | 10 +- .../tree/objecttree/rawtreevalidator.go | 17 ++ .../tree/objecttree}/signablecontent.go | 2 +- .../object/tree/objecttree}/tree.go | 2 +- .../object/tree/objecttree}/tree_test.go | 2 +- .../object/tree/objecttree}/treebuilder.go | 8 +- .../object/tree/objecttree}/treegraph.go | 2 +- .../object/tree/objecttree}/treegraph_nix.go | 2 +- .../object/tree/objecttree}/treeiterator.go | 2 +- .../object/tree/objecttree}/treereduce.go | 2 +- .../object/tree/objecttree}/util.go | 2 +- .../synctree/mock_synctree/mock_synctree.go | 34 +-- .../tree}/synctree/queuedclient.go | 8 +- .../tree}/synctree/receivequeue.go | 2 +- .../tree}/synctree/requestfactory.go | 16 +- .../{ => object/tree}/synctree/syncclient.go | 14 +- .../{ => object/tree}/synctree/synctree.go | 72 ++--- .../tree}/synctree/synctree_test.go | 70 ++--- .../tree}/synctree/synctreehandler.go | 18 +- .../tree}/synctree/synctreehandler_test.go | 34 +-- .../mock_updatelistener.go | 8 +- .../synctree/updatelistener/updatelistener.go | 8 +- .../treechangeproto/protos/treechange.proto | 0 .../tree}/treechangeproto/treechange.go | 0 .../tree}/treechangeproto/treechange.pb.go | 0 .../object/tree/treestorage}/helpers.go | 2 +- .../object/tree/treestorage}/inmemory.go | 75 +---- .../mock_treestorage}/mock_storage.go | 6 +- .../object/tree/treestorage}/provider.go | 4 +- .../object/tree/treestorage}/treestorage.go | 4 +- .../mock_treegetter/mock_treegetter.go | 8 +- .../{ => object}/treegetter/treegetter.go | 11 +- .../commonspace/objectgetter/objectgetter.go | 14 - .../actionqueue.go | 2 +- .../mock_objectsync/mock_objectsync.go} | 10 +- .../objectsync.go} | 48 ++-- .../streamchecker.go | 2 +- .../{syncservice => objectsync}/streampool.go | 4 +- .../streampool_test.go | 2 +- .../synchandler/synchhandler.go | 0 common/commonspace/payloads.go | 44 +-- common/commonspace/settings/deleter.go | 10 +- common/commonspace/settings/deleter_test.go | 10 +- .../settings/deletionstate/deletionstate.go | 14 +- .../deletionstate/deletionstate_test.go | 20 +- common/commonspace/settings/idprovider.go | 10 +- .../commonspace/settings/idprovider_test.go | 18 +- .../settings/mock_settings/mock_settings.go | 4 +- .../mock_settings/mock_settingsdocument.go | 86 ------ common/commonspace/settings/settings.go | 24 +- common/commonspace/settings/settings_test.go | 30 +- common/commonspace/space.go | 50 ++-- .../{service.go => spaceservice.go} | 52 ++-- .../mock_spacestorage}/mock_storage.go | 19 +- .../spacestorage/mock_storage/mock_storage.go | 266 ++++++++++++++++++ .../{storage => spacestorage}/storage.go | 17 +- common/commonspace/syncstatus/syncstatus.go | 10 +- common/net/dialer/dialer.go | 6 +- common/net/pool/pool.go | 2 +- common/net/rpc/server/baseserver.go | 12 +- common/net/rpc/server/drpcserver.go | 6 +- .../basiclistener.go | 2 +- .../secureservice.go} | 22 +- .../{secure => secureservice}/tlslistener.go | 2 +- common/pkg/acl/common/keychain.go | 28 -- common/pkg/acl/tree/rawtreevalidator.go | 17 -- .../accountservice.go} | 12 +- common/util/{cid => cidutil}/cid.go | 2 +- consensus/account/service.go | 10 +- consensus/cmd/consensusnode.go | 4 +- consensus/stream/service.go | 2 +- filenode/account/service.go | 10 +- filenode/cmd/filenode.go | 4 +- node/account/service.go | 10 +- node/acl/service.go | 14 +- node/acl/service_test.go | 22 +- node/acl/util_test.go | 4 +- node/acl/watcher.go | 4 +- node/cmd/node.go | 8 +- .../nodedebugrpc/nodedebugrpc.go} | 36 +-- .../nodedebugrpc/nodedebugrpcproto}/api.pb.go | 2 +- .../nodedebugrpcproto}/api_drpc.pb.go | 2 +- .../nodedebugrpcproto}/protos/api.proto | 0 .../{api => debug/nodedebugrpc}/rpchandler.go | 26 +- node/nodespace/nodecache/treecache.go | 10 +- node/nodespace/service.go | 12 +- node/storage/keys.go | 12 +- node/storage/liststorage.go | 16 +- node/storage/liststorage_test.go | 6 +- node/storage/spacestorage.go | 17 +- node/storage/spacestorage_test.go | 6 +- node/storage/storageservice.go | 10 +- node/storage/treestorage.go | 24 +- node/storage/treestorage_test.go | 12 +- util/cmd/debug/commands/client/service.go | 62 ++-- util/cmd/debug/commands/clientcmds.go | 2 +- util/cmd/debug/commands/node/service.go | 18 +- util/cmd/debug/commands/nodecmds.go | 2 +- util/cmd/debug/commands/scripts.go | 2 +- util/cmd/debug/drpcclient/service.go | 6 +- 173 files changed, 1542 insertions(+), 1224 deletions(-) rename client/{api/service.go => debug/clientdebugrpc/clientdebugrpc.go} (79%) rename client/{api/apiproto => debug/clientdebugrpc/clientdebugrpcproto}/api.pb.go (99%) rename client/{api/apiproto => debug/clientdebugrpc/clientdebugrpcproto}/api_drpc.pb.go (99%) rename client/{api/apiproto => debug/clientdebugrpc/clientdebugrpcproto}/protos/api.proto (100%) rename client/{api => debug/clientdebugrpc}/rpchandler.go (51%) rename {common/pkg/acl/testutils/testchanges/proto => client/document/textchangeproto/protos}/test.proto (83%) rename {common/pkg/acl/testutils/testchanges/proto => client/document/textchangeproto}/test.pb.go (99%) rename common/{account/service.go => accountservice/accountservice.go} (58%) rename common/{account/mock_account/mock_account.go => accountservice/mock_accountservice/mock_accountservice.go} (85%) rename common/{pkg => app}/ldiff/diff.go (98%) rename common/{pkg => app}/ldiff/diff_test.go (100%) rename common/{pkg => app}/ldiff/mock_ldiff/mock_ldiff.go (98%) rename common/{pkg => app}/ocache/metrics.go (100%) rename common/{pkg => app}/ocache/ocache.go (99%) rename common/{pkg => app}/ocache/ocache_test.go (100%) rename common/{pkg/acl/account => commonspace/object/accountdata}/accountdata.go (95%) rename common/{pkg => commonspace/object}/acl/aclrecordproto/aclreadkeyderive.go (100%) rename common/{pkg => commonspace/object}/acl/aclrecordproto/aclrecord.pb.go (100%) rename common/{pkg => commonspace/object}/acl/aclrecordproto/protos/aclrecord.proto (100%) rename common/{pkg => commonspace/object}/acl/list/aclrecordbuilder.go (93%) rename common/{pkg => commonspace/object}/acl/list/aclrecordbuilder_test.go (58%) rename common/{pkg => commonspace/object}/acl/list/aclstate.go (75%) rename common/{pkg => commonspace/object}/acl/list/aclstatebuilder.go (90%) rename common/{pkg => commonspace/object}/acl/list/list.go (87%) rename common/{pkg => commonspace/object}/acl/list/list_test.go (97%) rename common/{pkg => commonspace/object}/acl/list/mock_list/mock_list.go (97%) rename common/{pkg => commonspace/object}/acl/list/record.go (100%) create mode 100644 common/commonspace/object/acl/liststorage/inmemory.go rename common/{pkg/acl/storage => commonspace/object/acl/liststorage}/liststorage.go (50%) create mode 100644 common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go rename common/commonspace/{ => object/acl}/syncacl/syncacl.go (63%) rename common/commonspace/{ => object/acl}/syncacl/syncaclhandler.go (92%) rename common/{pkg => commonspace/object}/acl/testutils/acllistbuilder/keychain.go (80%) rename common/{pkg => commonspace/object}/acl/testutils/acllistbuilder/liststoragebuilder.go (94%) rename common/{pkg => commonspace/object}/acl/testutils/acllistbuilder/liststoragebuildergraph.go (100%) rename common/{pkg => commonspace/object}/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go (98%) rename common/{pkg => commonspace/object}/acl/testutils/acllistbuilder/ymlentities.go (100%) rename common/{pkg => commonspace/object}/acl/testutils/yamltests/path.go (100%) rename common/{pkg => commonspace/object}/acl/testutils/yamltests/userjoinexample.yml (100%) rename common/{pkg => commonspace/object}/acl/testutils/yamltests/userremoveexample.yml (100%) create mode 100644 common/commonspace/object/keychain/keychain.go create mode 100644 common/commonspace/object/syncobjectgetter/syncobjectgetter.go rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/change.go (95%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/changebuilder.go (93%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/changevalidator.go (95%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/descriptionparser.go (93%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/mock_objecttree/mock_objecttree.go (90%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/objecttree.go (95%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/objecttree_test.go (97%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/objecttreefactory.go (82%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/rawloader.go (95%) create mode 100644 common/commonspace/object/tree/objecttree/rawtreevalidator.go rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/signablecontent.go (93%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/tree.go (99%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/tree_test.go (99%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/treebuilder.go (97%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/treegraph.go (93%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/treegraph_nix.go (99%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/treeiterator.go (98%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/treereduce.go (99%) rename common/{pkg/acl/tree => commonspace/object/tree/objecttree}/util.go (97%) rename common/commonspace/{ => object/tree}/synctree/mock_synctree/mock_synctree.go (93%) rename common/commonspace/{ => object/tree}/synctree/queuedclient.go (82%) rename common/commonspace/{ => object/tree}/synctree/receivequeue.go (97%) rename common/commonspace/{ => object/tree}/synctree/requestfactory.go (64%) rename common/commonspace/{ => object/tree}/synctree/syncclient.go (89%) rename common/commonspace/{ => object/tree}/synctree/synctree.go (81%) rename common/commonspace/{ => object/tree}/synctree/synctree_test.go (74%) rename common/commonspace/{ => object/tree}/synctree/synctreehandler.go (90%) rename common/commonspace/{ => object/tree}/synctree/synctreehandler_test.go (94%) rename common/commonspace/{ => object/tree}/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go (83%) rename common/commonspace/{ => object/tree}/synctree/updatelistener/updatelistener.go (57%) rename common/{pkg/acl => commonspace/object/tree}/treechangeproto/protos/treechange.proto (100%) rename common/{pkg/acl => commonspace/object/tree}/treechangeproto/treechange.go (100%) rename common/{pkg/acl => commonspace/object/tree}/treechangeproto/treechange.pb.go (100%) rename common/{pkg/acl/storage => commonspace/object/tree/treestorage}/helpers.go (96%) rename common/{pkg/acl/storage => commonspace/object/tree/treestorage}/inmemory.go (61%) rename common/{pkg/acl/storage/mock_storage => commonspace/object/tree/treestorage/mock_treestorage}/mock_storage.go (97%) rename common/{pkg/acl/storage => commonspace/object/tree/treestorage}/provider.go (89%) rename common/{pkg/acl/storage => commonspace/object/tree/treestorage}/treestorage.go (89%) rename common/commonspace/{ => object}/treegetter/mock_treegetter/mock_treegetter.go (93%) rename common/commonspace/{ => object}/treegetter/treegetter.go (63%) delete mode 100644 common/commonspace/objectgetter/objectgetter.go rename common/commonspace/{syncservice => objectsync}/actionqueue.go (98%) rename common/commonspace/{syncservice/mock_syncservice/mock_syncservice.go => objectsync/mock_objectsync/mock_objectsync.go} (85%) rename common/commonspace/{syncservice/syncservice.go => objectsync/objectsync.go} (69%) rename common/commonspace/{syncservice => objectsync}/streamchecker.go (99%) rename common/commonspace/{syncservice => objectsync}/streampool.go (99%) rename common/commonspace/{syncservice => objectsync}/streampool_test.go (99%) rename common/commonspace/{syncservice => objectsync}/synchandler/synchhandler.go (100%) delete mode 100644 common/commonspace/settings/mock_settings/mock_settingsdocument.go rename common/commonspace/{service.go => spaceservice.go} (76%) rename common/commonspace/{storage/mock_storage => spacestorage/mock_spacestorage}/mock_storage.go (93%) create mode 100644 common/commonspace/spacestorage/mock_storage/mock_storage.go rename common/commonspace/{storage => spacestorage}/storage.go (79%) rename common/net/{secure => secureservice}/basiclistener.go (96%) rename common/net/{secure/service.go => secureservice/secureservice.go} (72%) rename common/net/{secure => secureservice}/tlslistener.go (98%) delete mode 100644 common/pkg/acl/common/keychain.go delete mode 100644 common/pkg/acl/tree/rawtreevalidator.go rename common/testutil/{testaccount/service.go => accounttest/accountservice.go} (82%) rename common/util/{cid => cidutil}/cid.go (96%) rename node/{api/service.go => debug/nodedebugrpc/nodedebugrpc.go} (65%) rename node/{api/apiproto => debug/nodedebugrpc/nodedebugrpcproto}/api.pb.go (99%) rename node/{api/apiproto => debug/nodedebugrpc/nodedebugrpcproto}/api_drpc.pb.go (99%) rename node/{api/apiproto => debug/nodedebugrpc/nodedebugrpcproto}/protos/api.proto (100%) rename node/{api => debug/nodedebugrpc}/rpchandler.go (52%) diff --git a/client/account/service.go b/client/account/service.go index d73f9c8d..8aeed2e2 100644 --- a/client/account/service.go +++ b/client/account/service.go @@ -1,21 +1,21 @@ package account import ( - commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) type service struct { - accountData *account.AccountData + accountData *accountdata.AccountData peerId string } -func (s *service) Account() *account.AccountData { +func (s *service) Account() *accountdata.AccountData { return s.accountData } @@ -55,7 +55,7 @@ func (s *service) Init(a *app.App) (err error) { return err } - s.accountData = &account.AccountData{ + s.accountData = &accountdata.AccountData{ Identity: identity, PeerKey: decodedPeerKey, SignKey: decodedSigningKey, diff --git a/client/clientspace/clientcache/treecache.go b/client/clientspace/clientcache/treecache.go index e33a1235..4dffd9e1 100644 --- a/client/clientspace/clientcache/treecache.go +++ b/client/clientspace/clientcache/treecache.go @@ -5,12 +5,12 @@ import ( "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document/textdocument" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "go.uber.org/zap" "time" ) @@ -25,7 +25,7 @@ const spaceKey ctxKey = 0 type treeCache struct { gcttl int cache ocache.OCache - account account.Service + account accountservice.Service clientService clientspace.Service } @@ -37,14 +37,14 @@ type TreeCache interface { type updateListener struct { } -func (u *updateListener) Update(tree tree.ObjectTree) { +func (u *updateListener) Update(tree objecttree.ObjectTree) { log.With( zap.Strings("heads", tree.Heads()), zap.String("tree id", tree.ID())). Debug("updating tree") } -func (u *updateListener) Rebuild(tree tree.ObjectTree) { +func (u *updateListener) Rebuild(tree objecttree.ObjectTree) { log.With( zap.Strings("heads", tree.Heads()), zap.String("tree id", tree.ID())). @@ -67,7 +67,7 @@ func (c *treeCache) Close(ctx context.Context) (err error) { func (c *treeCache) Init(a *app.App) (err error) { c.clientService = a.MustComponent(clientspace.CName).(clientspace.Service) - c.account = a.MustComponent(account.CName).(account.Service) + c.account = a.MustComponent(accountservice.CName).(accountservice.Service) c.cache = ocache.New( func(ctx context.Context, id string) (value ocache.Object, err error) { spaceId := ctx.Value(spaceKey).(string) @@ -98,7 +98,7 @@ func (c *treeCache) GetDocument(ctx context.Context, spaceId, id string) (doc te return } -func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr tree.ObjectTree, err error) { +func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr objecttree.ObjectTree, err error) { doc, err := c.GetDocument(ctx, spaceId, id) if err != nil { return diff --git a/client/clientspace/service.go b/client/clientspace/service.go index ebd2efd0..98a34b16 100644 --- a/client/clientspace/service.go +++ b/client/clientspace/service.go @@ -4,12 +4,13 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" config2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "time" ) @@ -31,14 +32,14 @@ type Service interface { type service struct { conf config2.Space spaceCache ocache.OCache - commonSpace commonspace.Service - spaceStorageProvider storage.SpaceStorageProvider + commonSpace commonspace.SpaceService + spaceStorageProvider spacestorage.SpaceStorageProvider } func (s *service) Init(a *app.App) (err error) { s.conf = a.MustComponent(config2.CName).(*config2.Config).Space - s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.Service) - s.spaceStorageProvider = a.MustComponent(storage.CName).(storage.SpaceStorageProvider) + s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.SpaceService) + s.spaceStorageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.spaceCache = ocache.New( s.loadSpace, ocache.WithLogger(log.Sugar()), @@ -99,7 +100,7 @@ func (s *service) loadSpace(ctx context.Context, id string) (value ocache.Object if err != nil { return } - ns.StatusService().SetUpdateReceiver(&statusReceiver{}) + ns.SyncStatus().(syncstatus.SyncStatusWatcher).SetUpdateReceiver(&statusReceiver{}) if err = ns.Init(ctx); err != nil { return } diff --git a/client/cmd/client.go b/client/cmd/client.go index 42193a19..cbe57c17 100644 --- a/client/cmd/client.go +++ b/client/cmd/client.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/badgerprovider" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace/clientcache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/filestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/filestorage/rpcstore" @@ -22,7 +22,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/dialer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "go.uber.org/zap" "net/http" @@ -104,7 +104,7 @@ func Bootstrap(a *app.App) { Register(badgerprovider.New()). Register(storage.New()). Register(clientcache.New(200)). - Register(secure.New()). + Register(secureservice.New()). Register(dialer.New()). Register(pool.New()). Register(commonspace.New()). @@ -114,5 +114,5 @@ func Bootstrap(a *app.App) { Register(rpcstore.New()). Register(fileservice.New()). Register(filestorage.New()). - Register(api.New()) + Register(clientdebugrpc.New()) } diff --git a/client/api/service.go b/client/debug/clientdebugrpc/clientdebugrpc.go similarity index 79% rename from client/api/service.go rename to client/debug/clientdebugrpc/clientdebugrpc.go index a381fc50..0317a81c 100644 --- a/client/api/service.go +++ b/client/debug/clientdebugrpc/clientdebugrpc.go @@ -1,53 +1,53 @@ -package api +package clientdebugrpc import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document" clientstorage "github.com/anytypeio/go-anytype-infrastructure-experiments/client/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "storj.io/drpc" ) -const CName = "api.service" +const CName = "debug.clientdebugrpc" var log = logger.NewNamed(CName) -func New() Service { +func New() ClientDebugRpc { return &service{BaseDrpcServer: server.NewBaseDrpcServer()} } -type Service interface { +type ClientDebugRpc interface { app.ComponentRunnable drpc.Mux } type service struct { - transport secure.Service + transport secureservice.SecureService cfg *config.Config spaceService clientspace.Service storageService clientstorage.ClientStorage docService document.Service - account account.Service + account accountservice.Service file fileservice.FileService *server.BaseDrpcServer } func (s *service) Init(a *app.App) (err error) { s.spaceService = a.MustComponent(clientspace.CName).(clientspace.Service) - s.storageService = a.MustComponent(storage.CName).(clientstorage.ClientStorage) + s.storageService = a.MustComponent(spacestorage.CName).(clientstorage.ClientStorage) s.docService = a.MustComponent(document.CName).(document.Service) - s.account = a.MustComponent(account.CName).(account.Service) + s.account = a.MustComponent(accountservice.CName).(accountservice.Service) s.cfg = a.MustComponent(config.CName).(*config.Config) - s.transport = a.MustComponent(secure.CName).(secure.Service) + s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) s.file = a.MustComponent(fileservice.CName).(fileservice.FileService) return nil } @@ -70,7 +70,7 @@ func (s *service) Run(ctx context.Context) (err error) { if err != nil { return } - return apiproto.DRPCRegisterClientApi(s, &rpcHandler{ + return clientdebugrpcproto.DRPCRegisterClientApi(s, &rpcHandler{ spaceService: s.spaceService, storageService: s.storageService, docService: s.docService, diff --git a/client/api/apiproto/api.pb.go b/client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go similarity index 99% rename from client/api/apiproto/api.pb.go rename to client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go index ba745fd5..1a77d7b6 100644 --- a/client/api/apiproto/api.pb.go +++ b/client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: api/apiproto/protos/api.proto -package apiproto +package clientdebugrpcproto import ( fmt "fmt" diff --git a/client/api/apiproto/api_drpc.pb.go b/client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go similarity index 99% rename from client/api/apiproto/api_drpc.pb.go rename to client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go index 122fae05..e5219e34 100644 --- a/client/api/apiproto/api_drpc.pb.go +++ b/client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go @@ -2,7 +2,7 @@ // protoc-gen-go-drpc version: v0.0.32 // source: api/apiproto/protos/api.proto -package apiproto +package clientdebugrpcproto import ( bytes "bytes" diff --git a/client/api/apiproto/protos/api.proto b/client/debug/clientdebugrpc/clientdebugrpcproto/protos/api.proto similarity index 100% rename from client/api/apiproto/protos/api.proto rename to client/debug/clientdebugrpc/clientdebugrpcproto/protos/api.proto diff --git a/client/api/rpchandler.go b/client/debug/clientdebugrpc/rpchandler.go similarity index 51% rename from client/api/rpchandler.go rename to client/debug/clientdebugrpc/rpchandler.go index 543472f7..db3f936f 100644 --- a/client/api/rpchandler.go +++ b/client/debug/clientdebugrpc/rpchandler.go @@ -1,14 +1,15 @@ -package api +package clientdebugrpc import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "github.com/ipfs/go-cid" "go.uber.org/zap" @@ -21,41 +22,42 @@ type rpcHandler struct { spaceService clientspace.Service storageService storage.ClientStorage docService document.Service - account account.Service + account accountservice.Service file fileservice.FileService } -func (r *rpcHandler) Watch(ctx context.Context, request *apiproto.WatchRequest) (resp *apiproto.WatchResponse, err error) { +func (r *rpcHandler) Watch(ctx context.Context, request *clientdebugrpcproto.WatchRequest) (resp *clientdebugrpcproto.WatchResponse, err error) { space, err := r.spaceService.GetSpace(context.Background(), request.SpaceId) if err != nil { return } - - space.StatusService().Watch(request.TreeId) - resp = &apiproto.WatchResponse{} + watcher := space.SyncStatus().(syncstatus.SyncStatusWatcher) + watcher.Watch(request.TreeId) + resp = &clientdebugrpcproto.WatchResponse{} return } -func (r *rpcHandler) Unwatch(ctx context.Context, request *apiproto.UnwatchRequest) (resp *apiproto.UnwatchResponse, err error) { +func (r *rpcHandler) Unwatch(ctx context.Context, request *clientdebugrpcproto.UnwatchRequest) (resp *clientdebugrpcproto.UnwatchResponse, err error) { space, err := r.spaceService.GetSpace(context.Background(), request.SpaceId) if err != nil { return } - space.StatusService().Unwatch(request.TreeId) - resp = &apiproto.UnwatchResponse{} + watcher := space.SyncStatus().(syncstatus.SyncStatusWatcher) + watcher.Unwatch(request.TreeId) + resp = &clientdebugrpcproto.UnwatchResponse{} return } -func (r *rpcHandler) LoadSpace(ctx context.Context, request *apiproto.LoadSpaceRequest) (resp *apiproto.LoadSpaceResponse, err error) { +func (r *rpcHandler) LoadSpace(ctx context.Context, request *clientdebugrpcproto.LoadSpaceRequest) (resp *clientdebugrpcproto.LoadSpaceResponse, err error) { _, err = r.spaceService.GetSpace(context.Background(), request.SpaceId) if err != nil { return } - resp = &apiproto.LoadSpaceResponse{} + resp = &clientdebugrpcproto.LoadSpaceResponse{} return } -func (r *rpcHandler) CreateSpace(ctx context.Context, request *apiproto.CreateSpaceRequest) (resp *apiproto.CreateSpaceResponse, err error) { +func (r *rpcHandler) CreateSpace(ctx context.Context, request *clientdebugrpcproto.CreateSpaceRequest) (resp *clientdebugrpcproto.CreateSpaceResponse, err error) { key, err := symmetric.NewRandom() if err != nil { return @@ -73,11 +75,11 @@ func (r *rpcHandler) CreateSpace(ctx context.Context, request *apiproto.CreateSp if err != nil { return } - resp = &apiproto.CreateSpaceResponse{Id: id} + resp = &clientdebugrpcproto.CreateSpaceResponse{Id: id} return } -func (r *rpcHandler) DeriveSpace(ctx context.Context, request *apiproto.DeriveSpaceRequest) (resp *apiproto.DeriveSpaceResponse, err error) { +func (r *rpcHandler) DeriveSpace(ctx context.Context, request *clientdebugrpcproto.DeriveSpaceRequest) (resp *clientdebugrpcproto.DeriveSpaceResponse, err error) { sp, err := r.spaceService.DeriveSpace(context.Background(), commonspace.SpaceDerivePayload{ SigningKey: r.account.Account().SignKey, EncryptionKey: r.account.Account().EncKey, @@ -89,34 +91,34 @@ func (r *rpcHandler) DeriveSpace(ctx context.Context, request *apiproto.DeriveSp if err != nil { return } - resp = &apiproto.DeriveSpaceResponse{Id: id} + resp = &clientdebugrpcproto.DeriveSpaceResponse{Id: id} return } -func (r *rpcHandler) CreateDocument(ctx context.Context, request *apiproto.CreateDocumentRequest) (resp *apiproto.CreateDocumentResponse, err error) { +func (r *rpcHandler) CreateDocument(ctx context.Context, request *clientdebugrpcproto.CreateDocumentRequest) (resp *clientdebugrpcproto.CreateDocumentResponse, err error) { id, err := r.docService.CreateDocument(request.SpaceId) if err != nil { return } - resp = &apiproto.CreateDocumentResponse{Id: id} + resp = &clientdebugrpcproto.CreateDocumentResponse{Id: id} return } -func (r *rpcHandler) DeleteDocument(ctx context.Context, request *apiproto.DeleteDocumentRequest) (resp *apiproto.DeleteDocumentResponse, err error) { +func (r *rpcHandler) DeleteDocument(ctx context.Context, request *clientdebugrpcproto.DeleteDocumentRequest) (resp *clientdebugrpcproto.DeleteDocumentResponse, err error) { err = r.docService.DeleteDocument(request.SpaceId, request.DocumentId) if err != nil { return } - resp = &apiproto.DeleteDocumentResponse{} + resp = &clientdebugrpcproto.DeleteDocumentResponse{} return } -func (r *rpcHandler) AddText(ctx context.Context, request *apiproto.AddTextRequest) (resp *apiproto.AddTextResponse, err error) { +func (r *rpcHandler) AddText(ctx context.Context, request *clientdebugrpcproto.AddTextRequest) (resp *clientdebugrpcproto.AddTextResponse, err error) { root, head, err := r.docService.AddText(request.SpaceId, request.DocumentId, request.Text, request.IsSnapshot) if err != nil { return } - resp = &apiproto.AddTextResponse{ + resp = &clientdebugrpcproto.AddTextResponse{ DocumentId: request.DocumentId, HeadId: head, RootId: root, @@ -124,55 +126,55 @@ func (r *rpcHandler) AddText(ctx context.Context, request *apiproto.AddTextReque return } -func (r *rpcHandler) DumpTree(ctx context.Context, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) { +func (r *rpcHandler) DumpTree(ctx context.Context, request *clientdebugrpcproto.DumpTreeRequest) (resp *clientdebugrpcproto.DumpTreeResponse, err error) { dump, err := r.docService.DumpDocumentTree(request.SpaceId, request.DocumentId) if err != nil { return } - resp = &apiproto.DumpTreeResponse{ + resp = &clientdebugrpcproto.DumpTreeResponse{ Dump: dump, } return } -func (r *rpcHandler) AllTrees(ctx context.Context, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) { +func (r *rpcHandler) AllTrees(ctx context.Context, request *clientdebugrpcproto.AllTreesRequest) (resp *clientdebugrpcproto.AllTreesResponse, err error) { heads, err := r.docService.AllDocumentHeads(request.SpaceId) if err != nil { return } - var trees []*apiproto.Tree + var trees []*clientdebugrpcproto.Tree for _, head := range heads { - trees = append(trees, &apiproto.Tree{ + trees = append(trees, &clientdebugrpcproto.Tree{ Id: head.Id, Heads: head.Heads, }) } - resp = &apiproto.AllTreesResponse{Trees: trees} + resp = &clientdebugrpcproto.AllTreesResponse{Trees: trees} return } -func (r *rpcHandler) AllSpaces(ctx context.Context, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) { +func (r *rpcHandler) AllSpaces(ctx context.Context, request *clientdebugrpcproto.AllSpacesRequest) (resp *clientdebugrpcproto.AllSpacesResponse, err error) { ids, err := r.storageService.AllSpaceIds() if err != nil { return } - resp = &apiproto.AllSpacesResponse{SpaceIds: ids} + resp = &clientdebugrpcproto.AllSpacesResponse{SpaceIds: ids} return } -func (r *rpcHandler) TreeParams(ctx context.Context, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) { +func (r *rpcHandler) TreeParams(ctx context.Context, request *clientdebugrpcproto.TreeParamsRequest) (resp *clientdebugrpcproto.TreeParamsResponse, err error) { root, heads, err := r.docService.TreeParams(request.SpaceId, request.DocumentId) if err != nil { return } - resp = &apiproto.TreeParamsResponse{ + resp = &clientdebugrpcproto.TreeParamsResponse{ RootId: root, HeadIds: heads, } return } -func (r *rpcHandler) PutFile(ctx context.Context, request *apiproto.PutFileRequest) (*apiproto.PutFileResponse, error) { +func (r *rpcHandler) PutFile(ctx context.Context, request *clientdebugrpcproto.PutFileRequest) (*clientdebugrpcproto.PutFileResponse, error) { f, err := os.Open(request.Path) if err != nil { return nil, err @@ -182,12 +184,12 @@ func (r *rpcHandler) PutFile(ctx context.Context, request *apiproto.PutFileReque if err != nil { return nil, err } - return &apiproto.PutFileResponse{ + return &clientdebugrpcproto.PutFileResponse{ Hash: n.Cid().String(), }, nil } -func (r *rpcHandler) GetFile(ctx context.Context, request *apiproto.GetFileRequest) (*apiproto.GetFileResponse, error) { +func (r *rpcHandler) GetFile(ctx context.Context, request *clientdebugrpcproto.GetFileRequest) (*clientdebugrpcproto.GetFileResponse, error) { c, err := cid.Parse(request.Hash) if err != nil { return nil, err @@ -209,12 +211,12 @@ func (r *rpcHandler) GetFile(ctx context.Context, request *apiproto.GetFileReque return nil, err } log.Info("copied bytes", zap.Int64("size", wr)) - return &apiproto.GetFileResponse{ + return &clientdebugrpcproto.GetFileResponse{ Path: request.Path, }, nil } -func (r *rpcHandler) DeleteFile(ctx context.Context, request *apiproto.DeleteFileRequest) (*apiproto.DeleteFileResponse, error) { +func (r *rpcHandler) DeleteFile(ctx context.Context, request *clientdebugrpcproto.DeleteFileRequest) (*clientdebugrpcproto.DeleteFileResponse, error) { //TODO implement me panic("implement me") } diff --git a/client/document/service.go b/client/document/service.go index 50cffa3e..7d49990f 100644 --- a/client/document/service.go +++ b/client/document/service.go @@ -5,10 +5,11 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace/clientcache" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document/textdocument" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" ) type Service interface { @@ -27,7 +28,7 @@ const CName = "client.document" var log = logger.NewNamed(CName) type service struct { - account account.Service + account accountservice.Service spaceService clientspace.Service cache clientcache.TreeCache } @@ -37,7 +38,7 @@ func New() Service { } func (s *service) Init(a *app.App) (err error) { - s.account = a.MustComponent(account.CName).(account.Service) + s.account = a.MustComponent(accountservice.CName).(accountservice.Service) s.spaceService = a.MustComponent(clientspace.CName).(clientspace.Service) s.cache = a.MustComponent(treegetter.CName).(clientcache.TreeCache) return diff --git a/common/pkg/acl/testutils/testchanges/proto/test.proto b/client/document/textchangeproto/protos/test.proto similarity index 83% rename from common/pkg/acl/testutils/testchanges/proto/test.proto rename to client/document/textchangeproto/protos/test.proto index 2c9d5f66..5a9b89e8 100644 --- a/common/pkg/acl/testutils/testchanges/proto/test.proto +++ b/client/document/textchangeproto/protos/test.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package anytype; -option go_package = "testchanges"; +package textchange; +option go_package = "textchange"; message TextContent { oneof value { diff --git a/common/pkg/acl/testutils/testchanges/proto/test.pb.go b/client/document/textchangeproto/test.pb.go similarity index 99% rename from common/pkg/acl/testutils/testchanges/proto/test.pb.go rename to client/document/textchangeproto/test.pb.go index 9071b091..28ab3d4e 100644 --- a/common/pkg/acl/testutils/testchanges/proto/test.pb.go +++ b/client/document/textchangeproto/test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: pkg/acl/testutils/testchanges/proto/test.proto -package testchanges +package textchangeproto import ( fmt "fmt" diff --git a/client/document/textdocument/textdocument.go b/client/document/textdocument/textdocument.go index d47ccf50..dc66ba1b 100644 --- a/client/document/textdocument/textdocument.go +++ b/client/document/textdocument/textdocument.go @@ -2,17 +2,17 @@ package textdocument import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + textchange "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document/textchangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" - testchanges "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/testutils/testchanges/proto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" "github.com/gogo/protobuf/proto" ) type TextDocument interface { - tree.ObjectTree - InnerTree() tree.ObjectTree + objecttree.ObjectTree + InnerTree() objecttree.ObjectTree AddText(text string, isSnapshot bool) (string, string, error) Text() (string, error) TreeDump() string @@ -20,15 +20,15 @@ type TextDocument interface { } type textDocument struct { - tree.ObjectTree - account account.Service + objecttree.ObjectTree + account accountservice.Service } func CreateTextDocument( ctx context.Context, space commonspace.Space, - account account.Service) (id string, err error) { - payload := tree.ObjectTreeCreatePayload{ + account accountservice.Service) (id string, err error) { + payload := objecttree.ObjectTreeCreatePayload{ SignKey: account.Account().SignKey, SpaceId: space.Id(), Identity: account.Account().Identity, @@ -36,7 +36,7 @@ func CreateTextDocument( return space.CreateTree(ctx, payload) } -func NewTextDocument(ctx context.Context, space commonspace.Space, id string, listener updatelistener.UpdateListener, account account.Service) (doc TextDocument, err error) { +func NewTextDocument(ctx context.Context, space commonspace.Space, id string, listener updatelistener.UpdateListener, account accountservice.Service) (doc TextDocument, err error) { t, err := space.BuildTree(ctx, id, listener) if err != nil { return @@ -47,16 +47,16 @@ func NewTextDocument(ctx context.Context, space commonspace.Space, id string, li }, nil } -func (t *textDocument) InnerTree() tree.ObjectTree { +func (t *textDocument) InnerTree() objecttree.ObjectTree { return t.ObjectTree } func (t *textDocument) AddText(text string, isSnapshot bool) (root, head string, err error) { - content := &testchanges.TextContent_TextAppend{ - TextAppend: &testchanges.TextAppend{Text: text}, + content := &textchange.TextContent_TextAppend{ + TextAppend: &textchange.TextAppend{Text: text}, } - change := &testchanges.TextData{ - Content: []*testchanges.TextContent{ + change := &textchange.TextData{ + Content: []*textchange.TextContent{ {content}, }, Snapshot: nil, @@ -67,7 +67,7 @@ func (t *textDocument) AddText(text string, isSnapshot bool) (root, head string, } t.Lock() defer t.Unlock() - addRes, err := t.AddContent(context.Background(), tree.SignableChangeContent{ + addRes, err := t.AddContent(context.Background(), objecttree.SignableChangeContent{ Data: res, Key: t.account.Account().SignKey, Identity: t.account.Account().Identity, @@ -87,7 +87,7 @@ func (t *textDocument) Text() (text string, err error) { err = t.Iterate( func(decrypted []byte) (any, error) { - textChange := &testchanges.TextData{} + textChange := &textchange.TextData{} err = proto.Unmarshal(decrypted, textChange) if err != nil { return nil, err @@ -98,7 +98,7 @@ func (t *textDocument) Text() (text string, err error) { } } return textChange, nil - }, func(change *tree.Change) bool { + }, func(change *objecttree.Change) bool { return true }) return diff --git a/client/filestorage/rpcstore/clientmgr.go b/client/filestorage/rpcstore/clientmgr.go index 45d4c579..04131949 100644 --- a/client/filestorage/rpcstore/clientmgr.go +++ b/client/filestorage/rpcstore/clientmgr.go @@ -3,7 +3,7 @@ package rpcstore import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/cheggaaa/mb/v3" "go.uber.org/zap" "math/rand" diff --git a/client/storage/keys.go b/client/storage/keys.go index cd19c07a..e3688ce3 100644 --- a/client/storage/keys.go +++ b/client/storage/keys.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" ) type aclKeys struct { @@ -13,8 +13,8 @@ type aclKeys struct { func newACLKeys(spaceId string) aclKeys { return aclKeys{ spaceId: spaceId, - rootKey: storage.JoinStringsToBytes("space", spaceId, "a", "rootId"), - headKey: storage.JoinStringsToBytes("space", spaceId, "a", "headId"), + rootKey: treestorage.JoinStringsToBytes("space", spaceId, "a", "rootId"), + headKey: treestorage.JoinStringsToBytes("space", spaceId, "a", "headId"), } } @@ -27,7 +27,7 @@ func (a aclKeys) RootIdKey() []byte { } func (a aclKeys) RawRecordKey(id string) []byte { - return storage.JoinStringsToBytes("space", a.spaceId, "a", id) + return treestorage.JoinStringsToBytes("space", a.spaceId, "a", id) } type treeKeys struct { @@ -42,9 +42,9 @@ func newTreeKeys(spaceId, id string) treeKeys { return treeKeys{ id: id, spaceId: spaceId, - headsKey: storage.JoinStringsToBytes("space", spaceId, "t", id, "heads"), - rootKey: storage.JoinStringsToBytes("space", spaceId, "t", "rootId", id), - rawChangePrefix: storage.JoinStringsToBytes("space", spaceId, "t", id), + headsKey: treestorage.JoinStringsToBytes("space", spaceId, "t", id, "heads"), + rootKey: treestorage.JoinStringsToBytes("space", spaceId, "t", "rootId", id), + rawChangePrefix: treestorage.JoinStringsToBytes("space", spaceId, "t", id), } } @@ -57,7 +57,7 @@ func (t treeKeys) RootIdKey() []byte { } func (t treeKeys) RawChangeKey(id string) []byte { - return storage.JoinStringsToBytes("space", t.spaceId, "t", t.id, id) + return treestorage.JoinStringsToBytes("space", t.spaceId, "t", t.id, id) } func (t treeKeys) RawChangePrefix() []byte { @@ -74,9 +74,9 @@ type spaceKeys struct { func newSpaceKeys(spaceId string) spaceKeys { return spaceKeys{ spaceId: spaceId, - headerKey: storage.JoinStringsToBytes("space", "header", spaceId), - treePrefixKey: storage.JoinStringsToBytes("space", spaceId, "t", "rootId"), - spaceSettingsIdKey: storage.JoinStringsToBytes("space", spaceId, "spaceSettingsId"), + headerKey: treestorage.JoinStringsToBytes("space", "header", spaceId), + treePrefixKey: treestorage.JoinStringsToBytes("space", spaceId, "t", "rootId"), + spaceSettingsIdKey: treestorage.JoinStringsToBytes("space", spaceId, "spaceSettingsId"), } } @@ -93,7 +93,7 @@ func (s spaceKeys) SpaceSettingsId() []byte { } func (s spaceKeys) TreeDeletedKey(id string) []byte { - return storage.JoinStringsToBytes("space", s.spaceId, "deleted", id) + return treestorage.JoinStringsToBytes("space", s.spaceId, "deleted", id) } type storageServiceKeys struct { diff --git a/client/storage/liststorage.go b/client/storage/liststorage.go index fbe10d35..ed6456cb 100644 --- a/client/storage/liststorage.go +++ b/client/storage/liststorage.go @@ -3,8 +3,8 @@ package storage import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" "github.com/dgraph-io/badger/v3" ) @@ -17,7 +17,7 @@ type listStorage struct { root *aclrecordproto.RawACLRecordWithId } -func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls storage.ListStorage, err error) { +func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls liststorage.ListStorage, err error) { keys := newACLKeys(spaceId) rootId, err := getTxn(txn, keys.RootIdKey()) if err != nil { @@ -44,7 +44,7 @@ func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls storage. return } -func createListStorage(spaceId string, db *badger.DB, txn *badger.Txn, root *aclrecordproto.RawACLRecordWithId) (ls storage.ListStorage, err error) { +func createListStorage(spaceId string, db *badger.DB, txn *badger.Txn, root *aclrecordproto.RawACLRecordWithId) (ls liststorage.ListStorage, err error) { keys := newACLKeys(spaceId) _, err = getTxn(txn, keys.RootIdKey()) if err != badger.ErrKeyNotFound { @@ -98,7 +98,7 @@ func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclreco res, err := getDB(l.db, l.keys.RawRecordKey(id)) if err != nil { if err == badger.ErrKeyNotFound { - err = storage.ErrUnknownRecord + err = liststorage.ErrUnknownRecord } return } diff --git a/client/storage/liststorage_test.go b/client/storage/liststorage_test.go index 4c4df686..7146fc67 100644 --- a/client/storage/liststorage_test.go +++ b/client/storage/liststorage_test.go @@ -2,14 +2,14 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" "github.com/dgraph-io/badger/v3" "github.com/stretchr/testify/require" "testing" ) -func testList(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { +func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { require.Equal(t, store.Id(), root.Id) aclRoot, err := store.Root() @@ -34,7 +34,7 @@ func TestListStorage(t *testing.T) { return nil }) - var listStore storage.ListStorage + var listStore liststorage.ListStorage fx.db.View(func(txn *badger.Txn) (err error) { listStore, err = newListStorage(spaceId, fx.db, txn) require.NoError(t, err) diff --git a/client/storage/spacestorage.go b/client/storage/spacestorage.go index 7f65f9ff..c1447d10 100644 --- a/client/storage/spacestorage.go +++ b/client/storage/spacestorage.go @@ -1,10 +1,11 @@ package storage import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/dgraph-io/badger/v3" ) @@ -13,7 +14,7 @@ type spaceStorage struct { spaceSettingsId string objDb *badger.DB keys spaceKeys - aclStorage storage.ListStorage + aclStorage liststorage.ListStorage header *spacesyncproto.RawSpaceHeaderWithId } @@ -119,7 +120,7 @@ func (s *spaceStorage) CreateTreeStorage(payload storage.TreeStorageCreatePayloa return createTreeStorage(s.objDb, s.spaceId, payload) } -func (s *spaceStorage) ACLStorage() (storage.ListStorage, error) { +func (s *spaceStorage) ACLStorage() (liststorage.ListStorage, error) { return s.aclStorage, nil } diff --git a/client/storage/spacestorage_test.go b/client/storage/spacestorage_test.go index 10b29f6d..8083d2f0 100644 --- a/client/storage/spacestorage_test.go +++ b/client/storage/spacestorage_test.go @@ -1,10 +1,10 @@ package storage import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/stretchr/testify/require" "sort" "strconv" diff --git a/client/storage/storageservice.go b/client/storage/storageservice.go index 43b9c6f4..b7f8e851 100644 --- a/client/storage/storageservice.go +++ b/client/storage/storageservice.go @@ -4,7 +4,7 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/badgerprovider" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/dgraph-io/badger/v3" ) @@ -14,7 +14,7 @@ type storageService struct { } type ClientStorage interface { - storage.SpaceStorageProvider + spacestorage.SpaceStorageProvider app.ComponentRunnable AllSpaceIds() (ids []string, err error) } @@ -31,14 +31,14 @@ func (s *storageService) Init(a *app.App) (err error) { } func (s *storageService) Name() (name string) { - return storage.CName + return spacestorage.CName } -func (s *storageService) SpaceStorage(id string) (storage.SpaceStorage, error) { +func (s *storageService) SpaceStorage(id string) (spacestorage.SpaceStorage, error) { return newSpaceStorage(s.db, id) } -func (s *storageService) CreateSpaceStorage(payload storage.SpaceStorageCreatePayload) (storage.SpaceStorage, error) { +func (s *storageService) CreateSpaceStorage(payload spacestorage.SpaceStorageCreatePayload) (spacestorage.SpaceStorage, error) { return createSpaceStorage(s.db, payload) } diff --git a/client/storage/treestorage.go b/client/storage/treestorage.go index fe96516d..3e60a704 100644 --- a/client/storage/treestorage.go +++ b/client/storage/treestorage.go @@ -2,8 +2,8 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/dgraph-io/badger/v3" ) @@ -14,7 +14,7 @@ type treeStorage struct { root *treechangeproto.RawTreeChangeWithId } -func newTreeStorage(db *badger.DB, spaceId, treeId string) (ts storage.TreeStorage, err error) { +func newTreeStorage(db *badger.DB, spaceId, treeId string) (ts treestorage.TreeStorage, err error) { keys := newTreeKeys(spaceId, treeId) err = db.View(func(txn *badger.Txn) error { _, err := txn.Get(keys.RootIdKey()) @@ -41,19 +41,19 @@ func newTreeStorage(db *badger.DB, spaceId, treeId string) (ts storage.TreeStora return nil }) if err == badger.ErrKeyNotFound { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId } return } -func createTreeStorage(db *badger.DB, spaceId string, payload storage.TreeStorageCreatePayload) (ts storage.TreeStorage, err error) { +func createTreeStorage(db *badger.DB, spaceId string, payload treestorage.TreeStorageCreatePayload) (ts treestorage.TreeStorage, err error) { keys := newTreeKeys(spaceId, payload.RootRawChange.Id) if hasDB(db, keys.RootIdKey()) { - err = storage.ErrTreeExists + err = treestorage.ErrTreeExists return } err = db.Update(func(txn *badger.Txn) error { - heads := storage.CreateHeadsPayload(payload.Heads) + heads := treestorage.CreateHeadsPayload(payload.Heads) for _, ch := range payload.Changes { err = txn.Set(keys.RawChangeKey(ch.Id), ch.GetRawChange()) @@ -100,16 +100,16 @@ func (t *treeStorage) Heads() (heads []string, err error) { headsBytes, err := getDB(t.db, t.keys.HeadsKey()) if err != nil { if err == badger.ErrKeyNotFound { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId } return } - heads = storage.ParseHeads(headsBytes) + heads = treestorage.ParseHeads(headsBytes) return } func (t *treeStorage) SetHeads(heads []string) (err error) { - payload := storage.CreateHeadsPayload(heads) + payload := treestorage.CreateHeadsPayload(heads) return putDB(t.db, t.keys.HeadsKey(), payload) } @@ -121,7 +121,7 @@ func (t *treeStorage) GetRawChange(ctx context.Context, id string) (raw *treecha res, err := getDB(t.db, t.keys.RawChangeKey(id)) if err != nil { if err == badger.ErrKeyNotFound { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId } return } diff --git a/client/storage/treestorage_test.go b/client/storage/treestorage_test.go index 43ff6b27..a5c6e4c0 100644 --- a/client/storage/treestorage_test.go +++ b/client/storage/treestorage_test.go @@ -2,19 +2,19 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/dgraph-io/badger/v3" "github.com/stretchr/testify/require" "os" "testing" ) -func treeTestPayload() storage.TreeStorageCreatePayload { +func treeTestPayload() treestorage.TreeStorageCreatePayload { rootRawChange := &treechangeproto.RawTreeChangeWithId{RawChange: []byte("some"), Id: "someRootId"} otherChange := &treechangeproto.RawTreeChangeWithId{RawChange: []byte("some other"), Id: "otherId"} changes := []*treechangeproto.RawTreeChangeWithId{rootRawChange, otherChange} - return storage.TreeStorageCreatePayload{ + return treestorage.TreeStorageCreatePayload{ RootRawChange: rootRawChange, Changes: changes, Heads: []string{rootRawChange.Id}, @@ -26,7 +26,7 @@ type fixture struct { db *badger.DB } -func testTreePayload(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) { +func testTreePayload(t *testing.T, store treestorage.TreeStorage, payload treestorage.TreeStorageCreatePayload) { require.Equal(t, payload.RootRawChange.Id, store.Id()) root, err := store.Root() @@ -181,7 +181,7 @@ func TestTreeStorage_Delete(t *testing.T) { require.NoError(t, err) _, err = newTreeStorage(fx.db, spaceId, payload.RootRawChange.Id) - require.Equal(t, err, storage.ErrUnknownTreeId) + require.Equal(t, err, treestorage.ErrUnknownTreeId) fx.testNoKeysExist(t, spaceId, payload.RootRawChange.Id) }) diff --git a/common/account/service.go b/common/accountservice/accountservice.go similarity index 58% rename from common/account/service.go rename to common/accountservice/accountservice.go index 23b279b2..e7ff7341 100644 --- a/common/account/service.go +++ b/common/accountservice/accountservice.go @@ -1,17 +1,17 @@ -//go:generate mockgen -destination mock_account/mock_account.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/account Service -package account +//go:generate mockgen -destination mock_accountservice/mock_accountservice.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice Service +package accountservice import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" ) const CName = "common.account" type Service interface { app.Component - Account() *account.AccountData + Account() *accountdata.AccountData } type ConfigGetter interface { diff --git a/common/account/mock_account/mock_account.go b/common/accountservice/mock_accountservice/mock_accountservice.go similarity index 85% rename from common/account/mock_account/mock_account.go rename to common/accountservice/mock_accountservice/mock_accountservice.go index 6f6d3b54..11f1df88 100644 --- a/common/account/mock_account/mock_account.go +++ b/common/accountservice/mock_accountservice/mock_accountservice.go @@ -1,14 +1,14 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/account (interfaces: Service) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice (interfaces: Service) -// Package mock_account is a generated GoMock package. -package mock_account +// Package mock_accountservice is a generated GoMock package. +package mock_accountservice import ( reflect "reflect" app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - account "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" + accountdata "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" gomock "github.com/golang/mock/gomock" ) @@ -36,10 +36,10 @@ func (m *MockService) EXPECT() *MockServiceMockRecorder { } // Account mocks base method. -func (m *MockService) Account() *account.AccountData { +func (m *MockService) Account() *accountdata.AccountData { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Account") - ret0, _ := ret[0].(*account.AccountData) + ret0, _ := ret[0].(*accountdata.AccountData) return ret0 } diff --git a/common/pkg/ldiff/diff.go b/common/app/ldiff/diff.go similarity index 98% rename from common/pkg/ldiff/diff.go rename to common/app/ldiff/diff.go index 68b0f115..cce15fa5 100644 --- a/common/pkg/ldiff/diff.go +++ b/common/app/ldiff/diff.go @@ -1,7 +1,7 @@ // Package ldiff provides a container of elements with fixed id and changeable content. // Diff can calculate the difference with another diff container (you can make it remote) with minimum hops and traffic. // -//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff Diff,Remote +//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff Diff,Remote package ldiff import ( diff --git a/common/pkg/ldiff/diff_test.go b/common/app/ldiff/diff_test.go similarity index 100% rename from common/pkg/ldiff/diff_test.go rename to common/app/ldiff/diff_test.go diff --git a/common/pkg/ldiff/mock_ldiff/mock_ldiff.go b/common/app/ldiff/mock_ldiff/mock_ldiff.go similarity index 98% rename from common/pkg/ldiff/mock_ldiff/mock_ldiff.go rename to common/app/ldiff/mock_ldiff/mock_ldiff.go index d2170600..ad01feb2 100644 --- a/common/pkg/ldiff/mock_ldiff/mock_ldiff.go +++ b/common/app/ldiff/mock_ldiff/mock_ldiff.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff (interfaces: Diff,Remote) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff (interfaces: Diff,Remote) // Package mock_ldiff is a generated GoMock package. package mock_ldiff @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - ldiff "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" + ldiff "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" gomock "github.com/golang/mock/gomock" ) diff --git a/common/pkg/ocache/metrics.go b/common/app/ocache/metrics.go similarity index 100% rename from common/pkg/ocache/metrics.go rename to common/app/ocache/metrics.go diff --git a/common/pkg/ocache/ocache.go b/common/app/ocache/ocache.go similarity index 99% rename from common/pkg/ocache/ocache.go rename to common/app/ocache/ocache.go index 31a788ce..04575750 100644 --- a/common/pkg/ocache/ocache.go +++ b/common/app/ocache/ocache.go @@ -87,9 +87,9 @@ type entry struct { refCount uint32 isClosing bool load chan struct{} - loadErr error - value Object - close chan struct{} + loadErr error + value Object + close chan struct{} } func (e *entry) locked() bool { diff --git a/common/pkg/ocache/ocache_test.go b/common/app/ocache/ocache_test.go similarity index 100% rename from common/pkg/ocache/ocache_test.go rename to common/app/ocache/ocache_test.go diff --git a/common/commonspace/commongetter.go b/common/commonspace/commongetter.go index 6dbeb99c..6f28b51d 100644 --- a/common/commonspace/commongetter.go +++ b/common/commonspace/commongetter.go @@ -2,10 +2,10 @@ package commonspace import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectgetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/syncacl" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/syncobjectgetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" ) type commonSpaceGetter struct { @@ -15,7 +15,7 @@ type commonSpaceGetter struct { settings settings.SettingsObject } -func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settings.SettingsObject) objectgetter.ObjectGetter { +func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settings.SettingsObject) syncobjectgetter.SyncObjectGetter { return &commonSpaceGetter{ spaceId: spaceId, aclList: aclList, @@ -24,19 +24,19 @@ func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter t } } -func (c *commonSpaceGetter) GetObject(ctx context.Context, objectId string) (obj objectgetter.Object, err error) { +func (c *commonSpaceGetter) GetObject(ctx context.Context, objectId string) (obj syncobjectgetter.SyncObject, err error) { if c.aclList.ID() == objectId { obj = c.aclList return } if c.settings.ID() == objectId { - obj = c.settings.(objectgetter.Object) + obj = c.settings.(syncobjectgetter.SyncObject) return } t, err := c.treeGetter.GetTree(ctx, c.spaceId, objectId) if err != nil { return } - obj = t.(objectgetter.Object) + obj = t.(syncobjectgetter.SyncObject) return } diff --git a/common/commonspace/commonstorage.go b/common/commonspace/commonstorage.go index 3299f54e..aaa3f22b 100644 --- a/common/commonspace/commonstorage.go +++ b/common/commonspace/commonstorage.go @@ -1,15 +1,15 @@ package commonspace import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" ) type commonStorage struct { - storage.SpaceStorage + spacestorage.SpaceStorage } -func newCommonStorage(spaceStorage storage.SpaceStorage) storage.SpaceStorage { +func newCommonStorage(spaceStorage spacestorage.SpaceStorage) spacestorage.SpaceStorage { return &commonStorage{ SpaceStorage: spaceStorage, } @@ -23,6 +23,6 @@ func (c *commonStorage) CreateTreeStorage(payload treestorage.TreeStorageCreateP if status == "" { return c.SpaceStorage.CreateTreeStorage(payload) } - err = storage.ErrTreeStorageAlreadyDeleted + err = spacestorage.ErrTreeStorageAlreadyDeleted return } diff --git a/common/commonspace/headsync/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go index 0cd0143d..ccbe96c7 100644 --- a/common/commonspace/headsync/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -2,16 +2,16 @@ package headsync import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/rpcerr" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" "go.uber.org/zap" "time" ) @@ -28,7 +28,7 @@ func newDiffSyncer( diff ldiff.Diff, confConnector nodeconf.ConfConnector, cache treegetter.TreeGetter, - storage storage.SpaceStorage, + storage spacestorage.SpaceStorage, clientFactory spacesyncproto.ClientFactory, syncStatus syncstatus.SyncStatusUpdater, log *zap.Logger) DiffSyncer { @@ -49,7 +49,7 @@ type diffSyncer struct { diff ldiff.Diff confConnector nodeconf.ConfConnector cache treegetter.TreeGetter - storage storage.SpaceStorage + storage spacestorage.SpaceStorage clientFactory spacesyncproto.ClientFactory log *zap.Logger deletionState deletionstate.DeletionState diff --git a/common/commonspace/headsync/diffsyncer_test.go b/common/commonspace/headsync/diffsyncer_test.go index bcdf3c30..6dfe9cbe 100644 --- a/common/commonspace/headsync/diffsyncer_test.go +++ b/common/commonspace/headsync/diffsyncer_test.go @@ -3,21 +3,20 @@ package headsync import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff/mock_ldiff" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + mock_treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage/mock_treestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto/mock_spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf/mock_nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - mock_aclstorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage/mock_storage" - mock_treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage/mock_storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff/mock_ldiff" "github.com/golang/mock/gomock" "github.com/libp2p/go-libp2p/core/sec" "github.com/stretchr/testify/require" @@ -101,7 +100,7 @@ func TestDiffSyncer_Sync(t *testing.T) { diffMock := mock_ldiff.NewMockDiff(ctrl) connectorMock := mock_nodeconf.NewMockConfConnector(ctrl) cacheMock := mock_treegetter.NewMockTreeGetter(ctrl) - stMock := mock_storage.NewMockSpaceStorage(ctrl) + stMock := mock_spacestorage.NewMockSpaceStorage(ctrl) clientMock := mock_spacesyncproto.NewMockDRPCSpaceClient(ctrl) factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceClient { return clientMock @@ -158,7 +157,7 @@ func TestDiffSyncer_Sync(t *testing.T) { }) t.Run("diff syncer sync space missing", func(t *testing.T) { - aclStorageMock := mock_aclstorage.NewMockListStorage(ctrl) + aclStorageMock := mock_treestorage.NewMockListStorage(ctrl) settingsStorage := mock_treestorage.NewMockTreeStorage(ctrl) settingsId := "settingsId" aclRoot := &aclrecordproto.RawACLRecordWithId{ diff --git a/common/commonspace/headsync/headsync.go b/common/commonspace/headsync/headsync.go index 163387a9..d6e527db 100644 --- a/common/commonspace/headsync/headsync.go +++ b/common/commonspace/headsync/headsync.go @@ -3,13 +3,13 @@ package headsync import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync" "go.uber.org/zap" "strings" @@ -35,7 +35,7 @@ type HeadSync interface { type headSync struct { spaceId string periodicSync periodicsync.PeriodicSync - storage storage.SpaceStorage + storage spacestorage.SpaceStorage diff ldiff.Diff log *zap.Logger syncer DiffSyncer @@ -46,7 +46,7 @@ type headSync struct { func NewHeadSync( spaceId string, syncPeriod int, - storage storage.SpaceStorage, + storage spacestorage.SpaceStorage, confConnector nodeconf.ConfConnector, cache treegetter.TreeGetter, syncStatus syncstatus.SyncStatusUpdater, diff --git a/common/commonspace/headsync/headsync_test.go b/common/commonspace/headsync/headsync_test.go index 005c18c2..18a35559 100644 --- a/common/commonspace/headsync/headsync_test.go +++ b/common/commonspace/headsync/headsync_test.go @@ -1,13 +1,13 @@ package headsync import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff/mock_ldiff" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync/mock_headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage/mock_treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" - mock_storage2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage/mock_storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff/mock_ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync/mock_periodicsync" "github.com/golang/mock/gomock" "testing" @@ -20,8 +20,8 @@ func TestDiffService(t *testing.T) { spaceId := "spaceId" l := logger.NewNamed("sync") pSyncMock := mock_periodicsync.NewMockPeriodicSync(ctrl) - storageMock := mock_storage.NewMockSpaceStorage(ctrl) - treeStorageMock := mock_storage2.NewMockTreeStorage(ctrl) + storageMock := mock_spacestorage.NewMockSpaceStorage(ctrl) + treeStorageMock := mock_treestorage.NewMockTreeStorage(ctrl) diffMock := mock_ldiff.NewMockDiff(ctrl) syncer := mock_headsync.NewMockDiffSyncer(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl) diff --git a/common/commonspace/headsync/remotediff.go b/common/commonspace/headsync/remotediff.go index 4fda2241..96b8363f 100644 --- a/common/commonspace/headsync/remotediff.go +++ b/common/commonspace/headsync/remotediff.go @@ -2,8 +2,8 @@ package headsync import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" ) type Client interface { diff --git a/common/commonspace/headsync/remotediff_test.go b/common/commonspace/headsync/remotediff_test.go index aae8e392..29c07fb4 100644 --- a/common/commonspace/headsync/remotediff_test.go +++ b/common/commonspace/headsync/remotediff_test.go @@ -3,8 +3,8 @@ package headsync import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ldiff" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/common/pkg/acl/account/accountdata.go b/common/commonspace/object/accountdata/accountdata.go similarity index 95% rename from common/pkg/acl/account/accountdata.go rename to common/commonspace/object/accountdata/accountdata.go index 13bcf342..9331e2fe 100644 --- a/common/pkg/acl/account/accountdata.go +++ b/common/commonspace/object/accountdata/accountdata.go @@ -1,4 +1,4 @@ -package account +package accountdata import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" diff --git a/common/pkg/acl/aclrecordproto/aclreadkeyderive.go b/common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go similarity index 100% rename from common/pkg/acl/aclrecordproto/aclreadkeyderive.go rename to common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go diff --git a/common/pkg/acl/aclrecordproto/aclrecord.pb.go b/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go similarity index 100% rename from common/pkg/acl/aclrecordproto/aclrecord.pb.go rename to common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go diff --git a/common/pkg/acl/aclrecordproto/protos/aclrecord.proto b/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto similarity index 100% rename from common/pkg/acl/aclrecordproto/protos/aclrecord.proto rename to common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto diff --git a/common/pkg/acl/list/aclrecordbuilder.go b/common/commonspace/object/acl/list/aclrecordbuilder.go similarity index 93% rename from common/pkg/acl/list/aclrecordbuilder.go rename to common/commonspace/object/acl/list/aclrecordbuilder.go index bb99f7bc..cfd8cfac 100644 --- a/common/pkg/acl/list/aclrecordbuilder.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder.go @@ -1,9 +1,9 @@ package list import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "github.com/gogo/protobuf/proto" @@ -18,10 +18,10 @@ type ACLRecordBuilder interface { type aclRecordBuilder struct { id string - keychain *common.Keychain + keychain *keychain.Keychain } -func newACLRecordBuilder(id string, keychain *common.Keychain) ACLRecordBuilder { +func newACLRecordBuilder(id string, keychain *keychain.Keychain) ACLRecordBuilder { return &aclRecordBuilder{ id: id, keychain: keychain, @@ -150,7 +150,7 @@ func (a *aclRecordBuilder) ConvertFromRaw(rawIdRecord *aclrecordproto.RawACLReco } func verifyRaw( - keychain *common.Keychain, + keychain *keychain.Keychain, rawRec *aclrecordproto.RawACLRecord, recWithId *aclrecordproto.RawACLRecordWithId, identity []byte) (err error) { @@ -170,7 +170,7 @@ func verifyRaw( } // verifying ID - if !cid.VerifyCID(recWithId.Payload, recWithId.Id) { + if !cidutil.VerifyCID(recWithId.Payload, recWithId.Id) { err = ErrIncorrectCID } return diff --git a/common/pkg/acl/list/aclrecordbuilder_test.go b/common/commonspace/object/acl/list/aclrecordbuilder_test.go similarity index 58% rename from common/pkg/acl/list/aclrecordbuilder_test.go rename to common/commonspace/object/acl/list/aclrecordbuilder_test.go index a804bcb4..2094db82 100644 --- a/common/pkg/acl/list/aclrecordbuilder_test.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder_test.go @@ -1,25 +1,25 @@ package list import ( - account "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/testutils/acllistbuilder" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + acllistbuilder2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/testutils/acllistbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/stretchr/testify/require" "testing" ) func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { - st, err := acllistbuilder.NewListStorageWithTestName("userjoinexample.yml") + st, err := acllistbuilder2.NewListStorageWithTestName("userjoinexample.yml") require.NoError(t, err, "building storage should not result in error") - keychain := st.(*acllistbuilder.ACLListStorageBuilder).GetKeychain() - identity := keychain.GeneratedIdentities["D"] - signPrivKey := keychain.SigningKeysByYAMLName["D"] - encPrivKey := keychain.EncryptionKeysByYAMLName["D"] - acc := &account.AccountData{ + testKeychain := st.(*acllistbuilder2.ACLListStorageBuilder).GetKeychain() + identity := testKeychain.GeneratedIdentities["D"] + signPrivKey := testKeychain.SigningKeysByYAMLName["D"] + encPrivKey := testKeychain.EncryptionKeysByYAMLName["D"] + acc := &accountdata.AccountData{ Identity: []byte(identity), SignKey: signPrivKey, EncKey: encPrivKey, @@ -27,17 +27,17 @@ func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { aclList, err := BuildACLListWithIdentity(acc, st) require.NoError(t, err, "building acl list should be without error") - recordBuilder := newACLRecordBuilder(aclList.ID(), common.NewKeychain()) - rk, err := keychain.GetKey("key.Read.EncKey").(*acllistbuilder.SymKey).Key.Raw() + recordBuilder := newACLRecordBuilder(aclList.ID(), keychain.NewKeychain()) + rk, err := testKeychain.GetKey("key.Read.EncKey").(*acllistbuilder2.SymKey).Key.Raw() require.NoError(t, err) - privKey, err := keychain.GetKey("key.Sign.Onetime1").(signingkey.PrivKey).Raw() + privKey, err := testKeychain.GetKey("key.Sign.Onetime1").(signingkey.PrivKey).Raw() require.NoError(t, err) userJoin, err := recordBuilder.BuildUserJoin(privKey, rk, aclList.ACLState()) require.NoError(t, err) marshalledJoin, err := userJoin.Marshal() require.NoError(t, err) - id, err := cid.NewCIDFromBytes(marshalledJoin) + id, err := cidutil.NewCIDFromBytes(marshalledJoin) require.NoError(t, err) rawRec := &aclrecordproto.RawACLRecordWithId{ Payload: marshalledJoin, diff --git a/common/pkg/acl/list/aclstate.go b/common/commonspace/object/acl/list/aclstate.go similarity index 75% rename from common/pkg/acl/list/aclstate.go rename to common/commonspace/object/acl/list/aclstate.go index 90a33c5c..527d829a 100644 --- a/common/pkg/acl/list/aclstate.go +++ b/common/commonspace/object/acl/list/aclstate.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" + aclrecordproto2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" @@ -18,31 +18,33 @@ import ( var log = logger.NewNamed("acllist").Sugar() -var ErrNoSuchUser = errors.New("no such user") -var ErrFailedToDecrypt = errors.New("failed to decrypt key") -var ErrUserRemoved = errors.New("user was removed from the document") -var ErrDocumentForbidden = errors.New("your user was forbidden access to the document") -var ErrUserAlreadyExists = errors.New("user already exists") -var ErrNoSuchRecord = errors.New("no such record") -var ErrNoSuchInvite = errors.New("no such invite") -var ErrOldInvite = errors.New("invite is too old") -var ErrInsufficientPermissions = errors.New("insufficient permissions") -var ErrNoReadKey = errors.New("acl state doesn't have a read key") -var ErrInvalidSignature = errors.New("signature is invalid") -var ErrIncorrectRoot = errors.New("incorrect root") -var ErrIncorrectRecordSequence = errors.New("incorrect prev id of a record") +var ( + ErrNoSuchUser = errors.New("no such user") + ErrFailedToDecrypt = errors.New("failed to decrypt key") + ErrUserRemoved = errors.New("user was removed from the document") + ErrDocumentForbidden = errors.New("your user was forbidden access to the document") + ErrUserAlreadyExists = errors.New("user already exists") + ErrNoSuchRecord = errors.New("no such record") + ErrNoSuchInvite = errors.New("no such invite") + ErrOldInvite = errors.New("invite is too old") + ErrInsufficientPermissions = errors.New("insufficient permissions") + ErrNoReadKey = errors.New("acl state doesn't have a read key") + ErrInvalidSignature = errors.New("signature is invalid") + ErrIncorrectRoot = errors.New("incorrect root") + ErrIncorrectRecordSequence = errors.New("incorrect prev id of a record") +) type UserPermissionPair struct { Identity string - Permission aclrecordproto.ACLUserPermissions + Permission aclrecordproto2.ACLUserPermissions } type ACLState struct { id string currentReadKeyHash uint64 userReadKeys map[uint64]*symmetric.Key - userStates map[string]*aclrecordproto.ACLUserState - userInvites map[string]*aclrecordproto.ACLUserInvite + userStates map[string]*aclrecordproto2.ACLUserState + userInvites map[string]*aclrecordproto2.ACLUserInvite encryptionKey encryptionkey.PrivKey signingKey signingkey.PrivKey totalReadKeys int @@ -51,7 +53,7 @@ type ACLState struct { permissionsAtRecord map[string][]UserPermissionPair lastRecordId string - keychain *common.Keychain + keychain *keychain.Keychain } func newACLStateWithKeys( @@ -68,8 +70,8 @@ func newACLStateWithKeys( signingKey: signingKey, encryptionKey: encryptionKey, userReadKeys: make(map[uint64]*symmetric.Key), - userStates: make(map[string]*aclrecordproto.ACLUserState), - userInvites: make(map[string]*aclrecordproto.ACLUserInvite), + userStates: make(map[string]*aclrecordproto2.ACLUserState), + userInvites: make(map[string]*aclrecordproto2.ACLUserInvite), permissionsAtRecord: make(map[string][]UserPermissionPair), }, nil } @@ -78,8 +80,8 @@ func newACLState(id string) *ACLState { return &ACLState{ id: id, userReadKeys: make(map[uint64]*symmetric.Key), - userStates: make(map[string]*aclrecordproto.ACLUserState), - userInvites: make(map[string]*aclrecordproto.ACLUserInvite), + userStates: make(map[string]*aclrecordproto2.ACLUserState), + userInvites: make(map[string]*aclrecordproto2.ACLUserInvite), permissionsAtRecord: make(map[string][]UserPermissionPair), } } @@ -126,7 +128,7 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } if record.Id == st.id { - root, ok := record.Model.(*aclrecordproto.ACLRoot) + root, ok := record.Model.(*aclrecordproto2.ACLRoot) if !ok { return ErrIncorrectRoot } @@ -135,14 +137,14 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } st.permissionsAtRecord[record.Id] = []UserPermissionPair{ - {Identity: string(root.Identity), Permission: aclrecordproto.ACLUserPermissions_Admin}, + {Identity: string(root.Identity), Permission: aclrecordproto2.ACLUserPermissions_Admin}, } return } - aclData := &aclrecordproto.ACLData{} + aclData := &aclrecordproto2.ACLData{} if record.Model != nil { - aclData = record.Model.(*aclrecordproto.ACLData) + aclData = record.Model.(*aclrecordproto2.ACLData) } else { err = proto.Unmarshal(record.Data, aclData) if err != nil { @@ -170,7 +172,7 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } -func (st *ACLState) applyRoot(root *aclrecordproto.ACLRoot) (err error) { +func (st *ACLState) applyRoot(root *aclrecordproto2.ACLRoot) (err error) { if st.signingKey != nil && st.encryptionKey != nil && st.identity == string(root.Identity) { err = st.saveReadKeyFromRoot(root) if err != nil { @@ -179,10 +181,10 @@ func (st *ACLState) applyRoot(root *aclrecordproto.ACLRoot) (err error) { } // adding user to the list - userState := &aclrecordproto.ACLUserState{ + userState := &aclrecordproto2.ACLUserState{ Identity: root.Identity, EncryptionKey: root.EncryptionKey, - Permissions: aclrecordproto.ACLUserPermissions_Admin, + Permissions: aclrecordproto2.ACLUserPermissions_Admin, } st.currentReadKeyHash = root.CurrentReadKeyHash st.userStates[string(root.Identity)] = userState @@ -190,7 +192,7 @@ func (st *ACLState) applyRoot(root *aclrecordproto.ACLRoot) (err error) { return } -func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto.ACLRoot) (err error) { +func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto2.ACLRoot) (err error) { var readKey *symmetric.Key if len(root.GetDerivationScheme()) != 0 { var encPrivKey []byte @@ -204,7 +206,7 @@ func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto.ACLRoot) (err error return } - readKey, err = aclrecordproto.ACLReadKeyDerive(signPrivKey, encPrivKey) + readKey, err = aclrecordproto2.ACLReadKeyDerive(signPrivKey, encPrivKey) if err != nil { return } @@ -228,7 +230,7 @@ func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto.ACLRoot) (err error return } -func (st *ACLState) applyChangeData(changeData *aclrecordproto.ACLData, hash uint64, identity []byte) (err error) { +func (st *ACLState) applyChangeData(changeData *aclrecordproto2.ACLData, hash uint64, identity []byte) (err error) { defer func() { if err != nil { return @@ -246,7 +248,7 @@ func (st *ACLState) applyChangeData(changeData *aclrecordproto.ACLData, hash uin return } - if !st.HasPermission(identity, aclrecordproto.ACLUserPermissions_Admin) { + if !st.HasPermission(identity, aclrecordproto2.ACLUserPermissions_Admin) { err = fmt.Errorf("user %s must have admin permissions", identity) return } @@ -262,7 +264,7 @@ func (st *ACLState) applyChangeData(changeData *aclrecordproto.ACLData, hash uin return nil } -func (st *ACLState) applyChangeContent(ch *aclrecordproto.ACLContentValue) error { +func (st *ACLState) applyChangeContent(ch *aclrecordproto2.ACLContentValue) error { switch { case ch.GetUserPermissionChange() != nil: return st.applyUserPermissionChange(ch.GetUserPermissionChange()) @@ -279,7 +281,7 @@ func (st *ACLState) applyChangeContent(ch *aclrecordproto.ACLContentValue) error } } -func (st *ACLState) applyUserPermissionChange(ch *aclrecordproto.ACLUserPermissionChange) error { +func (st *ACLState) applyUserPermissionChange(ch *aclrecordproto2.ACLUserPermissionChange) error { chIdentity := string(ch.Identity) state, exists := st.userStates[chIdentity] if !exists { @@ -290,12 +292,12 @@ func (st *ACLState) applyUserPermissionChange(ch *aclrecordproto.ACLUserPermissi return nil } -func (st *ACLState) applyUserInvite(ch *aclrecordproto.ACLUserInvite) error { +func (st *ACLState) applyUserInvite(ch *aclrecordproto2.ACLUserInvite) error { st.userInvites[string(ch.AcceptPublicKey)] = ch return nil } -func (st *ACLState) applyUserJoin(ch *aclrecordproto.ACLUserJoin) error { +func (st *ACLState) applyUserJoin(ch *aclrecordproto2.ACLUserJoin) error { invite, exists := st.userInvites[string(ch.AcceptPubKey)] if !exists { return fmt.Errorf("no such invite with such public key %s", keys.EncodeBytesToString(ch.AcceptPubKey)) @@ -334,7 +336,7 @@ func (st *ACLState) applyUserJoin(ch *aclrecordproto.ACLUserJoin) error { } // adding user to the list - userState := &aclrecordproto.ACLUserState{ + userState := &aclrecordproto2.ACLUserState{ Identity: ch.Identity, EncryptionKey: ch.EncryptionKey, Permissions: invite.Permissions, @@ -343,13 +345,13 @@ func (st *ACLState) applyUserJoin(ch *aclrecordproto.ACLUserJoin) error { return nil } -func (st *ACLState) applyUserAdd(ch *aclrecordproto.ACLUserAdd) error { +func (st *ACLState) applyUserAdd(ch *aclrecordproto2.ACLUserAdd) error { chIdentity := string(ch.Identity) if _, exists := st.userStates[chIdentity]; exists { return ErrUserAlreadyExists } - st.userStates[chIdentity] = &aclrecordproto.ACLUserState{ + st.userStates[chIdentity] = &aclrecordproto2.ACLUserState{ Identity: ch.Identity, EncryptionKey: ch.EncryptionKey, Permissions: ch.Permissions, @@ -369,7 +371,7 @@ func (st *ACLState) applyUserAdd(ch *aclrecordproto.ACLUserAdd) error { return nil } -func (st *ACLState) applyUserRemove(ch *aclrecordproto.ACLUserRemove) error { +func (st *ACLState) applyUserRemove(ch *aclrecordproto2.ACLUserRemove) error { chIdentity := string(ch.Identity) if chIdentity == st.identity { return ErrDocumentForbidden @@ -413,7 +415,7 @@ func (st *ACLState) decryptReadKeyAndHash(msg []byte) (*symmetric.Key, uint64, e return key, hasher.Sum64(), nil } -func (st *ACLState) HasPermission(identity []byte, permission aclrecordproto.ACLUserPermissions) bool { +func (st *ACLState) HasPermission(identity []byte, permission aclrecordproto2.ACLUserPermissions) bool { state, exists := st.userStates[string(identity)] if !exists { return false @@ -422,22 +424,22 @@ func (st *ACLState) HasPermission(identity []byte, permission aclrecordproto.ACL return state.Permissions == permission } -func (st *ACLState) isUserJoin(data *aclrecordproto.ACLData) bool { +func (st *ACLState) isUserJoin(data *aclrecordproto2.ACLData) bool { // if we have a UserJoin, then it should always be the first one applied return data.GetAclContent() != nil && data.GetAclContent()[0].GetUserJoin() != nil } -func (st *ACLState) isUserAdd(data *aclrecordproto.ACLData, identity []byte) bool { +func (st *ACLState) isUserAdd(data *aclrecordproto2.ACLData, identity []byte) bool { // if we have a UserAdd, then it should always be the first one applied userAdd := data.GetAclContent()[0].GetUserAdd() return data.GetAclContent() != nil && userAdd != nil && bytes.Compare(userAdd.GetIdentity(), identity) == 0 } -func (st *ACLState) UserStates() map[string]*aclrecordproto.ACLUserState { +func (st *ACLState) UserStates() map[string]*aclrecordproto2.ACLUserState { return st.userStates } -func (st *ACLState) Invite(acceptPubKey []byte) (invite *aclrecordproto.ACLUserInvite, err error) { +func (st *ACLState) Invite(acceptPubKey []byte) (invite *aclrecordproto2.ACLUserInvite, err error) { invite, exists := st.userInvites[string(acceptPubKey)] if !exists { err = ErrNoSuchInvite diff --git a/common/pkg/acl/list/aclstatebuilder.go b/common/commonspace/object/acl/list/aclstatebuilder.go similarity index 90% rename from common/pkg/acl/list/aclstatebuilder.go rename to common/commonspace/object/acl/list/aclstatebuilder.go index 2ef79cd5..d501ab1d 100644 --- a/common/pkg/acl/list/aclstatebuilder.go +++ b/common/commonspace/object/acl/list/aclstatebuilder.go @@ -1,7 +1,7 @@ package list import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) @@ -12,7 +12,7 @@ type aclStateBuilder struct { id string } -func newACLStateBuilderWithIdentity(accountData *account.AccountData) *aclStateBuilder { +func newACLStateBuilderWithIdentity(accountData *accountdata.AccountData) *aclStateBuilder { return &aclStateBuilder{ signPrivKey: accountData.SignKey, encPrivKey: accountData.EncKey, diff --git a/common/pkg/acl/list/list.go b/common/commonspace/object/acl/list/list.go similarity index 87% rename from common/pkg/acl/list/list.go rename to common/commonspace/object/acl/list/list.go index e2f486d2..e67ef2cd 100644 --- a/common/pkg/acl/list/list.go +++ b/common/commonspace/object/acl/list/list.go @@ -1,14 +1,14 @@ -//go:generate mockgen -destination mock_list/mock_list.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list ACLList +//go:generate mockgen -destination mock_list/mock_list.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list ACLList package list import ( "context" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" "sync" ) @@ -48,22 +48,22 @@ type aclList struct { stateBuilder *aclStateBuilder recordBuilder ACLRecordBuilder aclState *ACLState - keychain *common.Keychain - storage storage.ListStorage + keychain *keychain.Keychain + storage liststorage.ListStorage sync.RWMutex } -func BuildACLListWithIdentity(acc *account.AccountData, storage storage.ListStorage) (ACLList, error) { +func BuildACLListWithIdentity(acc *accountdata.AccountData, storage liststorage.ListStorage) (ACLList, error) { builder := newACLStateBuilderWithIdentity(acc) - return build(storage.Id(), builder, newACLRecordBuilder(storage.Id(), common.NewKeychain()), storage) + return build(storage.Id(), builder, newACLRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) } -func BuildACLList(storage storage.ListStorage) (ACLList, error) { - return build(storage.Id(), newACLStateBuilder(), newACLRecordBuilder(storage.Id(), common.NewKeychain()), storage) +func BuildACLList(storage liststorage.ListStorage) (ACLList, error) { + return build(storage.Id(), newACLStateBuilder(), newACLRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) } -func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder, storage storage.ListStorage) (list ACLList, err error) { +func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder, storage liststorage.ListStorage) (list ACLList, err error) { head, err := storage.Head() if err != nil { return diff --git a/common/pkg/acl/list/list_test.go b/common/commonspace/object/acl/list/list_test.go similarity index 97% rename from common/pkg/acl/list/list_test.go rename to common/commonspace/object/acl/list/list_test.go index c4effdae..79698db5 100644 --- a/common/pkg/acl/list/list_test.go +++ b/common/commonspace/object/acl/list/list_test.go @@ -1,8 +1,8 @@ package list import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/testutils/acllistbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/testutils/acllistbuilder" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/common/pkg/acl/list/mock_list/mock_list.go b/common/commonspace/object/acl/list/mock_list/mock_list.go similarity index 97% rename from common/pkg/acl/list/mock_list/mock_list.go rename to common/commonspace/object/acl/list/mock_list/mock_list.go index c70c183b..ef9d4551 100644 --- a/common/pkg/acl/list/mock_list/mock_list.go +++ b/common/commonspace/object/acl/list/mock_list/mock_list.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list (interfaces: ACLList) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list (interfaces: ACLList) // Package mock_list is a generated GoMock package. package mock_list @@ -7,8 +7,8 @@ package mock_list import ( reflect "reflect" - aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - list "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" + aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + list "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" gomock "github.com/golang/mock/gomock" ) diff --git a/common/pkg/acl/list/record.go b/common/commonspace/object/acl/list/record.go similarity index 100% rename from common/pkg/acl/list/record.go rename to common/commonspace/object/acl/list/record.go diff --git a/common/commonspace/object/acl/liststorage/inmemory.go b/common/commonspace/object/acl/liststorage/inmemory.go new file mode 100644 index 00000000..a0efa1ba --- /dev/null +++ b/common/commonspace/object/acl/liststorage/inmemory.go @@ -0,0 +1,78 @@ +package liststorage + +import ( + "context" + "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "sync" +) + +type inMemoryACLListStorage struct { + id string + root *aclrecordproto.RawACLRecordWithId + head string + records map[string]*aclrecordproto.RawACLRecordWithId + + sync.RWMutex +} + +func NewInMemoryACLListStorage( + id string, + records []*aclrecordproto.RawACLRecordWithId) (ListStorage, error) { + + allRecords := make(map[string]*aclrecordproto.RawACLRecordWithId) + for _, ch := range records { + allRecords[ch.Id] = ch + } + root := records[0] + head := records[len(records)-1] + + return &inMemoryACLListStorage{ + id: root.Id, + root: root, + head: head.Id, + records: allRecords, + }, nil +} + +func (t *inMemoryACLListStorage) Id() string { + t.RLock() + defer t.RUnlock() + return t.id +} + +func (t *inMemoryACLListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { + t.RLock() + defer t.RUnlock() + return t.root, nil +} + +func (t *inMemoryACLListStorage) Head() (string, error) { + t.RLock() + defer t.RUnlock() + return t.head, nil +} + +func (t *inMemoryACLListStorage) SetHead(head string) error { + t.Lock() + defer t.Unlock() + t.head = head + return nil +} + +func (t *inMemoryACLListStorage) AddRawRecord(ctx context.Context, record *aclrecordproto.RawACLRecordWithId) error { + t.Lock() + defer t.Unlock() + // TODO: better to do deep copy + t.records[record.Id] = record + return nil +} + +func (t *inMemoryACLListStorage) GetRawRecord(ctx context.Context, recordId string) (*aclrecordproto.RawACLRecordWithId, error) { + t.RLock() + defer t.RUnlock() + if res, exists := t.records[recordId]; exists { + return res, nil + } + return nil, fmt.Errorf("could not get record with id: %s", recordId) +} diff --git a/common/pkg/acl/storage/liststorage.go b/common/commonspace/object/acl/liststorage/liststorage.go similarity index 50% rename from common/pkg/acl/storage/liststorage.go rename to common/commonspace/object/acl/liststorage/liststorage.go index bfe47ab9..abc14cbd 100644 --- a/common/pkg/acl/storage/liststorage.go +++ b/common/commonspace/object/acl/liststorage/liststorage.go @@ -1,15 +1,17 @@ -//go:generate mockgen -destination mock_storage/mock_storage.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage ListStorage,TreeStorage -package storage +//go:generate mockgen -destination mock_liststorage/mock_liststorage.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage ListStorage +package liststorage import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" ) -var ErrUnknownACLId = errors.New("acl does not exist") -var ErrACLExists = errors.New("acl already exists") -var ErrUnknownRecord = errors.New("record doesn't exist") +var ( + ErrUnknownACLId = errors.New("acl does not exist") + ErrACLExists = errors.New("acl already exists") + ErrUnknownRecord = errors.New("record doesn't exist") +) type ListStorage interface { Id() string diff --git a/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go b/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go new file mode 100644 index 00000000..6000454e --- /dev/null +++ b/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go @@ -0,0 +1,123 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage (interfaces: ListStorage) + +// Package mock_liststorage is a generated GoMock package. +package mock_liststorage + +import ( + context "context" + reflect "reflect" + + aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + gomock "github.com/golang/mock/gomock" +) + +// MockListStorage is a mock of ListStorage interface. +type MockListStorage struct { + ctrl *gomock.Controller + recorder *MockListStorageMockRecorder +} + +// MockListStorageMockRecorder is the mock recorder for MockListStorage. +type MockListStorageMockRecorder struct { + mock *MockListStorage +} + +// NewMockListStorage creates a new mock instance. +func NewMockListStorage(ctrl *gomock.Controller) *MockListStorage { + mock := &MockListStorage{ctrl: ctrl} + mock.recorder = &MockListStorageMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockListStorage) EXPECT() *MockListStorageMockRecorder { + return m.recorder +} + +// AddRawRecord mocks base method. +func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *aclrecordproto.RawACLRecordWithId) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "AddRawRecord", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// AddRawRecord indicates an expected call of AddRawRecord. +func (mr *MockListStorageMockRecorder) AddRawRecord(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockListStorage)(nil).AddRawRecord), arg0, arg1) +} + +// GetRawRecord mocks base method. +func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*aclrecordproto.RawACLRecordWithId, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetRawRecord", arg0, arg1) + ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetRawRecord indicates an expected call of GetRawRecord. +func (mr *MockListStorageMockRecorder) GetRawRecord(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRawRecord", reflect.TypeOf((*MockListStorage)(nil).GetRawRecord), arg0, arg1) +} + +// Head mocks base method. +func (m *MockListStorage) Head() (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Head") + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Head indicates an expected call of Head. +func (mr *MockListStorageMockRecorder) Head() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Head", reflect.TypeOf((*MockListStorage)(nil).Head)) +} + +// Id mocks base method. +func (m *MockListStorage) Id() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Id") + ret0, _ := ret[0].(string) + return ret0 +} + +// Id indicates an expected call of Id. +func (mr *MockListStorageMockRecorder) Id() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockListStorage)(nil).Id)) +} + +// Root mocks base method. +func (m *MockListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Root") + ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Root indicates an expected call of Root. +func (mr *MockListStorageMockRecorder) Root() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Root", reflect.TypeOf((*MockListStorage)(nil).Root)) +} + +// SetHead mocks base method. +func (m *MockListStorage) SetHead(arg0 string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetHead", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetHead indicates an expected call of SetHead. +func (mr *MockListStorageMockRecorder) SetHead(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHead", reflect.TypeOf((*MockListStorage)(nil).SetHead), arg0) +} diff --git a/common/commonspace/syncacl/syncacl.go b/common/commonspace/object/acl/syncacl/syncacl.go similarity index 63% rename from common/commonspace/syncacl/syncacl.go rename to common/commonspace/object/acl/syncacl/syncacl.go index c7343625..cc84fdb7 100644 --- a/common/commonspace/syncacl/syncacl.go +++ b/common/commonspace/object/acl/syncacl/syncacl.go @@ -1,18 +1,18 @@ package syncacl import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" ) type SyncACL struct { list.ACLList synchandler.SyncHandler - streamPool syncservice.StreamPool + streamPool objectsync.StreamPool } -func NewSyncACL(aclList list.ACLList, streamPool syncservice.StreamPool) *SyncACL { +func NewSyncACL(aclList list.ACLList, streamPool objectsync.StreamPool) *SyncACL { return &SyncACL{ ACLList: aclList, SyncHandler: nil, diff --git a/common/commonspace/syncacl/syncaclhandler.go b/common/commonspace/object/acl/syncacl/syncaclhandler.go similarity index 92% rename from common/commonspace/syncacl/syncaclhandler.go rename to common/commonspace/object/acl/syncacl/syncaclhandler.go index feb78e07..8aa70722 100644 --- a/common/commonspace/syncacl/syncaclhandler.go +++ b/common/commonspace/object/acl/syncacl/syncaclhandler.go @@ -3,9 +3,9 @@ package syncacl import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" ) type syncAclHandler struct { diff --git a/common/pkg/acl/testutils/acllistbuilder/keychain.go b/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go similarity index 80% rename from common/pkg/acl/testutils/acllistbuilder/keychain.go rename to common/commonspace/object/acl/testutils/acllistbuilder/keychain.go index ff0b9b04..ba129ace 100644 --- a/common/pkg/acl/testutils/acllistbuilder/keychain.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go @@ -1,10 +1,10 @@ package acllistbuilder import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" - encryptionkey2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" - signingkey2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "hash/fnv" "strings" @@ -16,9 +16,9 @@ type SymKey struct { } type YAMLKeychain struct { - SigningKeysByYAMLName map[string]signingkey2.PrivKey - SigningKeysByRealIdentity map[string]signingkey2.PrivKey - EncryptionKeysByYAMLName map[string]encryptionkey2.PrivKey + SigningKeysByYAMLName map[string]signingkey.PrivKey + SigningKeysByRealIdentity map[string]signingkey.PrivKey + EncryptionKeysByYAMLName map[string]encryptionkey.PrivKey ReadKeysByYAMLName map[string]*SymKey ReadKeysByHash map[uint64]*SymKey GeneratedIdentities map[string]string @@ -26,9 +26,9 @@ type YAMLKeychain struct { func NewKeychain() *YAMLKeychain { return &YAMLKeychain{ - SigningKeysByYAMLName: map[string]signingkey2.PrivKey{}, - SigningKeysByRealIdentity: map[string]signingkey2.PrivKey{}, - EncryptionKeysByYAMLName: map[string]encryptionkey2.PrivKey{}, + SigningKeysByYAMLName: map[string]signingkey.PrivKey{}, + SigningKeysByRealIdentity: map[string]signingkey.PrivKey{}, + EncryptionKeysByYAMLName: map[string]encryptionkey.PrivKey{}, GeneratedIdentities: map[string]string{}, ReadKeysByYAMLName: map[string]*SymKey{}, ReadKeysByHash: map[uint64]*SymKey{}, @@ -54,16 +54,16 @@ func (k *YAMLKeychain) AddEncryptionKey(key *Key) { return } var ( - newPrivKey encryptionkey2.PrivKey + newPrivKey encryptionkey.PrivKey err error ) if key.Value == "generated" { - newPrivKey, _, err = encryptionkey2.GenerateRandomRSAKeyPair(2048) + newPrivKey, _, err = encryptionkey.GenerateRandomRSAKeyPair(2048) if err != nil { panic(err) } } else { - newPrivKey, err = keys.DecodeKeyFromString(key.Value, encryptionkey2.NewEncryptionRsaPrivKeyFromBytes, nil) + newPrivKey, err = keys.DecodeKeyFromString(key.Value, encryptionkey.NewEncryptionRsaPrivKeyFromBytes, nil) if err != nil { panic(err) } @@ -76,17 +76,17 @@ func (k *YAMLKeychain) AddSigningKey(key *Key) { return } var ( - newPrivKey signingkey2.PrivKey - pubKey signingkey2.PubKey + newPrivKey signingkey.PrivKey + pubKey signingkey.PubKey err error ) if key.Value == "generated" { - newPrivKey, pubKey, err = signingkey2.GenerateRandomEd25519KeyPair() + newPrivKey, pubKey, err = signingkey.GenerateRandomEd25519KeyPair() if err != nil { panic(err) } } else { - newPrivKey, err = keys.DecodeKeyFromString(key.Value, signingkey2.NewSigningEd25519PrivKeyFromBytes, nil) + newPrivKey, err = keys.DecodeKeyFromString(key.Value, signingkey.NewSigningEd25519PrivKeyFromBytes, nil) if err != nil { panic(err) } diff --git a/common/pkg/acl/testutils/acllistbuilder/liststoragebuilder.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go similarity index 94% rename from common/pkg/acl/testutils/acllistbuilder/liststoragebuilder.go rename to common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go index a1309073..4a8b0620 100644 --- a/common/pkg/acl/testutils/acllistbuilder/liststoragebuilder.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go @@ -3,10 +3,10 @@ package acllistbuilder import ( "context" "fmt" - aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/testutils/yamltests" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/testutils/yamltests" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" @@ -19,7 +19,7 @@ import ( ) type ACLListStorageBuilder struct { - storage.ListStorage + liststorage.ListStorage keychain *YAMLKeychain } @@ -29,7 +29,7 @@ func NewACLListStorageBuilder(keychain *YAMLKeychain) *ACLListStorageBuilder { } } -func NewListStorageWithTestName(name string) (storage.ListStorage, error) { +func NewListStorageWithTestName(name string) (liststorage.ListStorage, error) { filePath := path.Join(yamltests.Path(), name) return NewACLListStorageBuilderFromFile(filePath) } @@ -73,7 +73,7 @@ func (t *ACLListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) panic(err) } - id, _ := cid.NewCIDFromBytes(rawMarshalled) + id, _ := cidutil.NewCIDFromBytes(rawMarshalled) return &aclrecordproto.RawACLRecordWithId{ Payload: rawMarshalled, @@ -92,7 +92,7 @@ func (t *ACLListStorageBuilder) Parse(l *YMLList) { t.keychain.ParseKeys(&l.Keys) rawRoot := t.parseRoot(l.Root) var err error - t.ListStorage, err = storage.NewInMemoryACLListStorage(rawRoot.Id, []*aclrecordproto.RawACLRecordWithId{rawRoot}) + t.ListStorage, err = liststorage.NewInMemoryACLListStorage(rawRoot.Id, []*aclrecordproto.RawACLRecordWithId{rawRoot}) if err != nil { panic(err) } diff --git a/common/pkg/acl/testutils/acllistbuilder/liststoragebuildergraph.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go similarity index 100% rename from common/pkg/acl/testutils/acllistbuilder/liststoragebuildergraph.go rename to common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go diff --git a/common/pkg/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go similarity index 98% rename from common/pkg/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go rename to common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go index ba2679f3..2185b4f2 100644 --- a/common/pkg/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go @@ -9,7 +9,7 @@ package acllistbuilder import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" "github.com/gogo/protobuf/proto" "strings" "unicode" diff --git a/common/pkg/acl/testutils/acllistbuilder/ymlentities.go b/common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go similarity index 100% rename from common/pkg/acl/testutils/acllistbuilder/ymlentities.go rename to common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go diff --git a/common/pkg/acl/testutils/yamltests/path.go b/common/commonspace/object/acl/testutils/yamltests/path.go similarity index 100% rename from common/pkg/acl/testutils/yamltests/path.go rename to common/commonspace/object/acl/testutils/yamltests/path.go diff --git a/common/pkg/acl/testutils/yamltests/userjoinexample.yml b/common/commonspace/object/acl/testutils/yamltests/userjoinexample.yml similarity index 100% rename from common/pkg/acl/testutils/yamltests/userjoinexample.yml rename to common/commonspace/object/acl/testutils/yamltests/userjoinexample.yml diff --git a/common/pkg/acl/testutils/yamltests/userremoveexample.yml b/common/commonspace/object/acl/testutils/yamltests/userremoveexample.yml similarity index 100% rename from common/pkg/acl/testutils/yamltests/userremoveexample.yml rename to common/commonspace/object/acl/testutils/yamltests/userremoveexample.yml diff --git a/common/commonspace/object/keychain/keychain.go b/common/commonspace/object/keychain/keychain.go new file mode 100644 index 00000000..19b9f3c1 --- /dev/null +++ b/common/commonspace/object/keychain/keychain.go @@ -0,0 +1,28 @@ +package keychain + +import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" +) + +type Keychain struct { + keys map[string]signingkey.PubKey +} + +func NewKeychain() *Keychain { + return &Keychain{ + keys: make(map[string]signingkey.PubKey), + } +} + +func (k *Keychain) GetOrAdd(identity string) (signingkey.PubKey, error) { + if key, exists := k.keys[identity]; exists { + return key, nil + } + res, err := signingkey.NewSigningEd25519PubKeyFromBytes([]byte(identity)) + if err != nil { + return nil, err + } + + k.keys[identity] = res.(signingkey.PubKey) + return res.(signingkey.PubKey), nil +} diff --git a/common/commonspace/object/syncobjectgetter/syncobjectgetter.go b/common/commonspace/object/syncobjectgetter/syncobjectgetter.go new file mode 100644 index 00000000..2032b190 --- /dev/null +++ b/common/commonspace/object/syncobjectgetter/syncobjectgetter.go @@ -0,0 +1,14 @@ +package syncobjectgetter + +import ( + "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" +) + +type SyncObject interface { + synchandler.SyncHandler +} + +type SyncObjectGetter interface { + GetObject(ctx context.Context, objectId string) (SyncObject, error) +} diff --git a/common/pkg/acl/tree/change.go b/common/commonspace/object/tree/objecttree/change.go similarity index 95% rename from common/pkg/acl/tree/change.go rename to common/commonspace/object/tree/objecttree/change.go index 308ee958..9638a3dc 100644 --- a/common/pkg/acl/tree/change.go +++ b/common/commonspace/object/tree/objecttree/change.go @@ -1,8 +1,8 @@ -package tree +package objecttree import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" ) var ( diff --git a/common/pkg/acl/tree/changebuilder.go b/common/commonspace/object/tree/objecttree/changebuilder.go similarity index 93% rename from common/pkg/acl/tree/changebuilder.go rename to common/commonspace/object/tree/objecttree/changebuilder.go index 5547b332..a829522c 100644 --- a/common/pkg/acl/tree/changebuilder.go +++ b/common/commonspace/object/tree/objecttree/changebuilder.go @@ -1,10 +1,10 @@ -package tree +package objecttree import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "github.com/gogo/protobuf/proto" @@ -45,10 +45,10 @@ type ChangeBuilder interface { type changeBuilder struct { rootChange *treechangeproto.RawTreeChangeWithId - keys *common.Keychain + keys *keychain.Keychain } -func NewChangeBuilder(keys *common.Keychain, rootChange *treechangeproto.RawTreeChangeWithId) ChangeBuilder { +func NewChangeBuilder(keys *keychain.Keychain, rootChange *treechangeproto.RawTreeChangeWithId) ChangeBuilder { return &changeBuilder{keys: keys, rootChange: rootChange} } @@ -60,7 +60,7 @@ func (c *changeBuilder) ConvertFromRaw(rawIdChange *treechangeproto.RawTreeChang if verify { // verifying ID - if !cid.VerifyCID(rawIdChange.RawChange, rawIdChange.Id) { + if !cidutil.VerifyCID(rawIdChange.RawChange, rawIdChange.Id) { err = ErrIncorrectCID return } @@ -131,7 +131,7 @@ func (c *changeBuilder) BuildInitialContent(payload InitialContent) (ch *Change, return } - id, err := cid.NewCIDFromBytes(marshalledRawChange) + id, err := cidutil.NewCIDFromBytes(marshalledRawChange) if err != nil { return } @@ -186,7 +186,7 @@ func (c *changeBuilder) BuildContent(payload BuilderContent) (ch *Change, rawIdC return } - id, err := cid.NewCIDFromBytes(marshalledRawChange) + id, err := cidutil.NewCIDFromBytes(marshalledRawChange) if err != nil { return } diff --git a/common/pkg/acl/tree/changevalidator.go b/common/commonspace/object/tree/objecttree/changevalidator.go similarity index 95% rename from common/pkg/acl/tree/changevalidator.go rename to common/commonspace/object/tree/objecttree/changevalidator.go index b4d63ea9..7aaa5a7e 100644 --- a/common/pkg/acl/tree/changevalidator.go +++ b/common/commonspace/object/tree/objecttree/changevalidator.go @@ -1,9 +1,9 @@ -package tree +package objecttree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" ) type ObjectTreeValidator interface { diff --git a/common/pkg/acl/tree/descriptionparser.go b/common/commonspace/object/tree/objecttree/descriptionparser.go similarity index 93% rename from common/pkg/acl/tree/descriptionparser.go rename to common/commonspace/object/tree/objecttree/descriptionparser.go index c7ad3bfe..a3e79a04 100644 --- a/common/pkg/acl/tree/descriptionparser.go +++ b/common/commonspace/object/tree/objecttree/descriptionparser.go @@ -1,4 +1,4 @@ -package tree +package objecttree type DescriptionParser interface { ParseChange(*Change) ([]string, error) diff --git a/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go similarity index 90% rename from common/pkg/acl/tree/mock_objecttree/mock_objecttree.go rename to common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index ca2151cb..a377f19b 100644 --- a/common/pkg/acl/tree/mock_objecttree/mock_objecttree.go +++ b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -1,16 +1,16 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree (interfaces: ObjectTree) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree (interfaces: ObjectTree) -// Package mock_tree is a generated GoMock package. -package mock_tree +// Package mock_objecttree is a generated GoMock package. +package mock_objecttree import ( context "context" reflect "reflect" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + objecttree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" gomock "github.com/golang/mock/gomock" ) @@ -38,10 +38,10 @@ func (m *MockObjectTree) EXPECT() *MockObjectTreeMockRecorder { } // AddContent mocks base method. -func (m *MockObjectTree) AddContent(arg0 context.Context, arg1 tree.SignableChangeContent) (tree.AddResult, error) { +func (m *MockObjectTree) AddContent(arg0 context.Context, arg1 objecttree.SignableChangeContent) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddContent", arg0, arg1) - ret0, _ := ret[0].(tree.AddResult) + ret0, _ := ret[0].(objecttree.AddResult) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -53,10 +53,10 @@ func (mr *MockObjectTreeMockRecorder) AddContent(arg0, arg1 interface{}) *gomock } // AddRawChanges mocks base method. -func (m *MockObjectTree) AddRawChanges(arg0 context.Context, arg1 tree.RawChangesPayload) (tree.AddResult, error) { +func (m *MockObjectTree) AddRawChanges(arg0 context.Context, arg1 objecttree.RawChangesPayload) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawChanges", arg0, arg1) - ret0, _ := ret[0].(tree.AddResult) + ret0, _ := ret[0].(objecttree.AddResult) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -186,7 +186,7 @@ func (mr *MockObjectTreeMockRecorder) ID() *gomock.Call { } // Iterate mocks base method. -func (m *MockObjectTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*tree.Change) bool) error { +func (m *MockObjectTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -200,7 +200,7 @@ func (mr *MockObjectTreeMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Ca } // IterateFrom mocks base method. -func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*tree.Change) bool) error { +func (m *MockObjectTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateFrom", arg0, arg1, arg2) ret0, _ := ret[0].(error) @@ -250,10 +250,10 @@ func (mr *MockObjectTreeMockRecorder) RUnlock() *gomock.Call { } // Root mocks base method. -func (m *MockObjectTree) Root() *tree.Change { +func (m *MockObjectTree) Root() *objecttree.Change { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Root") - ret0, _ := ret[0].(*tree.Change) + ret0, _ := ret[0].(*objecttree.Change) return ret0 } @@ -278,10 +278,10 @@ func (mr *MockObjectTreeMockRecorder) SnapshotPath() *gomock.Call { } // Storage mocks base method. -func (m *MockObjectTree) Storage() storage.TreeStorage { +func (m *MockObjectTree) Storage() treestorage.TreeStorage { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Storage") - ret0, _ := ret[0].(storage.TreeStorage) + ret0, _ := ret[0].(treestorage.TreeStorage) return ret0 } diff --git a/common/pkg/acl/tree/objecttree.go b/common/commonspace/object/tree/objecttree/objecttree.go similarity index 95% rename from common/pkg/acl/tree/objecttree.go rename to common/commonspace/object/tree/objecttree/objecttree.go index 56e3b7a3..6b8d26fa 100644 --- a/common/pkg/acl/tree/objecttree.go +++ b/common/commonspace/object/tree/objecttree/objecttree.go @@ -1,14 +1,14 @@ -//go:generate mockgen -destination mock_objecttree/mock_objecttree.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree ObjectTree -package tree +//go:generate mockgen -destination mock_objecttree/mock_objecttree.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree ObjectTree +package objecttree import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - list "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + list2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" "sync" @@ -59,7 +59,7 @@ type ObjectTree interface { SnapshotPath() []string ChangesAfterCommonSnapshot(snapshotPath, heads []string) ([]*treechangeproto.RawTreeChangeWithId, error) - Storage() storage.TreeStorage + Storage() treestorage.TreeStorage AddContent(ctx context.Context, content SignableChangeContent) (AddResult, error) AddRawChanges(ctx context.Context, changes RawChangesPayload) (AddResult, error) @@ -69,12 +69,12 @@ type ObjectTree interface { } type objectTree struct { - treeStorage storage.TreeStorage + treeStorage treestorage.TreeStorage changeBuilder ChangeBuilder validator ObjectTreeValidator rawChangeLoader *rawChangeLoader treeBuilder *treeBuilder - aclList list.ACLList + aclList list2.ACLList id string root *treechangeproto.RawTreeChangeWithId @@ -96,18 +96,18 @@ type objectTree struct { type objectTreeDeps struct { changeBuilder ChangeBuilder treeBuilder *treeBuilder - treeStorage storage.TreeStorage + treeStorage treestorage.TreeStorage validator ObjectTreeValidator rawChangeLoader *rawChangeLoader - aclList list.ACLList + aclList list2.ACLList } func defaultObjectTreeDeps( rootChange *treechangeproto.RawTreeChangeWithId, - treeStorage storage.TreeStorage, - aclList list.ACLList) objectTreeDeps { + treeStorage treestorage.TreeStorage, + aclList list2.ACLList) objectTreeDeps { - keychain := common.NewKeychain() + keychain := keychain.NewKeychain() changeBuilder := NewChangeBuilder(keychain, rootChange) treeBuilder := newTreeBuilder(treeStorage, changeBuilder) return objectTreeDeps{ @@ -145,7 +145,7 @@ func (ot *objectTree) Header() *treechangeproto.RawTreeChangeWithId { return ot.root } -func (ot *objectTree) Storage() storage.TreeStorage { +func (ot *objectTree) Storage() treestorage.TreeStorage { return ot.treeStorage } @@ -202,7 +202,7 @@ func (ot *objectTree) prepareBuilderContent(content SignableChangeContent) (cnt canWrite := state.HasPermission(content.Identity, aclrecordproto.ACLUserPermissions_Writer) || state.HasPermission(content.Identity, aclrecordproto.ACLUserPermissions_Admin) if !canWrite { - err = list.ErrInsufficientPermissions + err = list2.ErrInsufficientPermissions return } @@ -469,7 +469,7 @@ func (ot *objectTree) IterateFrom(id string, convert ChangeConvertFunc, iterate } readKey, exists := ot.keys[c.ReadKeyHash] if !exists { - err = list.ErrNoReadKey + err = list2.ErrNoReadKey return } diff --git a/common/pkg/acl/tree/objecttree_test.go b/common/commonspace/object/tree/objecttree/objecttree_test.go similarity index 97% rename from common/pkg/acl/tree/objecttree_test.go rename to common/commonspace/object/tree/objecttree/objecttree_test.go index 84c39547..4eaafa57 100644 --- a/common/pkg/acl/tree/objecttree_test.go +++ b/common/commonspace/object/tree/objecttree/objecttree_test.go @@ -1,11 +1,11 @@ -package tree +package objecttree import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/testutils/acllistbuilder" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/testutils/acllistbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" @@ -53,9 +53,9 @@ func (c *mockChangeCreator) createRaw(id, aclId, snapshotId string, isSnapshot b } } -func (c *mockChangeCreator) createNewTreeStorage(treeId, aclHeadId string) storage.TreeStorage { +func (c *mockChangeCreator) createNewTreeStorage(treeId, aclHeadId string) treestorage.TreeStorage { root := c.createRoot(treeId, aclHeadId) - treeStorage, _ := storage.NewInMemoryTreeStorage(root, []string{root.Id}, []*treechangeproto.RawTreeChangeWithId{root}) + treeStorage, _ := treestorage.NewInMemoryTreeStorage(root, []string{root.Id}, []*treechangeproto.RawTreeChangeWithId{root}) return treeStorage } @@ -95,7 +95,7 @@ func (m *mockChangeValidator) ValidateFullTree(tree *Tree, aclList list.ACLList) type testTreeContext struct { aclList list.ACLList - treeStorage storage.TreeStorage + treeStorage treestorage.TreeStorage changeBuilder *mockChangeBuilder changeCreator *mockChangeCreator objTree ObjectTree diff --git a/common/pkg/acl/tree/objecttreefactory.go b/common/commonspace/object/tree/objecttree/objecttreefactory.go similarity index 82% rename from common/pkg/acl/tree/objecttreefactory.go rename to common/commonspace/object/tree/objecttree/objecttreefactory.go index 73706bca..dba7ba8b 100644 --- a/common/pkg/acl/tree/objecttreefactory.go +++ b/common/commonspace/object/tree/objecttree/objecttreefactory.go @@ -1,10 +1,10 @@ -package tree +package objecttree import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" @@ -21,7 +21,7 @@ type ObjectTreeCreatePayload struct { IsEncrypted bool } -func BuildObjectTree(treeStorage storage.TreeStorage, aclList list.ACLList) (ObjectTree, error) { +func BuildObjectTree(treeStorage treestorage.TreeStorage, aclList list.ACLList) (ObjectTree, error) { rootChange, err := treeStorage.Root() if err != nil { return nil, err @@ -33,14 +33,14 @@ func BuildObjectTree(treeStorage storage.TreeStorage, aclList list.ACLList) (Obj func CreateDerivedObjectTree( payload ObjectTreeCreatePayload, aclList list.ACLList, - createStorage storage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { + createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { return createObjectTree(payload, 0, nil, aclList, createStorage) } func CreateObjectTree( payload ObjectTreeCreatePayload, aclList list.ACLList, - createStorage storage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { + createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { bytes := make([]byte, 32) _, err = rand.Read(bytes) if err != nil { @@ -54,7 +54,7 @@ func createObjectTree( timestamp int64, seed []byte, aclList list.ACLList, - createStorage storage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { + createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { aclList.RLock() aclHeadId := aclList.Head().Id aclList.RUnlock() @@ -72,13 +72,13 @@ func createObjectTree( Seed: seed, } - _, raw, err := NewChangeBuilder(common.NewKeychain(), nil).BuildInitialContent(cnt) + _, raw, err := NewChangeBuilder(keychain.NewKeychain(), nil).BuildInitialContent(cnt) if err != nil { return } // create storage - st, err := createStorage(storage.TreeStorageCreatePayload{ + st, err := createStorage(treestorage.TreeStorageCreatePayload{ RootRawChange: raw, Changes: []*treechangeproto.RawTreeChangeWithId{raw}, Heads: []string{raw.Id}, diff --git a/common/pkg/acl/tree/rawloader.go b/common/commonspace/object/tree/objecttree/rawloader.go similarity index 95% rename from common/pkg/acl/tree/rawloader.go rename to common/commonspace/object/tree/objecttree/rawloader.go index 78b5114f..5125df99 100644 --- a/common/pkg/acl/tree/rawloader.go +++ b/common/commonspace/object/tree/objecttree/rawloader.go @@ -1,15 +1,15 @@ -package tree +package objecttree import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" "time" ) type rawChangeLoader struct { - treeStorage storage.TreeStorage + treeStorage treestorage.TreeStorage changeBuilder ChangeBuilder // buffers @@ -23,7 +23,7 @@ type rawCacheEntry struct { position int } -func newRawChangeLoader(treeStorage storage.TreeStorage, changeBuilder ChangeBuilder) *rawChangeLoader { +func newRawChangeLoader(treeStorage treestorage.TreeStorage, changeBuilder ChangeBuilder) *rawChangeLoader { return &rawChangeLoader{ treeStorage: treeStorage, changeBuilder: changeBuilder, diff --git a/common/commonspace/object/tree/objecttree/rawtreevalidator.go b/common/commonspace/object/tree/objecttree/rawtreevalidator.go new file mode 100644 index 00000000..f6cc93e9 --- /dev/null +++ b/common/commonspace/object/tree/objecttree/rawtreevalidator.go @@ -0,0 +1,17 @@ +package objecttree + +import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" +) + +func ValidateRawTree(payload treestorage.TreeStorageCreatePayload, aclList list.ACLList) (err error) { + provider := treestorage.NewInMemoryTreeStorageProvider() + treeStorage, err := provider.CreateTreeStorage(payload) + if err != nil { + return + } + + _, err = BuildObjectTree(treeStorage, aclList) + return +} diff --git a/common/pkg/acl/tree/signablecontent.go b/common/commonspace/object/tree/objecttree/signablecontent.go similarity index 93% rename from common/pkg/acl/tree/signablecontent.go rename to common/commonspace/object/tree/objecttree/signablecontent.go index 4be96d1d..16138e85 100644 --- a/common/pkg/acl/tree/signablecontent.go +++ b/common/commonspace/object/tree/objecttree/signablecontent.go @@ -1,4 +1,4 @@ -package tree +package objecttree import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" diff --git a/common/pkg/acl/tree/tree.go b/common/commonspace/object/tree/objecttree/tree.go similarity index 99% rename from common/pkg/acl/tree/tree.go rename to common/commonspace/object/tree/objecttree/tree.go index f1dbbf9b..51a3b444 100644 --- a/common/pkg/acl/tree/tree.go +++ b/common/commonspace/object/tree/objecttree/tree.go @@ -1,4 +1,4 @@ -package tree +package objecttree import ( "bytes" diff --git a/common/pkg/acl/tree/tree_test.go b/common/commonspace/object/tree/objecttree/tree_test.go similarity index 99% rename from common/pkg/acl/tree/tree_test.go rename to common/commonspace/object/tree/objecttree/tree_test.go index 4c7f5ae7..8bbed0cc 100644 --- a/common/pkg/acl/tree/tree_test.go +++ b/common/commonspace/object/tree/objecttree/tree_test.go @@ -1,4 +1,4 @@ -package tree +package objecttree import ( "fmt" diff --git a/common/pkg/acl/tree/treebuilder.go b/common/commonspace/object/tree/objecttree/treebuilder.go similarity index 97% rename from common/pkg/acl/tree/treebuilder.go rename to common/commonspace/object/tree/objecttree/treebuilder.go index d9e7f531..d863a9f2 100644 --- a/common/pkg/acl/tree/treebuilder.go +++ b/common/commonspace/object/tree/objecttree/treebuilder.go @@ -1,11 +1,11 @@ -package tree +package objecttree import ( "context" "errors" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" "go.uber.org/zap" "time" @@ -17,7 +17,7 @@ var ( ) type treeBuilder struct { - treeStorage storage.TreeStorage + treeStorage treestorage.TreeStorage builder ChangeBuilder cache map[string]*Change @@ -28,7 +28,7 @@ type treeBuilder struct { loadBuffer []*Change } -func newTreeBuilder(storage storage.TreeStorage, builder ChangeBuilder) *treeBuilder { +func newTreeBuilder(storage treestorage.TreeStorage, builder ChangeBuilder) *treeBuilder { return &treeBuilder{ treeStorage: storage, builder: builder, diff --git a/common/pkg/acl/tree/treegraph.go b/common/commonspace/object/tree/objecttree/treegraph.go similarity index 93% rename from common/pkg/acl/tree/treegraph.go rename to common/commonspace/object/tree/objecttree/treegraph.go index 67cd42bd..a4915d34 100644 --- a/common/pkg/acl/tree/treegraph.go +++ b/common/commonspace/object/tree/objecttree/treegraph.go @@ -2,7 +2,7 @@ // +build !linux,!darwin android ios nographviz // +build !amd64 -package tree +package objecttree import "fmt" diff --git a/common/pkg/acl/tree/treegraph_nix.go b/common/commonspace/object/tree/objecttree/treegraph_nix.go similarity index 99% rename from common/pkg/acl/tree/treegraph_nix.go rename to common/commonspace/object/tree/objecttree/treegraph_nix.go index ae4f5281..355ca96d 100644 --- a/common/pkg/acl/tree/treegraph_nix.go +++ b/common/commonspace/object/tree/objecttree/treegraph_nix.go @@ -5,7 +5,7 @@ // +build !nographviz // +build amd64 arm64 -package tree +package objecttree import ( "bytes" diff --git a/common/pkg/acl/tree/treeiterator.go b/common/commonspace/object/tree/objecttree/treeiterator.go similarity index 98% rename from common/pkg/acl/tree/treeiterator.go rename to common/commonspace/object/tree/objecttree/treeiterator.go index cee20c7e..3cff0d3a 100644 --- a/common/pkg/acl/tree/treeiterator.go +++ b/common/commonspace/object/tree/objecttree/treeiterator.go @@ -1,4 +1,4 @@ -package tree +package objecttree import ( "sync" diff --git a/common/pkg/acl/tree/treereduce.go b/common/commonspace/object/tree/objecttree/treereduce.go similarity index 99% rename from common/pkg/acl/tree/treereduce.go rename to common/commonspace/object/tree/objecttree/treereduce.go index 0cd201d9..708ee7a8 100644 --- a/common/pkg/acl/tree/treereduce.go +++ b/common/commonspace/object/tree/objecttree/treereduce.go @@ -1,4 +1,4 @@ -package tree +package objecttree import "math" diff --git a/common/pkg/acl/tree/util.go b/common/commonspace/object/tree/objecttree/util.go similarity index 97% rename from common/pkg/acl/tree/util.go rename to common/commonspace/object/tree/objecttree/util.go index 0e6cc7cd..ad577194 100644 --- a/common/pkg/acl/tree/util.go +++ b/common/commonspace/object/tree/objecttree/util.go @@ -1,4 +1,4 @@ -package tree +package objecttree func commonSnapshotForTwoPaths(ourPath []string, theirPath []string) (string, error) { var i int diff --git a/common/commonspace/synctree/mock_synctree/mock_synctree.go b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go similarity index 93% rename from common/commonspace/synctree/mock_synctree/mock_synctree.go rename to common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index 5916216c..88a371d9 100644 --- a/common/commonspace/synctree/mock_synctree/mock_synctree.go +++ b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree (interfaces: SyncClient,SyncTree,ReceiveQueue,HeadNotifiable) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree (interfaces: SyncClient,SyncTree,ReceiveQueue,HeadNotifiable) // Package mock_synctree is a generated GoMock package. package mock_synctree @@ -8,10 +8,10 @@ import ( context "context" reflect "reflect" + objecttree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" spacesyncproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" gomock "github.com/golang/mock/gomock" ) @@ -67,7 +67,7 @@ func (mr *MockSyncClientMockRecorder) BroadcastAsyncOrSendResponsible(arg0 inter } // CreateFullSyncRequest mocks base method. -func (m *MockSyncClient) CreateFullSyncRequest(arg0 tree.ObjectTree, arg1, arg2 []string) (*treechangeproto.TreeSyncMessage, error) { +func (m *MockSyncClient) CreateFullSyncRequest(arg0 objecttree.ObjectTree, arg1, arg2 []string) (*treechangeproto.TreeSyncMessage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateFullSyncRequest", arg0, arg1, arg2) ret0, _ := ret[0].(*treechangeproto.TreeSyncMessage) @@ -82,7 +82,7 @@ func (mr *MockSyncClientMockRecorder) CreateFullSyncRequest(arg0, arg1, arg2 int } // CreateFullSyncResponse mocks base method. -func (m *MockSyncClient) CreateFullSyncResponse(arg0 tree.ObjectTree, arg1, arg2 []string) (*treechangeproto.TreeSyncMessage, error) { +func (m *MockSyncClient) CreateFullSyncResponse(arg0 objecttree.ObjectTree, arg1, arg2 []string) (*treechangeproto.TreeSyncMessage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateFullSyncResponse", arg0, arg1, arg2) ret0, _ := ret[0].(*treechangeproto.TreeSyncMessage) @@ -97,7 +97,7 @@ func (mr *MockSyncClientMockRecorder) CreateFullSyncResponse(arg0, arg1, arg2 in } // CreateHeadUpdate mocks base method. -func (m *MockSyncClient) CreateHeadUpdate(arg0 tree.ObjectTree, arg1 []*treechangeproto.RawTreeChangeWithId) *treechangeproto.TreeSyncMessage { +func (m *MockSyncClient) CreateHeadUpdate(arg0 objecttree.ObjectTree, arg1 []*treechangeproto.RawTreeChangeWithId) *treechangeproto.TreeSyncMessage { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateHeadUpdate", arg0, arg1) ret0, _ := ret[0].(*treechangeproto.TreeSyncMessage) @@ -162,10 +162,10 @@ func (m *MockSyncTree) EXPECT() *MockSyncTreeMockRecorder { } // AddContent mocks base method. -func (m *MockSyncTree) AddContent(arg0 context.Context, arg1 tree.SignableChangeContent) (tree.AddResult, error) { +func (m *MockSyncTree) AddContent(arg0 context.Context, arg1 objecttree.SignableChangeContent) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddContent", arg0, arg1) - ret0, _ := ret[0].(tree.AddResult) + ret0, _ := ret[0].(objecttree.AddResult) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -177,10 +177,10 @@ func (mr *MockSyncTreeMockRecorder) AddContent(arg0, arg1 interface{}) *gomock.C } // AddRawChanges mocks base method. -func (m *MockSyncTree) AddRawChanges(arg0 context.Context, arg1 tree.RawChangesPayload) (tree.AddResult, error) { +func (m *MockSyncTree) AddRawChanges(arg0 context.Context, arg1 objecttree.RawChangesPayload) (objecttree.AddResult, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawChanges", arg0, arg1) - ret0, _ := ret[0].(tree.AddResult) + ret0, _ := ret[0].(objecttree.AddResult) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -324,7 +324,7 @@ func (mr *MockSyncTreeMockRecorder) ID() *gomock.Call { } // Iterate mocks base method. -func (m *MockSyncTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*tree.Change) bool) error { +func (m *MockSyncTree) Iterate(arg0 func([]byte) (interface{}, error), arg1 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Iterate", arg0, arg1) ret0, _ := ret[0].(error) @@ -338,7 +338,7 @@ func (mr *MockSyncTreeMockRecorder) Iterate(arg0, arg1 interface{}) *gomock.Call } // IterateFrom mocks base method. -func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*tree.Change) bool) error { +func (m *MockSyncTree) IterateFrom(arg0 string, arg1 func([]byte) (interface{}, error), arg2 func(*objecttree.Change) bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IterateFrom", arg0, arg1, arg2) ret0, _ := ret[0].(error) @@ -402,10 +402,10 @@ func (mr *MockSyncTreeMockRecorder) RUnlock() *gomock.Call { } // Root mocks base method. -func (m *MockSyncTree) Root() *tree.Change { +func (m *MockSyncTree) Root() *objecttree.Change { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Root") - ret0, _ := ret[0].(*tree.Change) + ret0, _ := ret[0].(*objecttree.Change) return ret0 } @@ -430,10 +430,10 @@ func (mr *MockSyncTreeMockRecorder) SnapshotPath() *gomock.Call { } // Storage mocks base method. -func (m *MockSyncTree) Storage() storage.TreeStorage { +func (m *MockSyncTree) Storage() treestorage.TreeStorage { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Storage") - ret0, _ := ret[0].(storage.TreeStorage) + ret0, _ := ret[0].(treestorage.TreeStorage) return ret0 } diff --git a/common/commonspace/synctree/queuedclient.go b/common/commonspace/object/tree/synctree/queuedclient.go similarity index 82% rename from common/commonspace/synctree/queuedclient.go rename to common/commonspace/object/tree/synctree/queuedclient.go index a0fceff9..29f791c6 100644 --- a/common/commonspace/synctree/queuedclient.go +++ b/common/commonspace/object/tree/synctree/queuedclient.go @@ -1,16 +1,16 @@ package synctree import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" ) type queuedClient struct { SyncClient - queue syncservice.ActionQueue + queue objectsync.ActionQueue } -func newQueuedClient(client SyncClient, queue syncservice.ActionQueue) SyncClient { +func newQueuedClient(client SyncClient, queue objectsync.ActionQueue) SyncClient { return &queuedClient{ SyncClient: client, queue: queue, diff --git a/common/commonspace/synctree/receivequeue.go b/common/commonspace/object/tree/synctree/receivequeue.go similarity index 97% rename from common/commonspace/synctree/receivequeue.go rename to common/commonspace/object/tree/synctree/receivequeue.go index d9913684..83601041 100644 --- a/common/commonspace/synctree/receivequeue.go +++ b/common/commonspace/object/tree/synctree/receivequeue.go @@ -2,7 +2,7 @@ package synctree import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" "sync" ) diff --git a/common/commonspace/synctree/requestfactory.go b/common/commonspace/object/tree/synctree/requestfactory.go similarity index 64% rename from common/commonspace/synctree/requestfactory.go rename to common/commonspace/object/tree/synctree/requestfactory.go index b66a2689..38f218cb 100644 --- a/common/commonspace/synctree/requestfactory.go +++ b/common/commonspace/object/tree/synctree/requestfactory.go @@ -2,16 +2,16 @@ package synctree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" ) type RequestFactory interface { - CreateHeadUpdate(t tree.ObjectTree, added []*treechangeproto.RawTreeChangeWithId) (msg *treechangeproto.TreeSyncMessage) + CreateHeadUpdate(t objecttree.ObjectTree, added []*treechangeproto.RawTreeChangeWithId) (msg *treechangeproto.TreeSyncMessage) CreateNewTreeRequest() (msg *treechangeproto.TreeSyncMessage) - CreateFullSyncRequest(t tree.ObjectTree, theirHeads, theirSnapshotPath []string) (req *treechangeproto.TreeSyncMessage, err error) - CreateFullSyncResponse(t tree.ObjectTree, theirHeads, theirSnapshotPath []string) (*treechangeproto.TreeSyncMessage, error) + CreateFullSyncRequest(t objecttree.ObjectTree, theirHeads, theirSnapshotPath []string) (req *treechangeproto.TreeSyncMessage, err error) + CreateFullSyncResponse(t objecttree.ObjectTree, theirHeads, theirSnapshotPath []string) (*treechangeproto.TreeSyncMessage, error) } var sharedFactory = &requestFactory{} @@ -22,7 +22,7 @@ func GetRequestFactory() RequestFactory { type requestFactory struct{} -func (r *requestFactory) CreateHeadUpdate(t tree.ObjectTree, added []*treechangeproto.RawTreeChangeWithId) (msg *treechangeproto.TreeSyncMessage) { +func (r *requestFactory) CreateHeadUpdate(t objecttree.ObjectTree, added []*treechangeproto.RawTreeChangeWithId) (msg *treechangeproto.TreeSyncMessage) { return treechangeproto.WrapHeadUpdate(&treechangeproto.TreeHeadUpdate{ Heads: t.Heads(), Changes: added, @@ -34,7 +34,7 @@ func (r *requestFactory) CreateNewTreeRequest() (msg *treechangeproto.TreeSyncMe return treechangeproto.WrapFullRequest(&treechangeproto.TreeFullSyncRequest{}, nil) } -func (r *requestFactory) CreateFullSyncRequest(t tree.ObjectTree, theirHeads, theirSnapshotPath []string) (msg *treechangeproto.TreeSyncMessage, err error) { +func (r *requestFactory) CreateFullSyncRequest(t objecttree.ObjectTree, theirHeads, theirSnapshotPath []string) (msg *treechangeproto.TreeSyncMessage, err error) { req := &treechangeproto.TreeFullSyncRequest{} if t == nil { return nil, fmt.Errorf("tree should not be empty") @@ -54,7 +54,7 @@ func (r *requestFactory) CreateFullSyncRequest(t tree.ObjectTree, theirHeads, th return } -func (r *requestFactory) CreateFullSyncResponse(t tree.ObjectTree, theirHeads, theirSnapshotPath []string) (msg *treechangeproto.TreeSyncMessage, err error) { +func (r *requestFactory) CreateFullSyncResponse(t objecttree.ObjectTree, theirHeads, theirSnapshotPath []string) (msg *treechangeproto.TreeSyncMessage, err error) { resp := &treechangeproto.TreeFullSyncResponse{ Heads: t.Heads(), SnapshotPath: t.SnapshotPath(), diff --git a/common/commonspace/synctree/syncclient.go b/common/commonspace/object/tree/synctree/syncclient.go similarity index 89% rename from common/commonspace/synctree/syncclient.go rename to common/commonspace/object/tree/synctree/syncclient.go index 1091bf51..034a822f 100644 --- a/common/commonspace/synctree/syncclient.go +++ b/common/commonspace/object/tree/synctree/syncclient.go @@ -1,11 +1,11 @@ -//go:generate mockgen -destination mock_synctree/mock_synctree.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree SyncClient,SyncTree,ReceiveQueue,HeadNotifiable +//go:generate mockgen -destination mock_synctree/mock_synctree.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree SyncClient,SyncTree,ReceiveQueue,HeadNotifiable package synctree import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" ) type SyncClient interface { @@ -16,21 +16,21 @@ type SyncClient interface { } type syncClient struct { - syncservice.StreamPool + objectsync.StreamPool RequestFactory spaceId string connector nodeconf.ConfConnector configuration nodeconf.Configuration - checker syncservice.StreamChecker + checker objectsync.StreamChecker } func newSyncClient( spaceId string, - pool syncservice.StreamPool, + pool objectsync.StreamPool, factory RequestFactory, configuration nodeconf.Configuration, - checker syncservice.StreamChecker) SyncClient { + checker objectsync.StreamChecker) SyncClient { return &syncClient{ StreamPool: pool, RequestFactory: factory, diff --git a/common/commonspace/synctree/synctree.go b/common/commonspace/object/tree/synctree/synctree.go similarity index 81% rename from common/commonspace/synctree/synctree.go rename to common/commonspace/object/tree/synctree/synctree.go index 86b140ef..5c949351 100644 --- a/common/commonspace/synctree/synctree.go +++ b/common/commonspace/object/tree/synctree/synctree.go @@ -5,17 +5,17 @@ import ( "errors" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/gogo/protobuf/proto" "go.uber.org/zap" "sync/atomic" @@ -31,14 +31,14 @@ type HeadNotifiable interface { } type SyncTree interface { - tree.ObjectTree + objecttree.ObjectTree synchandler.SyncHandler Ping() (err error) } // SyncTree sends head updates to sync service and also sends new changes to update listener type syncTree struct { - tree.ObjectTree + objecttree.ObjectTree synchandler.SyncHandler syncClient SyncClient syncStatus syncstatus.SyncStatusUpdater @@ -51,16 +51,16 @@ type syncTree struct { var log = logger.NewNamed("commonspace.synctree").Sugar() -var createDerivedObjectTree = tree.CreateDerivedObjectTree -var createObjectTree = tree.CreateObjectTree -var buildObjectTree = tree.BuildObjectTree +var createDerivedObjectTree = objecttree.CreateDerivedObjectTree +var createObjectTree = objecttree.CreateObjectTree +var buildObjectTree = objecttree.BuildObjectTree var createSyncClient = newWrappedSyncClient type CreateDeps struct { SpaceId string - Payload tree.ObjectTreeCreatePayload + Payload objecttree.ObjectTreeCreatePayload Configuration nodeconf.Configuration - SyncService syncservice.SyncService + ObjectSync objectsync.ObjectSync AclList list.ACLList SpaceStorage spacestorage.SpaceStorage SyncStatus syncstatus.SyncStatusUpdater @@ -69,13 +69,13 @@ type CreateDeps struct { type BuildDeps struct { SpaceId string - SyncService syncservice.SyncService + ObjectSync objectsync.ObjectSync Configuration nodeconf.Configuration HeadNotifiable HeadNotifiable Listener updatelistener.UpdateListener AclList list.ACLList SpaceStorage spacestorage.SpaceStorage - TreeStorage storage.TreeStorage + TreeStorage treestorage.TreeStorage TreeUsage *atomic.Int32 SyncStatus syncstatus.SyncStatusUpdater } @@ -83,10 +83,10 @@ type BuildDeps struct { func newWrappedSyncClient( spaceId string, factory RequestFactory, - syncService syncservice.SyncService, + objectSync objectsync.ObjectSync, configuration nodeconf.Configuration) SyncClient { - syncClient := newSyncClient(spaceId, syncService.StreamPool(), factory, configuration, syncService.StreamChecker()) - return newQueuedClient(syncClient, syncService.ActionQueue()) + syncClient := newSyncClient(spaceId, objectSync.StreamPool(), factory, configuration, objectSync.StreamChecker()) + return newQueuedClient(syncClient, objectSync.ActionQueue()) } func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) { @@ -98,7 +98,7 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) syncClient := createSyncClient( deps.SpaceId, sharedFactory, - deps.SyncService, + deps.ObjectSync, deps.Configuration) id = objTree.ID() @@ -119,7 +119,7 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) syncClient := createSyncClient( deps.SpaceId, sharedFactory, - deps.SyncService, + deps.ObjectSync, deps.Configuration) id = objTree.ID() @@ -145,12 +145,12 @@ func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t return } - err = deps.SyncService.StreamChecker().CheckPeerConnection(peerId) + err = deps.ObjectSync.StreamChecker().CheckPeerConnection(peerId) if err != nil { return } - resp, err := deps.SyncService.StreamPool().SendSync(peerId, objMsg) + resp, err := deps.ObjectSync.StreamPool().SendSync(peerId, objMsg) if err != nil { return } @@ -165,7 +165,7 @@ func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t return buildSyncTree(ctx, false, deps) } - if err != nil && err != storage.ErrUnknownTreeId { + if err != nil && err != treestorage.ErrUnknownTreeId { return } @@ -188,7 +188,7 @@ func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t } fullSyncResp := resp.GetContent().GetFullSyncResponse() - payload := storage.TreeStorageCreatePayload{ + payload := treestorage.TreeStorageCreatePayload{ RootRawChange: resp.RootChange, Changes: fullSyncResp.Changes, Heads: fullSyncResp.Heads, @@ -196,7 +196,7 @@ func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t // basically building tree with in-memory storage and validating that it was without errors log.With(zap.String("id", id)).Debug("validating tree") - err = tree.ValidateRawTree(payload, deps.AclList) + err = objecttree.ValidateRawTree(payload, deps.AclList) if err != nil { return } @@ -216,7 +216,7 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t Sy syncClient := createSyncClient( deps.SpaceId, sharedFactory, - deps.SyncService, + deps.ObjectSync, deps.Configuration) syncTree := &syncTree{ ObjectTree: objTree, @@ -241,21 +241,21 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t Sy return } -func (s *syncTree) IterateFrom(id string, convert tree.ChangeConvertFunc, iterate tree.ChangeIterateFunc) (err error) { +func (s *syncTree) IterateFrom(id string, convert objecttree.ChangeConvertFunc, iterate objecttree.ChangeIterateFunc) (err error) { if err = s.checkAlive(); err != nil { return } return s.ObjectTree.IterateFrom(id, convert, iterate) } -func (s *syncTree) Iterate(convert tree.ChangeConvertFunc, iterate tree.ChangeIterateFunc) (err error) { +func (s *syncTree) Iterate(convert objecttree.ChangeConvertFunc, iterate objecttree.ChangeIterateFunc) (err error) { if err = s.checkAlive(); err != nil { return } return s.ObjectTree.Iterate(convert, iterate) } -func (s *syncTree) AddContent(ctx context.Context, content tree.SignableChangeContent) (res tree.AddResult, err error) { +func (s *syncTree) AddContent(ctx context.Context, content objecttree.SignableChangeContent) (res objecttree.AddResult, err error) { if err = s.checkAlive(); err != nil { return } @@ -272,7 +272,7 @@ func (s *syncTree) AddContent(ctx context.Context, content tree.SignableChangeCo return } -func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload tree.RawChangesPayload) (res tree.AddResult, err error) { +func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload objecttree.RawChangesPayload) (res objecttree.AddResult, err error) { if err = s.checkAlive(); err != nil { return } @@ -282,15 +282,15 @@ func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload tree.RawCha } if s.listener != nil { switch res.Mode { - case tree.Nothing: + case objecttree.Nothing: return - case tree.Append: + case objecttree.Append: s.listener.Update(s) - case tree.Rebuild: + case objecttree.Rebuild: s.listener.Rebuild(s) } } - if res.Mode != tree.Nothing { + if res.Mode != objecttree.Nothing { if s.notifiable != nil { s.notifiable.UpdateHeads(s.ID(), res.Heads) } diff --git a/common/commonspace/synctree/synctree_test.go b/common/commonspace/object/tree/synctree/synctree_test.go similarity index 74% rename from common/commonspace/synctree/synctree_test.go rename to common/commonspace/object/tree/synctree/synctree_test.go index e19eaa1e..b283fb72 100644 --- a/common/commonspace/synctree/synctree_test.go +++ b/common/commonspace/object/tree/synctree/synctree_test.go @@ -2,26 +2,26 @@ package synctree import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list/mock_list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree/mock_objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/mock_synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener/mock_updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener/mock_updatelistener" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list/mock_list" - storage2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree/mock_objecttree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "testing" ) type syncTreeMatcher struct { - objTree tree.ObjectTree + objTree objecttree.ObjectTree client SyncClient listener updatelistener.UpdateListener } @@ -38,8 +38,8 @@ func (s syncTreeMatcher) String() string { return "" } -func syncClientFuncCreator(client SyncClient) func(spaceId string, factory RequestFactory, syncService syncservice.SyncService, configuration nodeconf.Configuration) SyncClient { - return func(spaceId string, factory RequestFactory, syncService syncservice.SyncService, configuration nodeconf.Configuration) SyncClient { +func syncClientFuncCreator(client SyncClient) func(spaceId string, factory RequestFactory, objectSync objectsync.ObjectSync, configuration nodeconf.Configuration) SyncClient { + return func(spaceId string, factory RequestFactory, objectSync objectsync.ObjectSync, configuration nodeconf.Configuration) SyncClient { return client } } @@ -51,12 +51,12 @@ func Test_DeriveSyncTree(t *testing.T) { syncClientMock := mock_synctree.NewMockSyncClient(ctrl) aclListMock := mock_list.NewMockACLList(ctrl) - objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) - spaceStorageMock := mock_storage.NewMockSpaceStorage(ctrl) + objTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) + spaceStorageMock := mock_spacestorage.NewMockSpaceStorage(ctrl) headNotifiableMock := mock_synctree.NewMockHeadNotifiable(ctrl) spaceId := "spaceId" - expectedPayload := tree.ObjectTreeCreatePayload{SpaceId: spaceId} - createDerivedObjectTree = func(payload tree.ObjectTreeCreatePayload, l list.ACLList, create storage2.TreeStorageCreatorFunc) (objTree tree.ObjectTree, err error) { + expectedPayload := objecttree.ObjectTreeCreatePayload{SpaceId: spaceId} + createDerivedObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.ACLList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { require.Equal(t, l, aclListMock) require.Equal(t, expectedPayload, payload) return objTreeMock, nil @@ -88,12 +88,12 @@ func Test_CreateSyncTree(t *testing.T) { syncClientMock := mock_synctree.NewMockSyncClient(ctrl) aclListMock := mock_list.NewMockACLList(ctrl) - objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) - spaceStorageMock := mock_storage.NewMockSpaceStorage(ctrl) + objTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) + spaceStorageMock := mock_spacestorage.NewMockSpaceStorage(ctrl) headNotifiableMock := mock_synctree.NewMockHeadNotifiable(ctrl) spaceId := "spaceId" - expectedPayload := tree.ObjectTreeCreatePayload{SpaceId: spaceId} - createObjectTree = func(payload tree.ObjectTreeCreatePayload, l list.ACLList, create storage2.TreeStorageCreatorFunc) (objTree tree.ObjectTree, err error) { + expectedPayload := objecttree.ObjectTreeCreatePayload{SpaceId: spaceId} + createObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.ACLList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { require.Equal(t, l, aclListMock) require.Equal(t, expectedPayload, payload) return objTreeMock, nil @@ -126,7 +126,7 @@ func Test_BuildSyncTree(t *testing.T) { updateListenerMock := mock_updatelistener.NewMockUpdateListener(ctrl) syncClientMock := mock_synctree.NewMockSyncClient(ctrl) - objTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) + objTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) tr := &syncTree{ ObjectTree: objTreeMock, SyncHandler: nil, @@ -139,13 +139,13 @@ func Test_BuildSyncTree(t *testing.T) { headUpdate := &treechangeproto.TreeSyncMessage{} t.Run("AddRawChanges update", func(t *testing.T) { changes := []*treechangeproto.RawTreeChangeWithId{{Id: "some"}} - payload := tree.RawChangesPayload{ + payload := objecttree.RawChangesPayload{ NewHeads: nil, RawChanges: changes, } - expectedRes := tree.AddResult{ + expectedRes := objecttree.AddResult{ Added: changes, - Mode: tree.Append, + Mode: objecttree.Append, } objTreeMock.EXPECT().AddRawChanges(gomock.Any(), gomock.Eq(payload)). Return(expectedRes, nil) @@ -160,14 +160,14 @@ func Test_BuildSyncTree(t *testing.T) { t.Run("AddRawChanges rebuild", func(t *testing.T) { changes := []*treechangeproto.RawTreeChangeWithId{{Id: "some"}} - payload := tree.RawChangesPayload{ + payload := objecttree.RawChangesPayload{ NewHeads: nil, RawChanges: changes, } - expectedRes := tree.AddResult{ + expectedRes := objecttree.AddResult{ Added: changes, - Mode: tree.Rebuild, + Mode: objecttree.Rebuild, } objTreeMock.EXPECT().AddRawChanges(gomock.Any(), gomock.Eq(payload)). Return(expectedRes, nil) @@ -182,13 +182,13 @@ func Test_BuildSyncTree(t *testing.T) { t.Run("AddRawChanges nothing", func(t *testing.T) { changes := []*treechangeproto.RawTreeChangeWithId{{Id: "some"}} - payload := tree.RawChangesPayload{ + payload := objecttree.RawChangesPayload{ NewHeads: nil, RawChanges: changes, } - expectedRes := tree.AddResult{ + expectedRes := objecttree.AddResult{ Added: changes, - Mode: tree.Nothing, + Mode: objecttree.Nothing, } objTreeMock.EXPECT().AddRawChanges(gomock.Any(), gomock.Eq(payload)). Return(expectedRes, nil) @@ -200,11 +200,11 @@ func Test_BuildSyncTree(t *testing.T) { t.Run("AddContent", func(t *testing.T) { changes := []*treechangeproto.RawTreeChangeWithId{{Id: "some"}} - content := tree.SignableChangeContent{ + content := objecttree.SignableChangeContent{ Data: []byte("abcde"), } - expectedRes := tree.AddResult{ - Mode: tree.Append, + expectedRes := objecttree.AddResult{ + Mode: objecttree.Append, Added: changes, } objTreeMock.EXPECT().ID().Return("id").AnyTimes() diff --git a/common/commonspace/synctree/synctreehandler.go b/common/commonspace/object/tree/synctree/synctreehandler.go similarity index 90% rename from common/commonspace/synctree/synctreehandler.go rename to common/commonspace/object/tree/synctree/synctreehandler.go index e6471257..399ce4cb 100644 --- a/common/commonspace/synctree/synctreehandler.go +++ b/common/commonspace/object/tree/synctree/synctreehandler.go @@ -2,11 +2,11 @@ package synctree import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" "github.com/gogo/protobuf/proto" "go.uber.org/zap" @@ -14,7 +14,7 @@ import ( ) type syncTreeHandler struct { - objTree tree.ObjectTree + objTree objecttree.ObjectTree syncClient SyncClient syncStatus syncstatus.SyncStatusUpdater handlerLock sync.Mutex @@ -23,7 +23,7 @@ type syncTreeHandler struct { const maxQueueSize = 5 -func newSyncTreeHandler(objTree tree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.SyncStatusUpdater) synchandler.SyncHandler { +func newSyncTreeHandler(objTree objecttree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.SyncStatusUpdater) synchandler.SyncHandler { return &syncTreeHandler{ objTree: objTree, syncClient: syncClient, @@ -118,7 +118,7 @@ func (s *syncTreeHandler) handleHeadUpdate( return } - _, err = objTree.AddRawChanges(ctx, tree.RawChangesPayload{ + _, err = objTree.AddRawChanges(ctx, objecttree.RawChangesPayload{ NewHeads: update.Heads, RawChanges: update.Changes, }) @@ -167,7 +167,7 @@ func (s *syncTreeHandler) handleFullSyncRequest( }() if len(request.Changes) != 0 && !s.alreadyHasHeads(objTree, request.Heads) { - _, err = objTree.AddRawChanges(ctx, tree.RawChangesPayload{ + _, err = objTree.AddRawChanges(ctx, objecttree.RawChangesPayload{ NewHeads: request.Heads, RawChanges: request.Changes, }) @@ -207,13 +207,13 @@ func (s *syncTreeHandler) handleFullSyncResponse( return } - _, err = objTree.AddRawChanges(ctx, tree.RawChangesPayload{ + _, err = objTree.AddRawChanges(ctx, objecttree.RawChangesPayload{ NewHeads: response.Heads, RawChanges: response.Changes, }) return } -func (s *syncTreeHandler) alreadyHasHeads(t tree.ObjectTree, heads []string) bool { +func (s *syncTreeHandler) alreadyHasHeads(t objecttree.ObjectTree, heads []string) bool { return slice.UnsortedEquals(t.Heads(), heads) || t.HasChanges(heads...) } diff --git a/common/commonspace/synctree/synctreehandler_test.go b/common/commonspace/object/tree/synctree/synctreehandler_test.go similarity index 94% rename from common/commonspace/synctree/synctreehandler_test.go rename to common/commonspace/object/tree/synctree/synctreehandler_test.go index 8223f6db..3840d9f5 100644 --- a/common/commonspace/synctree/synctreehandler_test.go +++ b/common/commonspace/object/tree/synctree/synctreehandler_test.go @@ -3,11 +3,11 @@ package synctree import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree/mock_objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/mock_synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree/mock_objecttree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "go.uber.org/zap" @@ -16,11 +16,11 @@ import ( ) type testObjTreeMock struct { - *mock_tree.MockObjectTree + *mock_objecttree.MockObjectTree m sync.Mutex } -func newTestObjMock(mockTree *mock_tree.MockObjectTree) *testObjTreeMock { +func newTestObjMock(mockTree *mock_objecttree.MockObjectTree) *testObjTreeMock { return &testObjTreeMock{ MockObjectTree: mockTree, } @@ -46,7 +46,7 @@ type syncHandlerFixture struct { func newSyncHandlerFixture(t *testing.T) *syncHandlerFixture { ctrl := gomock.NewController(t) syncClientMock := mock_synctree.NewMockSyncClient(ctrl) - objectTreeMock := newTestObjMock(mock_tree.NewMockObjectTree(ctrl)) + objectTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) receiveQueueMock := mock_synctree.NewMockReceiveQueue(ctrl) syncHandler := &syncTreeHandler{ @@ -93,11 +93,11 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).Times(2) fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.objectTreeMock.EXPECT(). - AddRawChanges(gomock.Any(), gomock.Eq(tree.RawChangesPayload{ + AddRawChanges(gomock.Any(), gomock.Eq(objecttree.RawChangesPayload{ NewHeads: []string{"h1"}, RawChanges: []*treechangeproto.RawTreeChangeWithId{chWithId}, })). - Return(tree.AddResult{}, nil) + Return(objecttree.AddResult{}, nil) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2", "h1"}) fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(true) @@ -127,11 +127,11 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).AnyTimes() fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.objectTreeMock.EXPECT(). - AddRawChanges(gomock.Any(), gomock.Eq(tree.RawChangesPayload{ + AddRawChanges(gomock.Any(), gomock.Eq(objecttree.RawChangesPayload{ NewHeads: []string{"h1"}, RawChanges: []*treechangeproto.RawTreeChangeWithId{chWithId}, })). - Return(tree.AddResult{}, nil) + Return(objecttree.AddResult{}, nil) fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.syncClientMock.EXPECT(). CreateFullSyncRequest(gomock.Eq(fx.objectTreeMock), gomock.Eq([]string{"h1"}), gomock.Eq([]string{"h1"})). @@ -247,11 +247,11 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).AnyTimes() fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.objectTreeMock.EXPECT(). - AddRawChanges(gomock.Any(), gomock.Eq(tree.RawChangesPayload{ + AddRawChanges(gomock.Any(), gomock.Eq(objecttree.RawChangesPayload{ NewHeads: []string{"h1"}, RawChanges: []*treechangeproto.RawTreeChangeWithId{chWithId}, })). - Return(tree.AddResult{}, nil) + Return(objecttree.AddResult{}, nil) fx.syncClientMock.EXPECT(). CreateFullSyncResponse(gomock.Eq(fx.objectTreeMock), gomock.Eq([]string{"h1"}), gomock.Eq([]string{"h1"})). Return(fullResponse, nil) @@ -351,11 +351,11 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { HasChanges(gomock.Eq([]string{"h1"})). Return(false) fx.objectTreeMock.EXPECT(). - AddRawChanges(gomock.Any(), gomock.Eq(tree.RawChangesPayload{ + AddRawChanges(gomock.Any(), gomock.Eq(objecttree.RawChangesPayload{ NewHeads: []string{"h1"}, RawChanges: []*treechangeproto.RawTreeChangeWithId{chWithId}, })). - Return(tree.AddResult{}, fmt.Errorf("")) + Return(objecttree.AddResult{}, fmt.Errorf("")) fx.syncClientMock.EXPECT().SendAsync(gomock.Eq(senderId), gomock.Any(), gomock.Eq("")) fx.receiveQueueMock.EXPECT().ClearQueue(senderId) @@ -393,11 +393,11 @@ func TestSyncHandler_HandleFullSyncResponse(t *testing.T) { HasChanges(gomock.Eq([]string{"h1"})). Return(false) fx.objectTreeMock.EXPECT(). - AddRawChanges(gomock.Any(), gomock.Eq(tree.RawChangesPayload{ + AddRawChanges(gomock.Any(), gomock.Eq(objecttree.RawChangesPayload{ NewHeads: []string{"h1"}, RawChanges: []*treechangeproto.RawTreeChangeWithId{chWithId}, })). - Return(tree.AddResult{}, nil) + Return(objecttree.AddResult{}, nil) fx.receiveQueueMock.EXPECT().ClearQueue(senderId) err := fx.syncHandler.HandleMessage(ctx, senderId, objectMsg) diff --git a/common/commonspace/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go b/common/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go similarity index 83% rename from common/commonspace/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go rename to common/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go index c72db6e3..fcb65a56 100644 --- a/common/commonspace/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go +++ b/common/commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener (interfaces: UpdateListener) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener (interfaces: UpdateListener) // Package mock_updatelistener is a generated GoMock package. package mock_updatelistener @@ -7,7 +7,7 @@ package mock_updatelistener import ( reflect "reflect" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + objecttree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" gomock "github.com/golang/mock/gomock" ) @@ -35,7 +35,7 @@ func (m *MockUpdateListener) EXPECT() *MockUpdateListenerMockRecorder { } // Rebuild mocks base method. -func (m *MockUpdateListener) Rebuild(arg0 tree.ObjectTree) { +func (m *MockUpdateListener) Rebuild(arg0 objecttree.ObjectTree) { m.ctrl.T.Helper() m.ctrl.Call(m, "Rebuild", arg0) } @@ -47,7 +47,7 @@ func (mr *MockUpdateListenerMockRecorder) Rebuild(arg0 interface{}) *gomock.Call } // Update mocks base method. -func (m *MockUpdateListener) Update(arg0 tree.ObjectTree) { +func (m *MockUpdateListener) Update(arg0 objecttree.ObjectTree) { m.ctrl.T.Helper() m.ctrl.Call(m, "Update", arg0) } diff --git a/common/commonspace/synctree/updatelistener/updatelistener.go b/common/commonspace/object/tree/synctree/updatelistener/updatelistener.go similarity index 57% rename from common/commonspace/synctree/updatelistener/updatelistener.go rename to common/commonspace/object/tree/synctree/updatelistener/updatelistener.go index 5d8f6e2f..cee10947 100644 --- a/common/commonspace/synctree/updatelistener/updatelistener.go +++ b/common/commonspace/object/tree/synctree/updatelistener/updatelistener.go @@ -1,11 +1,11 @@ -//go:generate mockgen -destination mock_updatelistener/mock_updatelistener.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener UpdateListener +//go:generate mockgen -destination mock_updatelistener/mock_updatelistener.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener UpdateListener package updatelistener import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" ) type UpdateListener interface { - Update(tree tree.ObjectTree) - Rebuild(tree tree.ObjectTree) + Update(tree objecttree.ObjectTree) + Rebuild(tree objecttree.ObjectTree) } diff --git a/common/pkg/acl/treechangeproto/protos/treechange.proto b/common/commonspace/object/tree/treechangeproto/protos/treechange.proto similarity index 100% rename from common/pkg/acl/treechangeproto/protos/treechange.proto rename to common/commonspace/object/tree/treechangeproto/protos/treechange.proto diff --git a/common/pkg/acl/treechangeproto/treechange.go b/common/commonspace/object/tree/treechangeproto/treechange.go similarity index 100% rename from common/pkg/acl/treechangeproto/treechange.go rename to common/commonspace/object/tree/treechangeproto/treechange.go diff --git a/common/pkg/acl/treechangeproto/treechange.pb.go b/common/commonspace/object/tree/treechangeproto/treechange.pb.go similarity index 100% rename from common/pkg/acl/treechangeproto/treechange.pb.go rename to common/commonspace/object/tree/treechangeproto/treechange.pb.go diff --git a/common/pkg/acl/storage/helpers.go b/common/commonspace/object/tree/treestorage/helpers.go similarity index 96% rename from common/pkg/acl/storage/helpers.go rename to common/commonspace/object/tree/treestorage/helpers.go index 7796a15f..7cc35fef 100644 --- a/common/pkg/acl/storage/helpers.go +++ b/common/commonspace/object/tree/treestorage/helpers.go @@ -1,4 +1,4 @@ -package storage +package treestorage import ( "bytes" diff --git a/common/pkg/acl/storage/inmemory.go b/common/commonspace/object/tree/treestorage/inmemory.go similarity index 61% rename from common/pkg/acl/storage/inmemory.go rename to common/commonspace/object/tree/treestorage/inmemory.go index a59eeff3..f0281b27 100644 --- a/common/pkg/acl/storage/inmemory.go +++ b/common/commonspace/object/tree/treestorage/inmemory.go @@ -1,83 +1,12 @@ -package storage +package treestorage import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" "sync" ) -type inMemoryACLListStorage struct { - id string - root *aclrecordproto.RawACLRecordWithId - head string - records map[string]*aclrecordproto.RawACLRecordWithId - - sync.RWMutex -} - -func NewInMemoryACLListStorage( - id string, - records []*aclrecordproto.RawACLRecordWithId) (ListStorage, error) { - - allRecords := make(map[string]*aclrecordproto.RawACLRecordWithId) - for _, ch := range records { - allRecords[ch.Id] = ch - } - root := records[0] - head := records[len(records)-1] - - return &inMemoryACLListStorage{ - id: root.Id, - root: root, - head: head.Id, - records: allRecords, - }, nil -} - -func (t *inMemoryACLListStorage) Id() string { - t.RLock() - defer t.RUnlock() - return t.id -} - -func (t *inMemoryACLListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { - t.RLock() - defer t.RUnlock() - return t.root, nil -} - -func (t *inMemoryACLListStorage) Head() (string, error) { - t.RLock() - defer t.RUnlock() - return t.head, nil -} - -func (t *inMemoryACLListStorage) SetHead(head string) error { - t.Lock() - defer t.Unlock() - t.head = head - return nil -} - -func (t *inMemoryACLListStorage) AddRawRecord(ctx context.Context, record *aclrecordproto.RawACLRecordWithId) error { - t.Lock() - defer t.Unlock() - // TODO: better to do deep copy - t.records[record.Id] = record - return nil -} - -func (t *inMemoryACLListStorage) GetRawRecord(ctx context.Context, recordId string) (*aclrecordproto.RawACLRecordWithId, error) { - t.RLock() - defer t.RUnlock() - if res, exists := t.records[recordId]; exists { - return res, nil - } - return nil, fmt.Errorf("could not get record with id: %s", recordId) -} - type inMemoryTreeStorage struct { id string root *treechangeproto.RawTreeChangeWithId diff --git a/common/pkg/acl/storage/mock_storage/mock_storage.go b/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go similarity index 97% rename from common/pkg/acl/storage/mock_storage/mock_storage.go rename to common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go index d6361f69..e612ff99 100644 --- a/common/pkg/acl/storage/mock_storage/mock_storage.go +++ b/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go @@ -2,14 +2,14 @@ // Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage (interfaces: ListStorage,TreeStorage) // Package mock_storage is a generated GoMock package. -package mock_storage +package mock_treestorage import ( context "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" reflect "reflect" - aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - treechangeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" gomock "github.com/golang/mock/gomock" ) diff --git a/common/pkg/acl/storage/provider.go b/common/commonspace/object/tree/treestorage/provider.go similarity index 89% rename from common/pkg/acl/storage/provider.go rename to common/commonspace/object/tree/treestorage/provider.go index fd065f78..d1b25d17 100644 --- a/common/pkg/acl/storage/provider.go +++ b/common/commonspace/object/tree/treestorage/provider.go @@ -1,8 +1,8 @@ -package storage +package treestorage import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" ) var ( diff --git a/common/pkg/acl/storage/treestorage.go b/common/commonspace/object/tree/treestorage/treestorage.go similarity index 89% rename from common/pkg/acl/storage/treestorage.go rename to common/commonspace/object/tree/treestorage/treestorage.go index dcb99fd0..74e48656 100644 --- a/common/pkg/acl/storage/treestorage.go +++ b/common/commonspace/object/tree/treestorage/treestorage.go @@ -1,8 +1,8 @@ -package storage +package treestorage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" ) type TreeStorage interface { diff --git a/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go b/common/commonspace/object/treegetter/mock_treegetter/mock_treegetter.go similarity index 93% rename from common/commonspace/treegetter/mock_treegetter/mock_treegetter.go rename to common/commonspace/object/treegetter/mock_treegetter/mock_treegetter.go index 4706000b..e64ace34 100644 --- a/common/commonspace/treegetter/mock_treegetter/mock_treegetter.go +++ b/common/commonspace/object/treegetter/mock_treegetter/mock_treegetter.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter (interfaces: TreeGetter) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter (interfaces: TreeGetter) // Package mock_treegetter is a generated GoMock package. package mock_treegetter @@ -9,7 +9,7 @@ import ( reflect "reflect" app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + objecttree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" gomock "github.com/golang/mock/gomock" ) @@ -65,10 +65,10 @@ func (mr *MockTreeGetterMockRecorder) DeleteTree(arg0, arg1, arg2 interface{}) * } // GetTree mocks base method. -func (m *MockTreeGetter) GetTree(arg0 context.Context, arg1, arg2 string) (tree.ObjectTree, error) { +func (m *MockTreeGetter) GetTree(arg0 context.Context, arg1, arg2 string) (objecttree.ObjectTree, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetTree", arg0, arg1, arg2) - ret0, _ := ret[0].(tree.ObjectTree) + ret0, _ := ret[0].(objecttree.ObjectTree) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/common/commonspace/treegetter/treegetter.go b/common/commonspace/object/treegetter/treegetter.go similarity index 63% rename from common/commonspace/treegetter/treegetter.go rename to common/commonspace/object/treegetter/treegetter.go index 79e2913f..2f020e86 100644 --- a/common/commonspace/treegetter/treegetter.go +++ b/common/commonspace/object/treegetter/treegetter.go @@ -1,19 +1,16 @@ -//go:generate mockgen -destination mock_treegetter/mock_treegetter.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter TreeGetter +//go:generate mockgen -destination mock_treegetter/mock_treegetter.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter TreeGetter package treegetter import ( "context" - "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" ) -const CName = "commonspace.treeGetter" - -var ErrSpaceNotFound = errors.New("space not found") +const CName = "object.treegetter" type TreeGetter interface { app.ComponentRunnable - GetTree(ctx context.Context, spaceId, treeId string) (tree.ObjectTree, error) + GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error) DeleteTree(ctx context.Context, spaceId, treeId string) error } diff --git a/common/commonspace/objectgetter/objectgetter.go b/common/commonspace/objectgetter/objectgetter.go deleted file mode 100644 index 11b9e835..00000000 --- a/common/commonspace/objectgetter/objectgetter.go +++ /dev/null @@ -1,14 +0,0 @@ -package objectgetter - -import ( - "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" -) - -type Object interface { - synchandler.SyncHandler -} - -type ObjectGetter interface { - GetObject(ctx context.Context, objectId string) (Object, error) -} diff --git a/common/commonspace/syncservice/actionqueue.go b/common/commonspace/objectsync/actionqueue.go similarity index 98% rename from common/commonspace/syncservice/actionqueue.go rename to common/commonspace/objectsync/actionqueue.go index 17a5400a..bf76334f 100644 --- a/common/commonspace/syncservice/actionqueue.go +++ b/common/commonspace/objectsync/actionqueue.go @@ -1,4 +1,4 @@ -package syncservice +package objectsync import ( "context" diff --git a/common/commonspace/syncservice/mock_syncservice/mock_syncservice.go b/common/commonspace/objectsync/mock_objectsync/mock_objectsync.go similarity index 85% rename from common/commonspace/syncservice/mock_syncservice/mock_syncservice.go rename to common/commonspace/objectsync/mock_objectsync/mock_objectsync.go index 4617bf7f..97b17e10 100644 --- a/common/commonspace/syncservice/mock_syncservice/mock_syncservice.go +++ b/common/commonspace/objectsync/mock_objectsync/mock_objectsync.go @@ -1,13 +1,13 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice (interfaces: ActionQueue) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync (interfaces: ActionQueue) -// Package mock_syncservice is a generated GoMock package. -package mock_syncservice +// Package mock_objectsync is a generated GoMock package. +package mock_objectsync import ( reflect "reflect" - syncservice "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" + objectsync "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" gomock "github.com/golang/mock/gomock" ) @@ -59,7 +59,7 @@ func (mr *MockActionQueueMockRecorder) Run() *gomock.Call { } // Send mocks base method. -func (m *MockActionQueue) Send(arg0 syncservice.ActionFunc) error { +func (m *MockActionQueue) Send(arg0 objectsync.ActionFunc) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Send", arg0) ret0, _ := ret[0].(error) diff --git a/common/commonspace/syncservice/syncservice.go b/common/commonspace/objectsync/objectsync.go similarity index 69% rename from common/commonspace/syncservice/syncservice.go rename to common/commonspace/objectsync/objectsync.go index 574d5f6f..8b821193 100644 --- a/common/commonspace/syncservice/syncservice.go +++ b/common/commonspace/objectsync/objectsync.go @@ -1,51 +1,51 @@ -//go:generate mockgen -destination mock_syncservice/mock_syncservice.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice ActionQueue -package syncservice +//go:generate mockgen -destination mock_objectsync/mock_objectsync.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync ActionQueue +package objectsync import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectgetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/syncobjectgetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync" "go.uber.org/zap" "time" ) -var log = logger.NewNamed("commonspace.syncservice") +var log = logger.NewNamed("commonspace.objectsync") -type SyncService interface { +type ObjectSync interface { ocache.ObjectLastUsage synchandler.SyncHandler StreamPool() StreamPool StreamChecker() StreamChecker ActionQueue() ActionQueue - Init(getter objectgetter.ObjectGetter) + Init(getter syncobjectgetter.SyncObjectGetter) Close() (err error) } -type syncService struct { +type objectSync struct { spaceId string streamPool StreamPool checker StreamChecker periodicSync periodicsync.PeriodicSync - objectGetter objectgetter.ObjectGetter + objectGetter syncobjectgetter.SyncObjectGetter actionQueue ActionQueue syncCtx context.Context cancelSync context.CancelFunc } -func NewSyncService( +func NewObjectSync( spaceId string, confConnector nodeconf.ConfConnector, - periodicSeconds int) (syncService SyncService) { + periodicSeconds int) (objectSync ObjectSync) { streamPool := newStreamPool(func(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { - return syncService.HandleMessage(ctx, senderId, message) + return objectSync.HandleMessage(ctx, senderId, message) }) clientFactory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceClient) syncLog := log.With(zap.String("id", spaceId)) @@ -61,7 +61,7 @@ func NewSyncService( checker.CheckResponsiblePeers() return nil }, syncLog) - syncService = newSyncService( + objectSync = newObjectSync( spaceId, streamPool, periodicSync, @@ -71,15 +71,15 @@ func NewSyncService( return } -func newSyncService( +func newObjectSync( spaceId string, streamPool StreamPool, periodicSync periodicsync.PeriodicSync, checker StreamChecker, syncCtx context.Context, cancel context.CancelFunc, -) *syncService { - return &syncService{ +) *objectSync { + return &objectSync{ periodicSync: periodicSync, streamPool: streamPool, spaceId: spaceId, @@ -90,24 +90,24 @@ func newSyncService( } } -func (s *syncService) Init(objectGetter objectgetter.ObjectGetter) { +func (s *objectSync) Init(objectGetter syncobjectgetter.SyncObjectGetter) { s.objectGetter = objectGetter s.actionQueue.Run() s.periodicSync.Run() } -func (s *syncService) Close() (err error) { +func (s *objectSync) Close() (err error) { s.actionQueue.Close() s.periodicSync.Close() s.cancelSync() return s.streamPool.Close() } -func (s *syncService) LastUsage() time.Time { +func (s *objectSync) LastUsage() time.Time { return s.streamPool.LastUsage() } -func (s *syncService) HandleMessage(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { +func (s *objectSync) HandleMessage(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { log.With(zap.String("peerId", senderId), zap.String("objectId", message.ObjectId)).Debug("handling message") obj, err := s.objectGetter.GetObject(ctx, message.ObjectId) if err != nil { @@ -116,14 +116,14 @@ func (s *syncService) HandleMessage(ctx context.Context, senderId string, messag return obj.HandleMessage(ctx, senderId, message) } -func (s *syncService) StreamPool() StreamPool { +func (s *objectSync) StreamPool() StreamPool { return s.streamPool } -func (s *syncService) StreamChecker() StreamChecker { +func (s *objectSync) StreamChecker() StreamChecker { return s.checker } -func (s *syncService) ActionQueue() ActionQueue { +func (s *objectSync) ActionQueue() ActionQueue { return s.actionQueue } diff --git a/common/commonspace/syncservice/streamchecker.go b/common/commonspace/objectsync/streamchecker.go similarity index 99% rename from common/commonspace/syncservice/streamchecker.go rename to common/commonspace/objectsync/streamchecker.go index 1ff06f7a..6d199676 100644 --- a/common/commonspace/syncservice/streamchecker.go +++ b/common/commonspace/objectsync/streamchecker.go @@ -1,4 +1,4 @@ -package syncservice +package objectsync import ( "context" diff --git a/common/commonspace/syncservice/streampool.go b/common/commonspace/objectsync/streampool.go similarity index 99% rename from common/commonspace/syncservice/streampool.go rename to common/commonspace/objectsync/streampool.go index b1bc0f09..accda6fc 100644 --- a/common/commonspace/syncservice/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -1,12 +1,12 @@ -package syncservice +package objectsync import ( "context" "errors" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "go.uber.org/zap" "sync" "sync/atomic" diff --git a/common/commonspace/syncservice/streampool_test.go b/common/commonspace/objectsync/streampool_test.go similarity index 99% rename from common/commonspace/syncservice/streampool_test.go rename to common/commonspace/objectsync/streampool_test.go index 3fd7f746..bf32bbf9 100644 --- a/common/commonspace/syncservice/streampool_test.go +++ b/common/commonspace/objectsync/streampool_test.go @@ -1,4 +1,4 @@ -package syncservice +package objectsync import ( "context" diff --git a/common/commonspace/syncservice/synchandler/synchhandler.go b/common/commonspace/objectsync/synchandler/synchhandler.go similarity index 100% rename from common/commonspace/syncservice/synchandler/synchhandler.go rename to common/commonspace/objectsync/synchandler/synchhandler.go diff --git a/common/commonspace/payloads.go b/common/commonspace/payloads.go index cd6a4c1f..117df889 100644 --- a/common/commonspace/payloads.go +++ b/common/commonspace/payloads.go @@ -1,12 +1,12 @@ package commonspace import ( + aclrecordproto2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/keychain" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - aclrecordproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "hash/fnv" "math/rand" @@ -18,7 +18,7 @@ const ( SpaceDerivationScheme = "derivation.standard" ) -func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload storage.SpaceStorageCreatePayload, err error) { +func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload spacestorage.SpaceStorageCreatePayload, err error) { // unmarshalling signing and encryption keys identity, err := payload.SigningKey.GetPublic().Raw() if err != nil { @@ -55,7 +55,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload st if err != nil { return } - id, err := cid.NewCIDFromBytes(marshalled) + id, err := cidutil.NewCIDFromBytes(marshalled) spaceId := NewSpaceId(id, payload.ReplicationKey) rawHeaderWithId := &spacesyncproto.RawSpaceHeaderWithId{ RawHeader: marshalled, @@ -75,7 +75,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload st } // preparing acl - aclRoot := &aclrecordproto.ACLRoot{ + aclRoot := &aclrecordproto2.ACLRoot{ Identity: identity, EncryptionKey: encPubKey, SpaceId: spaceId, @@ -88,14 +88,14 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload st return } - builder := tree.NewChangeBuilder(common.NewKeychain(), nil) + builder := objecttree.NewChangeBuilder(keychain.NewKeychain(), nil) spaceSettingsSeed := make([]byte, 32) _, err = rand.Read(spaceSettingsSeed) if err != nil { return } - _, settingsRoot, err := builder.BuildInitialContent(tree.InitialContent{ + _, settingsRoot, err := builder.BuildInitialContent(objecttree.InitialContent{ AclHeadId: rawWithId.Id, Identity: aclRoot.Identity, SigningKey: payload.SigningKey, @@ -109,7 +109,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload st } // creating storage - storagePayload = storage.SpaceStorageCreatePayload{ + storagePayload = spacestorage.SpaceStorageCreatePayload{ AclWithId: rawWithId, SpaceHeaderWithId: rawHeaderWithId, SpaceSettingsWithId: settingsRoot, @@ -117,7 +117,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload st return } -func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload storage.SpaceStorageCreatePayload, err error) { +func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload spacestorage.SpaceStorageCreatePayload, err error) { // unmarshalling signing and encryption keys identity, err := payload.SigningKey.GetPublic().Raw() if err != nil { @@ -163,7 +163,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st if err != nil { return } - id, err := cid.NewCIDFromBytes(marshalled) + id, err := cidutil.NewCIDFromBytes(marshalled) spaceId := NewSpaceId(id, repKey) rawHeaderWithId := &spacesyncproto.RawSpaceHeaderWithId{ RawHeader: marshalled, @@ -171,7 +171,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st } // deriving and encrypting read key - readKey, err := aclrecordproto.ACLReadKeyDerive(signPrivKey, encPrivKey) + readKey, err := aclrecordproto2.ACLReadKeyDerive(signPrivKey, encPrivKey) if err != nil { return } @@ -187,7 +187,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st } // preparing acl - aclRoot := &aclrecordproto.ACLRoot{ + aclRoot := &aclrecordproto2.ACLRoot{ Identity: identity, EncryptionKey: encPubKey, SpaceId: spaceId, @@ -200,8 +200,8 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st return } - builder := tree.NewChangeBuilder(common.NewKeychain(), nil) - _, settingsRoot, err := builder.BuildInitialContent(tree.InitialContent{ + builder := objecttree.NewChangeBuilder(keychain.NewKeychain(), nil) + _, settingsRoot, err := builder.BuildInitialContent(objecttree.InitialContent{ AclHeadId: rawWithId.Id, Identity: aclRoot.Identity, SigningKey: payload.SigningKey, @@ -213,7 +213,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st } // creating storage - storagePayload = storage.SpaceStorageCreatePayload{ + storagePayload = spacestorage.SpaceStorageCreatePayload{ AclWithId: rawWithId, SpaceHeaderWithId: rawHeaderWithId, SpaceSettingsWithId: settingsRoot, @@ -221,7 +221,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload st return } -func marshalACLRoot(aclRoot *aclrecordproto.ACLRoot, key signingkey.PrivKey) (rawWithId *aclrecordproto.RawACLRecordWithId, err error) { +func marshalACLRoot(aclRoot *aclrecordproto2.ACLRoot, key signingkey.PrivKey) (rawWithId *aclrecordproto2.RawACLRecordWithId, err error) { marshalledRoot, err := aclRoot.Marshal() if err != nil { return @@ -230,7 +230,7 @@ func marshalACLRoot(aclRoot *aclrecordproto.ACLRoot, key signingkey.PrivKey) (ra if err != nil { return } - raw := &aclrecordproto.RawACLRecord{ + raw := &aclrecordproto2.RawACLRecord{ Payload: marshalledRoot, Signature: signature, } @@ -238,11 +238,11 @@ func marshalACLRoot(aclRoot *aclrecordproto.ACLRoot, key signingkey.PrivKey) (ra if err != nil { return } - aclHeadId, err := cid.NewCIDFromBytes(marshalledRaw) + aclHeadId, err := cidutil.NewCIDFromBytes(marshalledRaw) if err != nil { return } - rawWithId = &aclrecordproto.RawACLRecordWithId{ + rawWithId = &aclrecordproto2.RawACLRecordWithId{ Payload: marshalledRaw, Id: aclHeadId, } diff --git a/common/commonspace/settings/deleter.go b/common/commonspace/settings/deleter.go index 3a07fe16..ce56444e 100644 --- a/common/commonspace/settings/deleter.go +++ b/common/commonspace/settings/deleter.go @@ -2,9 +2,9 @@ package settings import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "go.uber.org/zap" ) @@ -13,12 +13,12 @@ type Deleter interface { } type deleter struct { - st storage.SpaceStorage + st spacestorage.SpaceStorage state deletionstate.DeletionState getter treegetter.TreeGetter } -func newDeleter(st storage.SpaceStorage, state deletionstate.DeletionState, getter treegetter.TreeGetter) Deleter { +func newDeleter(st spacestorage.SpaceStorage, state deletionstate.DeletionState, getter treegetter.TreeGetter) Deleter { return &deleter{st, state, getter} } @@ -26,7 +26,7 @@ func (d *deleter) Delete() { allQueued := d.state.GetQueued() for _, id := range allQueued { err := d.getter.DeleteTree(context.Background(), d.st.Id(), id) - if err != nil && err != storage.ErrTreeStorageAlreadyDeleted { + if err != nil && err != spacestorage.ErrTreeStorageAlreadyDeleted { log.With(zap.String("id", id), zap.Error(err)).Error("failed to delete object") continue } diff --git a/common/commonspace/settings/deleter_test.go b/common/commonspace/settings/deleter_test.go index f2784bfc..4c2ac772 100644 --- a/common/commonspace/settings/deleter_test.go +++ b/common/commonspace/settings/deleter_test.go @@ -2,10 +2,10 @@ package settings import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/golang/mock/gomock" "testing" ) @@ -13,7 +13,7 @@ import ( func TestDeleter_Delete(t *testing.T) { ctrl := gomock.NewController(t) treeGetter := mock_treegetter.NewMockTreeGetter(ctrl) - st := mock_storage.NewMockSpaceStorage(ctrl) + st := mock_spacestorage.NewMockSpaceStorage(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl) deleter := newDeleter(st, delState, treeGetter) @@ -34,7 +34,7 @@ func TestDeleter_Delete(t *testing.T) { spaceId := "spaceId" delState.EXPECT().GetQueued().Return([]string{id}) st.EXPECT().Id().Return(spaceId) - treeGetter.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(storage.ErrTreeStorageAlreadyDeleted) + treeGetter.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(spacestorage.ErrTreeStorageAlreadyDeleted) delState.EXPECT().Delete(id).Return(nil) deleter.Delete() diff --git a/common/commonspace/settings/deletionstate/deletionstate.go b/common/commonspace/settings/deletionstate/deletionstate.go index e3d30f15..066e226e 100644 --- a/common/commonspace/settings/deletionstate/deletionstate.go +++ b/common/commonspace/settings/deletionstate/deletionstate.go @@ -2,8 +2,8 @@ package deletionstate import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "sync" ) @@ -24,10 +24,10 @@ type deletionState struct { queued map[string]struct{} deleted map[string]struct{} stateUpdateObservers []StateUpdateObserver - storage storage.SpaceStorage + storage spacestorage.SpaceStorage } -func NewDeletionState(storage storage.SpaceStorage) DeletionState { +func NewDeletionState(storage spacestorage.SpaceStorage) DeletionState { return &deletionState{ queued: map[string]struct{}{}, deleted: map[string]struct{}{}, @@ -68,13 +68,13 @@ func (st *deletionState) Add(ids []string) (err error) { } switch status { - case storage.TreeDeletedStatusQueued: + case spacestorage.TreeDeletedStatusQueued: st.queued[id] = struct{}{} - case storage.TreeDeletedStatusDeleted: + case spacestorage.TreeDeletedStatusDeleted: st.deleted[id] = struct{}{} default: st.queued[id] = struct{}{} - err = st.storage.SetTreeDeletedStatus(id, storage.TreeDeletedStatusQueued) + err = st.storage.SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued) if err != nil { return } @@ -98,7 +98,7 @@ func (st *deletionState) Delete(id string) (err error) { defer st.Unlock() delete(st.queued, id) st.deleted[id] = struct{}{} - err = st.storage.SetTreeDeletedStatus(id, storage.TreeDeletedStatusDeleted) + err = st.storage.SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusDeleted) if err != nil { return } diff --git a/common/commonspace/settings/deletionstate/deletionstate_test.go b/common/commonspace/settings/deletionstate/deletionstate_test.go index d3feeae3..8a270d29 100644 --- a/common/commonspace/settings/deletionstate/deletionstate_test.go +++ b/common/commonspace/settings/deletionstate/deletionstate_test.go @@ -1,8 +1,8 @@ package deletionstate import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "testing" @@ -11,12 +11,12 @@ import ( type fixture struct { ctrl *gomock.Controller delState *deletionState - spaceStorage *mock_storage.MockSpaceStorage + spaceStorage *mock_spacestorage.MockSpaceStorage } func newFixture(t *testing.T) *fixture { ctrl := gomock.NewController(t) - spaceStorage := mock_storage.NewMockSpaceStorage(ctrl) + spaceStorage := mock_spacestorage.NewMockSpaceStorage(ctrl) delState := NewDeletionState(spaceStorage).(*deletionState) return &fixture{ ctrl: ctrl, @@ -35,7 +35,7 @@ func TestDeletionState_Add(t *testing.T) { defer fx.stop() id := "newId" fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return("", nil) - fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, storage.TreeDeletedStatusQueued).Return(nil) + fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued).Return(nil) err := fx.delState.Add([]string{id}) require.NoError(t, err) require.Contains(t, fx.delState.queued, id) @@ -45,7 +45,7 @@ func TestDeletionState_Add(t *testing.T) { fx := newFixture(t) defer fx.stop() id := "newId" - fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(storage.TreeDeletedStatusQueued, nil) + fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(spacestorage.TreeDeletedStatusQueued, nil) err := fx.delState.Add([]string{id}) require.NoError(t, err) require.Contains(t, fx.delState.queued, id) @@ -55,7 +55,7 @@ func TestDeletionState_Add(t *testing.T) { fx := newFixture(t) defer fx.stop() id := "newId" - fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(storage.TreeDeletedStatusDeleted, nil) + fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(spacestorage.TreeDeletedStatusDeleted, nil) err := fx.delState.Add([]string{id}) require.NoError(t, err) require.Contains(t, fx.delState.deleted, id) @@ -95,7 +95,7 @@ func TestDeletionState_AddObserver(t *testing.T) { }) id := "newId" fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return("", nil) - fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, storage.TreeDeletedStatusQueued).Return(nil) + fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued).Return(nil) err := fx.delState.Add([]string{id}) require.NoError(t, err) require.Contains(t, fx.delState.queued, id) @@ -108,7 +108,7 @@ func TestDeletionState_Delete(t *testing.T) { id := "deletedId" fx.delState.queued[id] = struct{}{} - fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, storage.TreeDeletedStatusDeleted).Return(nil) + fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusDeleted).Return(nil) err := fx.delState.Delete(id) require.NoError(t, err) require.Contains(t, fx.delState.deleted, id) @@ -124,4 +124,4 @@ func TestDeletionState_Exists(t *testing.T) { require.True(t, fx.delState.Exists("id1")) require.True(t, fx.delState.Exists("id2")) require.False(t, fx.delState.Exists("id3")) -} \ No newline at end of file +} diff --git a/common/commonspace/settings/idprovider.go b/common/commonspace/settings/idprovider.go index 1d15afb0..7af4067b 100644 --- a/common/commonspace/settings/idprovider.go +++ b/common/commonspace/settings/idprovider.go @@ -1,18 +1,18 @@ package settings import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" "github.com/gogo/protobuf/proto" ) type DeletedIdsProvider interface { - ProvideIds(tr tree.ObjectTree, startId string) (ids []string, lastId string, err error) + ProvideIds(tr objecttree.ObjectTree, startId string) (ids []string, lastId string, err error) } type provider struct{} -func (p *provider) processChange(change *tree.Change, rootId, startId string, ids []string) []string { +func (p *provider) processChange(change *objecttree.Change, rootId, startId string, ids []string) []string { // ignoring root change which has empty model or startId change if change.Model == nil || (change.Id == startId && startId != "") { return ids @@ -34,9 +34,9 @@ func (p *provider) processChange(change *tree.Change, rootId, startId string, id return ids } -func (p *provider) ProvideIds(tr tree.ObjectTree, startId string) (ids []string, lastId string, err error) { +func (p *provider) ProvideIds(tr objecttree.ObjectTree, startId string) (ids []string, lastId string, err error) { rootId := tr.Root().Id - process := func(change *tree.Change) bool { + process := func(change *objecttree.Change) bool { lastId = change.Id ids = p.processChange(change, rootId, startId, ids) return true diff --git a/common/commonspace/settings/idprovider_test.go b/common/commonspace/settings/idprovider_test.go index 5f412ec0..7f52f051 100644 --- a/common/commonspace/settings/idprovider_test.go +++ b/common/commonspace/settings/idprovider_test.go @@ -1,9 +1,9 @@ package settings import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree/mock_objecttree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - mock_tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree/mock_objecttree" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "testing" @@ -16,7 +16,7 @@ func TestProvider_ProcessChange(t *testing.T) { //defer ctrl.Finish() t.Run("empty model", func(t *testing.T) { - ch := &tree.Change{} + ch := &objecttree.Change{} startId := "startId" rootId := "rootId" ids := []string{startId} @@ -25,7 +25,7 @@ func TestProvider_ProcessChange(t *testing.T) { }) t.Run("changeId is equal to startId", func(t *testing.T) { - ch := &tree.Change{} + ch := &objecttree.Change{} ch.Model = &spacesyncproto.SettingsData{} ch.Id = "startId" @@ -37,7 +37,7 @@ func TestProvider_ProcessChange(t *testing.T) { }) t.Run("changeId is equal to rootId, startId is empty", func(t *testing.T) { - ch := &tree.Change{} + ch := &objecttree.Change{} ch.Model = &spacesyncproto.SettingsData{ Snapshot: &spacesyncproto.SpaceSettingsSnapshot{ DeletedIds: []string{"id1", "id2"}, @@ -52,7 +52,7 @@ func TestProvider_ProcessChange(t *testing.T) { }) t.Run("changeId is equal to rootId, startId is empty", func(t *testing.T) { - ch := &tree.Change{} + ch := &objecttree.Change{} ch.Model = &spacesyncproto.SettingsData{ Content: []*spacesyncproto.SpaceSettingsContent{ {&spacesyncproto.SpaceSettingsContent_ObjectDelete{ @@ -71,12 +71,12 @@ func TestProvider_ProcessChange(t *testing.T) { func TestProvider_ProvideIds(t *testing.T) { ctrl := gomock.NewController(t) - objTree := mock_tree.NewMockObjectTree(ctrl) + objTree := mock_objecttree.NewMockObjectTree(ctrl) prov := &provider{} defer ctrl.Finish() t.Run("startId is empty", func(t *testing.T) { - ch := &tree.Change{Id: "rootId"} + ch := &objecttree.Change{Id: "rootId"} objTree.EXPECT().Root().Return(ch) objTree.EXPECT().ID().Return("id") objTree.EXPECT().IterateFrom("id", gomock.Any(), gomock.Any()).Return(nil) @@ -85,7 +85,7 @@ func TestProvider_ProvideIds(t *testing.T) { }) t.Run("startId is not empty", func(t *testing.T) { - ch := &tree.Change{Id: "rootId"} + ch := &objecttree.Change{Id: "rootId"} objTree.EXPECT().Root().Return(ch) objTree.EXPECT().IterateFrom("startId", gomock.Any(), gomock.Any()).Return(nil) _, _, err := prov.ProvideIds(objTree, "startId") diff --git a/common/commonspace/settings/mock_settings/mock_settings.go b/common/commonspace/settings/mock_settings/mock_settings.go index c9814bfd..1e24b27f 100644 --- a/common/commonspace/settings/mock_settings/mock_settings.go +++ b/common/commonspace/settings/mock_settings/mock_settings.go @@ -7,7 +7,7 @@ package mock_settings import ( reflect "reflect" - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + objecttree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" gomock "github.com/golang/mock/gomock" ) @@ -35,7 +35,7 @@ func (m *MockDeletedIdsProvider) EXPECT() *MockDeletedIdsProviderMockRecorder { } // ProvideIds mocks base method. -func (m *MockDeletedIdsProvider) ProvideIds(arg0 tree.ObjectTree, arg1 string) ([]string, string, error) { +func (m *MockDeletedIdsProvider) ProvideIds(arg0 objecttree.ObjectTree, arg1 string) ([]string, string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ProvideIds", arg0, arg1) ret0, _ := ret[0].([]string) diff --git a/common/commonspace/settings/mock_settings/mock_settingsdocument.go b/common/commonspace/settings/mock_settings/mock_settingsdocument.go deleted file mode 100644 index c9814bfd..00000000 --- a/common/commonspace/settings/mock_settings/mock_settingsdocument.go +++ /dev/null @@ -1,86 +0,0 @@ -// Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings (interfaces: DeletedIdsProvider,Deleter) - -// Package mock_settings is a generated GoMock package. -package mock_settings - -import ( - reflect "reflect" - - tree "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - gomock "github.com/golang/mock/gomock" -) - -// MockDeletedIdsProvider is a mock of DeletedIdsProvider interface. -type MockDeletedIdsProvider struct { - ctrl *gomock.Controller - recorder *MockDeletedIdsProviderMockRecorder -} - -// MockDeletedIdsProviderMockRecorder is the mock recorder for MockDeletedIdsProvider. -type MockDeletedIdsProviderMockRecorder struct { - mock *MockDeletedIdsProvider -} - -// NewMockDeletedIdsProvider creates a new mock instance. -func NewMockDeletedIdsProvider(ctrl *gomock.Controller) *MockDeletedIdsProvider { - mock := &MockDeletedIdsProvider{ctrl: ctrl} - mock.recorder = &MockDeletedIdsProviderMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockDeletedIdsProvider) EXPECT() *MockDeletedIdsProviderMockRecorder { - return m.recorder -} - -// ProvideIds mocks base method. -func (m *MockDeletedIdsProvider) ProvideIds(arg0 tree.ObjectTree, arg1 string) ([]string, string, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ProvideIds", arg0, arg1) - ret0, _ := ret[0].([]string) - ret1, _ := ret[1].(string) - ret2, _ := ret[2].(error) - return ret0, ret1, ret2 -} - -// ProvideIds indicates an expected call of ProvideIds. -func (mr *MockDeletedIdsProviderMockRecorder) ProvideIds(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProvideIds", reflect.TypeOf((*MockDeletedIdsProvider)(nil).ProvideIds), arg0, arg1) -} - -// MockDeleter is a mock of Deleter interface. -type MockDeleter struct { - ctrl *gomock.Controller - recorder *MockDeleterMockRecorder -} - -// MockDeleterMockRecorder is the mock recorder for MockDeleter. -type MockDeleterMockRecorder struct { - mock *MockDeleter -} - -// NewMockDeleter creates a new mock instance. -func NewMockDeleter(ctrl *gomock.Controller) *MockDeleter { - mock := &MockDeleter{ctrl: ctrl} - mock.recorder = &MockDeleterMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockDeleter) EXPECT() *MockDeleterMockRecorder { - return m.recorder -} - -// Delete mocks base method. -func (m *MockDeleter) Delete() { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Delete") -} - -// Delete indicates an expected call of Delete. -func (mr *MockDeleterMockRecorder) Delete() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDeleter)(nil).Delete)) -} diff --git a/common/commonspace/settings/settings.go b/common/commonspace/settings/settings.go index 33ce129d..c6396192 100644 --- a/common/commonspace/settings/settings.go +++ b/common/commonspace/settings/settings.go @@ -4,14 +4,14 @@ package settings import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "go.uber.org/zap" ) @@ -33,7 +33,7 @@ type BuildTreeFunc func(ctx context.Context, id string, listener updatelistener. type Deps struct { BuildFunc BuildTreeFunc - Account account.Service + Account accountservice.Service TreeGetter treegetter.TreeGetter Store spacestorage.SpaceStorage DeletionState deletionstate.DeletionState @@ -44,7 +44,7 @@ type Deps struct { type settingsObject struct { synctree.SyncTree - account account.Service + account accountservice.Service spaceId string treeGetter treegetter.TreeGetter store spacestorage.SpaceStorage @@ -92,7 +92,7 @@ func NewSettingsObject(deps Deps, spaceId string) (obj SettingsObject) { return } -func (s *settingsObject) updateIds(tr tree.ObjectTree, lastChangeId string) { +func (s *settingsObject) updateIds(tr objecttree.ObjectTree, lastChangeId string) { s.lastChangeId = lastChangeId ids, lastId, err := s.prov.ProvideIds(tr, s.lastChangeId) if err != nil { @@ -106,12 +106,12 @@ func (s *settingsObject) updateIds(tr tree.ObjectTree, lastChangeId string) { } // Update is called as part of UpdateListener interface -func (s *settingsObject) Update(tr tree.ObjectTree) { +func (s *settingsObject) Update(tr objecttree.ObjectTree) { s.updateIds(tr, s.lastChangeId) } // Rebuild is called as part of UpdateListener interface (including when the object is built for the first time, e.g. on Init call) -func (s *settingsObject) Rebuild(tr tree.ObjectTree) { +func (s *settingsObject) Rebuild(tr objecttree.ObjectTree) { // at initial build "s" may not contain the object tree, so it is safer to provide it from the function parameter s.updateIds(tr, "") } @@ -157,7 +157,7 @@ func (s *settingsObject) DeleteObject(id string) (err error) { } accountData := s.account.Account() - _, err = s.AddContent(context.Background(), tree.SignableChangeContent{ + _, err = s.AddContent(context.Background(), objecttree.SignableChangeContent{ Data: res, Key: accountData.SignKey, Identity: accountData.Identity, diff --git a/common/commonspace/settings/settings_test.go b/common/commonspace/settings/settings_test.go index ef9d4ac1..45e4e90a 100644 --- a/common/commonspace/settings/settings_test.go +++ b/common/commonspace/settings/settings_test.go @@ -2,16 +2,16 @@ package settings import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account/mock_account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice/mock_accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/mock_synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter/mock_treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate/mock_deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/mock_settings" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/mock_synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage/mock_spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -45,12 +45,12 @@ type settingsFixture struct { doc *settingsObject ctrl *gomock.Controller treeGetter *mock_treegetter.MockTreeGetter - spaceStorage *mock_storage.MockSpaceStorage + spaceStorage *mock_spacestorage.MockSpaceStorage provider *mock_settings.MockDeletedIdsProvider deleter *mock_settings.MockDeleter syncTree *mock_synctree.MockSyncTree delState *mock_deletionstate.MockDeletionState - account *mock_account.MockService + account *mock_accountservice.MockService } func newSettingsFixture(t *testing.T) *settingsFixture { @@ -58,9 +58,9 @@ func newSettingsFixture(t *testing.T) *settingsFixture { objectId := "objectId" ctrl := gomock.NewController(t) - acc := mock_account.NewMockService(ctrl) + acc := mock_accountservice.NewMockService(ctrl) treeGetter := mock_treegetter.NewMockTreeGetter(ctrl) - st := mock_storage.NewMockSpaceStorage(ctrl) + st := mock_spacestorage.NewMockSpaceStorage(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl) prov := mock_settings.NewMockDeletedIdsProvider(ctrl) syncTree := mock_synctree.NewMockSyncTree(ctrl) @@ -135,20 +135,20 @@ func TestSettingsObject_DeleteObject(t *testing.T) { res := []byte("settingsData") fx.delState.EXPECT().CreateDeleteChange(delId, false).Return(res, nil) - accountData := &account.AccountData{ + accountData := &accountdata.AccountData{ Identity: []byte("id"), PeerKey: nil, SignKey: &signingkey.Ed25519PrivateKey{}, EncKey: nil, } fx.account.EXPECT().Account().Return(accountData) - fx.syncTree.EXPECT().AddContent(gomock.Any(), tree.SignableChangeContent{ + fx.syncTree.EXPECT().AddContent(gomock.Any(), objecttree.SignableChangeContent{ Data: res, Key: accountData.SignKey, Identity: accountData.Identity, IsSnapshot: false, IsEncrypted: false, - }).Return(tree.AddResult{}, nil) + }).Return(objecttree.AddResult{}, nil) lastChangeId := "someId" retIds := []string{"id1", "id2"} diff --git a/common/commonspace/space.go b/common/commonspace/space.go index 09e11ebb..43f99cea 100644 --- a/common/commonspace/space.go +++ b/common/commonspace/space.go @@ -4,22 +4,22 @@ import ( "context" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/syncacl" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree/updatelistener" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/zeebo/errs" @@ -76,12 +76,12 @@ type Space interface { SpaceSyncRpc() RpcHandler - DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePayload) (string, error) - CreateTree(ctx context.Context, payload tree.ObjectTreeCreatePayload) (string, error) - BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (tree.ObjectTree, error) + DeriveTree(ctx context.Context, payload objecttree.ObjectTreeCreatePayload) (string, error) + CreateTree(ctx context.Context, payload objecttree.ObjectTreeCreatePayload) (string, error) + BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (objecttree.ObjectTree, error) DeleteTree(ctx context.Context, id string) (err error) - StatusService() syncstatus.SyncStatusUpdater + SyncStatus() syncstatus.SyncStatusUpdater Close() error } @@ -93,12 +93,12 @@ type space struct { rpc *rpcHandler - objectSync syncservice.SyncService + objectSync objectsync.ObjectSync headSync headsync.HeadSync syncStatus syncstatus.SyncStatusUpdater - storage storage.SpaceStorage + storage spacestorage.SpaceStorage cache treegetter.TreeGetter - account account.Service + account accountservice.Service aclList *syncacl.SyncACL configuration nodeconf.Configuration settingsObject settings.SettingsObject @@ -199,7 +199,7 @@ func (s *space) SpaceSyncRpc() RpcHandler { return s.rpc } -func (s *space) ObjectSync() syncservice.SyncService { +func (s *space) ObjectSync() objectsync.ObjectSync { return s.objectSync } @@ -207,7 +207,7 @@ func (s *space) HeadSync() headsync.HeadSync { return s.headSync } -func (s *space) StatusService() syncstatus.SyncStatusUpdater { +func (s *space) SyncStatus() syncstatus.SyncStatusUpdater { return s.syncStatus } @@ -219,7 +219,7 @@ func (s *space) DebugAllHeads() []headsync.TreeHeads { return s.headSync.DebugAllHeads() } -func (s *space) DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePayload) (id string, err error) { +func (s *space) DeriveTree(ctx context.Context, payload objecttree.ObjectTreeCreatePayload) (id string, err error) { if s.isClosed.Load() { err = ErrSpaceClosed return @@ -227,7 +227,7 @@ func (s *space) DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePay deps := synctree.CreateDeps{ SpaceId: s.id, Payload: payload, - SyncService: s.objectSync, + ObjectSync: s.objectSync, Configuration: s.configuration, AclList: s.aclList, SpaceStorage: s.storage, @@ -237,7 +237,7 @@ func (s *space) DeriveTree(ctx context.Context, payload tree.ObjectTreeCreatePay return synctree.DeriveSyncTree(ctx, deps) } -func (s *space) CreateTree(ctx context.Context, payload tree.ObjectTreeCreatePayload) (id string, err error) { +func (s *space) CreateTree(ctx context.Context, payload objecttree.ObjectTreeCreatePayload) (id string, err error) { if s.isClosed.Load() { err = ErrSpaceClosed return @@ -245,7 +245,7 @@ func (s *space) CreateTree(ctx context.Context, payload tree.ObjectTreeCreatePay deps := synctree.CreateDeps{ SpaceId: s.id, Payload: payload, - SyncService: s.objectSync, + ObjectSync: s.objectSync, Configuration: s.configuration, AclList: s.aclList, SpaceStorage: s.storage, @@ -255,14 +255,14 @@ func (s *space) CreateTree(ctx context.Context, payload tree.ObjectTreeCreatePay return synctree.CreateSyncTree(ctx, deps) } -func (s *space) BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (t tree.ObjectTree, err error) { +func (s *space) BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (t objecttree.ObjectTree, err error) { if s.isClosed.Load() { err = ErrSpaceClosed return } deps := synctree.BuildDeps{ SpaceId: s.id, - SyncService: s.objectSync, + ObjectSync: s.objectSync, Configuration: s.configuration, HeadNotifiable: s.headSync, Listener: listener, diff --git a/common/commonspace/service.go b/common/commonspace/spaceservice.go similarity index 76% rename from common/commonspace/service.go rename to common/commonspace/spaceservice.go index 5b0f443b..914fd950 100644 --- a/common/commonspace/service.go +++ b/common/commonspace/spaceservice.go @@ -2,66 +2,66 @@ package commonspace import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" ) const CName = "common.commonspace" var log = logger.NewNamed(CName) -func New() Service { - return &service{} +func New() SpaceService { + return &spaceService{} } type ctxKey int const AddSpaceCtxKey ctxKey = 0 -type Service interface { +type SpaceService interface { DeriveSpace(ctx context.Context, payload SpaceDerivePayload) (string, error) CreateSpace(ctx context.Context, payload SpaceCreatePayload) (string, error) NewSpace(ctx context.Context, id string) (sp Space, err error) app.Component } -type service struct { +type spaceService struct { config config.Space - account account.Service + account accountservice.Service configurationService nodeconf.Service - storageProvider storage.SpaceStorageProvider + storageProvider spacestorage.SpaceStorageProvider treeGetter treegetter.TreeGetter pool pool.Pool } -func (s *service) Init(a *app.App) (err error) { +func (s *spaceService) Init(a *app.App) (err error) { s.config = a.MustComponent(config.CName).(*config.Config).Space - s.account = a.MustComponent(account.CName).(account.Service) - s.storageProvider = a.MustComponent(storage.CName).(storage.SpaceStorageProvider) + s.account = a.MustComponent(accountservice.CName).(accountservice.Service) + s.storageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.configurationService = a.MustComponent(nodeconf.CName).(nodeconf.Service) s.treeGetter = a.MustComponent(treegetter.CName).(treegetter.TreeGetter) s.pool = a.MustComponent(pool.CName).(pool.Pool) return nil } -func (s *service) Name() (name string) { +func (s *spaceService) Name() (name string) { return CName } -func (s *service) CreateSpace(ctx context.Context, payload SpaceCreatePayload) (id string, err error) { +func (s *spaceService) CreateSpace(ctx context.Context, payload SpaceCreatePayload) (id string, err error) { storageCreate, err := storagePayloadForSpaceCreate(payload) if err != nil { return @@ -74,7 +74,7 @@ func (s *service) CreateSpace(ctx context.Context, payload SpaceCreatePayload) ( return store.Id(), nil } -func (s *service) DeriveSpace(ctx context.Context, payload SpaceDerivePayload) (id string, err error) { +func (s *spaceService) DeriveSpace(ctx context.Context, payload SpaceDerivePayload) (id string, err error) { storageCreate, err := storagePayloadForSpaceDerive(payload) if err != nil { return @@ -87,10 +87,10 @@ func (s *service) DeriveSpace(ctx context.Context, payload SpaceDerivePayload) ( return store.Id(), nil } -func (s *service) NewSpace(ctx context.Context, id string) (Space, error) { +func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { st, err := s.storageProvider.SpaceStorage(id) if err != nil { - if err != storage.ErrSpaceStorageMissing { + if err != spacestorage.ErrSpaceStorageMissing { return nil, err } @@ -118,7 +118,7 @@ func (s *service) NewSpace(ctx context.Context, id string) (Space, error) { } headSync := headsync.NewHeadSync(id, s.config.SyncPeriod, st, confConnector, s.treeGetter, syncStatus, log) - objectSync := syncservice.NewSyncService(id, confConnector, s.config.SyncPeriod) + objectSync := objectsync.NewObjectSync(id, confConnector, s.config.SyncPeriod) sp := &space{ id: id, objectSync: objectSync, @@ -132,8 +132,8 @@ func (s *service) NewSpace(ctx context.Context, id string) (Space, error) { return sp, nil } -func (s *service) addSpaceStorage(ctx context.Context, spaceDescription SpaceDescription) (st storage.SpaceStorage, err error) { - payload := storage.SpaceStorageCreatePayload{ +func (s *spaceService) addSpaceStorage(ctx context.Context, spaceDescription SpaceDescription) (st spacestorage.SpaceStorage, err error) { + payload := spacestorage.SpaceStorageCreatePayload{ AclWithId: &aclrecordproto.RawACLRecordWithId{ Payload: spaceDescription.AclPayload, Id: spaceDescription.AclId, @@ -147,7 +147,7 @@ func (s *service) addSpaceStorage(ctx context.Context, spaceDescription SpaceDes st, err = s.storageProvider.CreateSpaceStorage(payload) if err != nil { err = spacesyncproto.ErrUnexpected - if err == storage.ErrSpaceStorageExists { + if err == spacestorage.ErrSpaceStorageExists { err = spacesyncproto.ErrSpaceExists } return @@ -155,7 +155,7 @@ func (s *service) addSpaceStorage(ctx context.Context, spaceDescription SpaceDes return } -func (s *service) getSpaceStorageFromRemote(ctx context.Context, id string) (st storage.SpaceStorage, err error) { +func (s *spaceService) getSpaceStorageFromRemote(ctx context.Context, id string) (st spacestorage.SpaceStorage, err error) { var p peer.Peer lastConfiguration := s.configurationService.GetLast() // we can't connect to client if it is a node @@ -175,7 +175,7 @@ func (s *service) getSpaceStorageFromRemote(ctx context.Context, id string) (st return } - st, err = s.storageProvider.CreateSpaceStorage(storage.SpaceStorageCreatePayload{ + st, err = s.storageProvider.CreateSpaceStorage(spacestorage.SpaceStorageCreatePayload{ AclWithId: &aclrecordproto.RawACLRecordWithId{ Payload: res.Payload.AclPayload, Id: res.Payload.AclPayloadId, diff --git a/common/commonspace/storage/mock_storage/mock_storage.go b/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go similarity index 93% rename from common/commonspace/storage/mock_storage/mock_storage.go rename to common/commonspace/spacestorage/mock_spacestorage/mock_storage.go index c8ab901e..9ce586a8 100644 --- a/common/commonspace/storage/mock_storage/mock_storage.go +++ b/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go @@ -2,15 +2,16 @@ // Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage (interfaces: SpaceStorageProvider,SpaceStorage) // Package mock_storage is a generated GoMock package. -package mock_storage +package mock_spacestorage import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + storage3 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" reflect "reflect" app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" spacesyncproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - storage0 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" gomock "github.com/golang/mock/gomock" ) @@ -119,10 +120,10 @@ func (m *MockSpaceStorage) EXPECT() *MockSpaceStorageMockRecorder { } // ACLStorage mocks base method. -func (m *MockSpaceStorage) ACLStorage() (storage0.ListStorage, error) { +func (m *MockSpaceStorage) ACLStorage() (liststorage.ListStorage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ACLStorage") - ret0, _ := ret[0].(storage0.ListStorage) + ret0, _ := ret[0].(liststorage.ListStorage) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -148,10 +149,10 @@ func (mr *MockSpaceStorageMockRecorder) Close() *gomock.Call { } // CreateTreeStorage mocks base method. -func (m *MockSpaceStorage) CreateTreeStorage(arg0 storage0.TreeStorageCreatePayload) (storage0.TreeStorage, error) { +func (m *MockSpaceStorage) CreateTreeStorage(arg0 storage3.TreeStorageCreatePayload) (storage3.TreeStorage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateTreeStorage", arg0) - ret0, _ := ret[0].(storage0.TreeStorage) + ret0, _ := ret[0].(storage3.TreeStorage) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -250,10 +251,10 @@ func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gom } // TreeStorage mocks base method. -func (m *MockSpaceStorage) TreeStorage(arg0 string) (storage0.TreeStorage, error) { +func (m *MockSpaceStorage) TreeStorage(arg0 string) (storage3.TreeStorage, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TreeStorage", arg0) - ret0, _ := ret[0].(storage0.TreeStorage) + ret0, _ := ret[0].(storage3.TreeStorage) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/common/commonspace/spacestorage/mock_storage/mock_storage.go b/common/commonspace/spacestorage/mock_storage/mock_storage.go new file mode 100644 index 00000000..b9b71ae5 --- /dev/null +++ b/common/commonspace/spacestorage/mock_storage/mock_storage.go @@ -0,0 +1,266 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage (interfaces: SpaceStorageProvider,SpaceStorage) + +// Package mock_spacestorage is a generated GoMock package. +package mock_spacestorage + +import ( + reflect "reflect" + + app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + liststorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" + spacesyncproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" + gomock "github.com/golang/mock/gomock" +) + +// MockSpaceStorageProvider is a mock of SpaceStorageProvider interface. +type MockSpaceStorageProvider struct { + ctrl *gomock.Controller + recorder *MockSpaceStorageProviderMockRecorder +} + +// MockSpaceStorageProviderMockRecorder is the mock recorder for MockSpaceStorageProvider. +type MockSpaceStorageProviderMockRecorder struct { + mock *MockSpaceStorageProvider +} + +// NewMockSpaceStorageProvider creates a new mock instance. +func NewMockSpaceStorageProvider(ctrl *gomock.Controller) *MockSpaceStorageProvider { + mock := &MockSpaceStorageProvider{ctrl: ctrl} + mock.recorder = &MockSpaceStorageProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockSpaceStorageProvider) EXPECT() *MockSpaceStorageProviderMockRecorder { + return m.recorder +} + +// CreateSpaceStorage mocks base method. +func (m *MockSpaceStorageProvider) CreateSpaceStorage(arg0 spacestorage.SpaceStorageCreatePayload) (spacestorage.SpaceStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateSpaceStorage", arg0) + ret0, _ := ret[0].(spacestorage.SpaceStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateSpaceStorage indicates an expected call of CreateSpaceStorage. +func (mr *MockSpaceStorageProviderMockRecorder) CreateSpaceStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).CreateSpaceStorage), arg0) +} + +// Init mocks base method. +func (m *MockSpaceStorageProvider) Init(arg0 *app.App) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Init", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Init indicates an expected call of Init. +func (mr *MockSpaceStorageProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Init), arg0) +} + +// Name mocks base method. +func (m *MockSpaceStorageProvider) Name() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Name") + ret0, _ := ret[0].(string) + return ret0 +} + +// Name indicates an expected call of Name. +func (mr *MockSpaceStorageProviderMockRecorder) Name() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Name)) +} + +// SpaceStorage mocks base method. +func (m *MockSpaceStorageProvider) SpaceStorage(arg0 string) (spacestorage.SpaceStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceStorage", arg0) + ret0, _ := ret[0].(spacestorage.SpaceStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SpaceStorage indicates an expected call of SpaceStorage. +func (mr *MockSpaceStorageProviderMockRecorder) SpaceStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).SpaceStorage), arg0) +} + +// MockSpaceStorage is a mock of SpaceStorage interface. +type MockSpaceStorage struct { + ctrl *gomock.Controller + recorder *MockSpaceStorageMockRecorder +} + +// MockSpaceStorageMockRecorder is the mock recorder for MockSpaceStorage. +type MockSpaceStorageMockRecorder struct { + mock *MockSpaceStorage +} + +// NewMockSpaceStorage creates a new mock instance. +func NewMockSpaceStorage(ctrl *gomock.Controller) *MockSpaceStorage { + mock := &MockSpaceStorage{ctrl: ctrl} + mock.recorder = &MockSpaceStorageMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockSpaceStorage) EXPECT() *MockSpaceStorageMockRecorder { + return m.recorder +} + +// ACLStorage mocks base method. +func (m *MockSpaceStorage) ACLStorage() (liststorage.ListStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ACLStorage") + ret0, _ := ret[0].(liststorage.ListStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ACLStorage indicates an expected call of ACLStorage. +func (mr *MockSpaceStorageMockRecorder) ACLStorage() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ACLStorage", reflect.TypeOf((*MockSpaceStorage)(nil).ACLStorage)) +} + +// Close mocks base method. +func (m *MockSpaceStorage) Close() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Close") + ret0, _ := ret[0].(error) + return ret0 +} + +// Close indicates an expected call of Close. +func (mr *MockSpaceStorageMockRecorder) Close() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSpaceStorage)(nil).Close)) +} + +// CreateTreeStorage mocks base method. +func (m *MockSpaceStorage) CreateTreeStorage(arg0 treestorage.TreeStorageCreatePayload) (treestorage.TreeStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateTreeStorage", arg0) + ret0, _ := ret[0].(treestorage.TreeStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateTreeStorage indicates an expected call of CreateTreeStorage. +func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).CreateTreeStorage), arg0) +} + +// Id mocks base method. +func (m *MockSpaceStorage) Id() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Id") + ret0, _ := ret[0].(string) + return ret0 +} + +// Id indicates an expected call of Id. +func (mr *MockSpaceStorageMockRecorder) Id() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSpaceStorage)(nil).Id)) +} + +// SetTreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) SetTreeDeletedStatus(arg0, arg1 string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetTreeDeletedStatus", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetTreeDeletedStatus indicates an expected call of SetTreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).SetTreeDeletedStatus), arg0, arg1) +} + +// SpaceHeader mocks base method. +func (m *MockSpaceStorage) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceHeader") + ret0, _ := ret[0].(*spacesyncproto.RawSpaceHeaderWithId) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SpaceHeader indicates an expected call of SpaceHeader. +func (mr *MockSpaceStorageMockRecorder) SpaceHeader() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceHeader", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceHeader)) +} + +// SpaceSettingsId mocks base method. +func (m *MockSpaceStorage) SpaceSettingsId() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceSettingsId") + ret0, _ := ret[0].(string) + return ret0 +} + +// SpaceSettingsId indicates an expected call of SpaceSettingsId. +func (mr *MockSpaceStorageMockRecorder) SpaceSettingsId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSettingsId", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceSettingsId)) +} + +// StoredIds mocks base method. +func (m *MockSpaceStorage) StoredIds() ([]string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "StoredIds") + ret0, _ := ret[0].([]string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// StoredIds indicates an expected call of StoredIds. +func (mr *MockSpaceStorageMockRecorder) StoredIds() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoredIds", reflect.TypeOf((*MockSpaceStorage)(nil).StoredIds)) +} + +// TreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) TreeDeletedStatus(arg0 string) (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeDeletedStatus", arg0) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TreeDeletedStatus indicates an expected call of TreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).TreeDeletedStatus), arg0) +} + +// TreeStorage mocks base method. +func (m *MockSpaceStorage) TreeStorage(arg0 string) (treestorage.TreeStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeStorage", arg0) + ret0, _ := ret[0].(treestorage.TreeStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TreeStorage indicates an expected call of TreeStorage. +func (mr *MockSpaceStorageMockRecorder) TreeStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).TreeStorage), arg0) +} diff --git a/common/commonspace/storage/storage.go b/common/commonspace/spacestorage/storage.go similarity index 79% rename from common/commonspace/storage/storage.go rename to common/commonspace/spacestorage/storage.go index bbca9c55..21716aaa 100644 --- a/common/commonspace/storage/storage.go +++ b/common/commonspace/spacestorage/storage.go @@ -1,16 +1,17 @@ -//go:generate mockgen -destination mock_storage/mock_storage.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage SpaceStorageProvider,SpaceStorage -package storage +//go:generate mockgen -destination mock_storage/mock_storage.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage SpaceStorageProvider,SpaceStorage +package spacestorage import ( "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" ) -const CName = "commonspace.storage" +const CName = "commonspace.spacestorage" var ( ErrSpaceStorageExists = errors.New("space storage exists") @@ -25,12 +26,12 @@ const ( ) type SpaceStorage interface { - storage.Provider + treestorage.Provider Id() string SetTreeDeletedStatus(id, state string) error TreeDeletedStatus(id string) (string, error) SpaceSettingsId() string - ACLStorage() (storage.ListStorage, error) + ACLStorage() (liststorage.ListStorage, error) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) StoredIds() ([]string, error) Close() error diff --git a/common/commonspace/syncstatus/syncstatus.go b/common/commonspace/syncstatus/syncstatus.go index 16f41aad..5de90f1a 100644 --- a/common/commonspace/syncstatus/syncstatus.go +++ b/common/commonspace/syncstatus/syncstatus.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" - treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" "golang.org/x/exp/slices" @@ -74,7 +74,7 @@ type syncStatusProvider struct { configuration nodeconf.Configuration periodicSync periodicsync.PeriodicSync updateReceiver UpdateReceiver - storage storage.SpaceStorage + storage spacestorage.SpaceStorage spaceId string treeHeads map[string]treeHeadsEntry @@ -92,10 +92,10 @@ type SyncStatusDeps struct { UpdateIntervalSecs int UpdateTimeout time.Duration Configuration nodeconf.Configuration - Storage storage.SpaceStorage + Storage spacestorage.SpaceStorage } -func DefaultDeps(configuration nodeconf.Configuration, store storage.SpaceStorage) SyncStatusDeps { +func DefaultDeps(configuration nodeconf.Configuration, store spacestorage.SpaceStorage) SyncStatusDeps { return SyncStatusDeps{ UpdateIntervalSecs: syncUpdateInterval, UpdateTimeout: syncTimeout, diff --git a/common/net/dialer/dialer.go b/common/net/dialer/dialer.go index 44b23b54..f016646e 100644 --- a/common/net/dialer/dialer.go +++ b/common/net/dialer/dialer.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/timeoutconn" "github.com/libp2p/go-libp2p/core/sec" "go.uber.org/zap" @@ -37,7 +37,7 @@ type Dialer interface { } type dialer struct { - transport secure.Service + transport secureservice.SecureService config *config.Config peerAddrs map[string][]string @@ -45,7 +45,7 @@ type dialer struct { } func (d *dialer) Init(a *app.App) (err error) { - d.transport = a.MustComponent(secure.CName).(secure.Service) + d.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) d.config = a.MustComponent(config.CName).(*config.Config) d.peerAddrs = map[string][]string{} for _, n := range d.config.Nodes { diff --git a/common/net/pool/pool.go b/common/net/pool/pool.go index 819fee23..9e50d2ce 100644 --- a/common/net/pool/pool.go +++ b/common/net/pool/pool.go @@ -5,9 +5,9 @@ import ( "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/dialer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "math/rand" "time" ) diff --git a/common/net/rpc/server/baseserver.go b/common/net/rpc/server/baseserver.go index 02e12fd8..cb9902ee 100644 --- a/common/net/rpc/server/baseserver.go +++ b/common/net/rpc/server/baseserver.go @@ -2,7 +2,7 @@ package server import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/zeebo/errs" "go.uber.org/zap" "io" @@ -17,14 +17,14 @@ import ( type BaseDrpcServer struct { drpcServer *drpcserver.Server - transport secure.Service - listeners []secure.ContextListener + transport secureservice.SecureService + listeners []secureservice.ContextListener cancel func() *drpcmux.Mux } type DRPCHandlerWrapper func(handler drpc.Handler) drpc.Handler -type ListenerConverter func(listener net.Listener, timeoutMillis int) secure.ContextListener +type ListenerConverter func(listener net.Listener, timeoutMillis int) secureservice.ContextListener type Params struct { BufferSizeMb int @@ -54,7 +54,7 @@ func (s *BaseDrpcServer) Run(ctx context.Context, params Params) (err error) { return } -func (s *BaseDrpcServer) serve(ctx context.Context, lis secure.ContextListener) { +func (s *BaseDrpcServer) serve(ctx context.Context, lis secureservice.ContextListener) { l := log.With(zap.String("localAddr", lis.Addr().String())) l.Info("drpc listener started") defer func() { @@ -78,7 +78,7 @@ func (s *BaseDrpcServer) serve(ctx context.Context, lis secure.ContextListener) } continue } - if _, ok := err.(secure.HandshakeError); ok { + if _, ok := err.(secureservice.HandshakeError); ok { l.Warn("listener handshake error", zap.Error(err)) continue } diff --git a/common/net/rpc/server/drpcserver.go b/common/net/rpc/server/drpcserver.go index aaa3f759..5b022486 100644 --- a/common/net/rpc/server/drpcserver.go +++ b/common/net/rpc/server/drpcserver.go @@ -6,7 +6,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/prometheus/client_golang/prometheus" "storj.io/drpc" ) @@ -32,14 +32,14 @@ type configGetter interface { type drpcServer struct { config configGetter metric metric.Metric - transport secure.Service + transport secureservice.SecureService *BaseDrpcServer } func (s *drpcServer) Init(a *app.App) (err error) { s.config = a.MustComponent(config.CName).(configGetter) s.metric = a.MustComponent(metric.CName).(metric.Metric) - s.transport = a.MustComponent(secure.CName).(secure.Service) + s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) return nil } diff --git a/common/net/secure/basiclistener.go b/common/net/secureservice/basiclistener.go similarity index 96% rename from common/net/secure/basiclistener.go rename to common/net/secureservice/basiclistener.go index 927965af..b645db7d 100644 --- a/common/net/secure/basiclistener.go +++ b/common/net/secureservice/basiclistener.go @@ -1,4 +1,4 @@ -package secure +package secureservice import ( "context" diff --git a/common/net/secure/service.go b/common/net/secureservice/secureservice.go similarity index 72% rename from common/net/secure/service.go rename to common/net/secureservice/secureservice.go index 9e919582..49353e91 100644 --- a/common/net/secure/service.go +++ b/common/net/secureservice/secureservice.go @@ -1,8 +1,8 @@ -package secure +package secureservice import ( "context" - commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" @@ -20,22 +20,22 @@ const CName = "common.net.secure" var log = logger.NewNamed(CName) -func New() Service { - return &service{} +func New() SecureService { + return &secureService{} } -type Service interface { +type SecureService interface { TLSListener(lis net.Listener, timeoutMillis int) ContextListener BasicListener(lis net.Listener, timeoutMillis int) ContextListener TLSConn(ctx context.Context, conn net.Conn) (sec.SecureConn, error) app.Component } -type service struct { +type secureService struct { key crypto.PrivKey } -func (s *service) Init(a *app.App) (err error) { +func (s *secureService) Init(a *app.App) (err error) { account := a.MustComponent(config.CName).(commonaccount.ConfigGetter).GetAccount() pkb, err := keys.DecodeBytesFromString(account.PeerKey) if err != nil { @@ -50,19 +50,19 @@ func (s *service) Init(a *app.App) (err error) { return nil } -func (s *service) Name() (name string) { +func (s *secureService) Name() (name string) { return CName } -func (s *service) TLSListener(lis net.Listener, timeoutMillis int) ContextListener { +func (s *secureService) TLSListener(lis net.Listener, timeoutMillis int) ContextListener { return newTLSListener(s.key, lis, timeoutMillis) } -func (s *service) BasicListener(lis net.Listener, timeoutMillis int) ContextListener { +func (s *secureService) BasicListener(lis net.Listener, timeoutMillis int) ContextListener { return newBasicListener(lis, timeoutMillis) } -func (s *service) TLSConn(ctx context.Context, conn net.Conn) (sec.SecureConn, error) { +func (s *secureService) TLSConn(ctx context.Context, conn net.Conn) (sec.SecureConn, error) { tr, err := libp2ptls.New(s.key) if err != nil { return nil, err diff --git a/common/net/secure/tlslistener.go b/common/net/secureservice/tlslistener.go similarity index 98% rename from common/net/secure/tlslistener.go rename to common/net/secureservice/tlslistener.go index 120c6f01..cb7d24d6 100644 --- a/common/net/secure/tlslistener.go +++ b/common/net/secureservice/tlslistener.go @@ -1,4 +1,4 @@ -package secure +package secureservice import ( "context" diff --git a/common/pkg/acl/common/keychain.go b/common/pkg/acl/common/keychain.go deleted file mode 100644 index b6de00b2..00000000 --- a/common/pkg/acl/common/keychain.go +++ /dev/null @@ -1,28 +0,0 @@ -package common - -import ( - signingkey2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" -) - -type Keychain struct { - keys map[string]signingkey2.PubKey -} - -func NewKeychain() *Keychain { - return &Keychain{ - keys: make(map[string]signingkey2.PubKey), - } -} - -func (k *Keychain) GetOrAdd(identity string) (signingkey2.PubKey, error) { - if key, exists := k.keys[identity]; exists { - return key, nil - } - res, err := signingkey2.NewSigningEd25519PubKeyFromBytes([]byte(identity)) - if err != nil { - return nil, err - } - - k.keys[identity] = res.(signingkey2.PubKey) - return res.(signingkey2.PubKey), nil -} diff --git a/common/pkg/acl/tree/rawtreevalidator.go b/common/pkg/acl/tree/rawtreevalidator.go deleted file mode 100644 index aac7dd99..00000000 --- a/common/pkg/acl/tree/rawtreevalidator.go +++ /dev/null @@ -1,17 +0,0 @@ -package tree - -import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list" - storage2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" -) - -func ValidateRawTree(payload storage2.TreeStorageCreatePayload, aclList list.ACLList) (err error) { - provider := storage2.NewInMemoryTreeStorageProvider() - treeStorage, err := provider.CreateTreeStorage(payload) - if err != nil { - return - } - - _, err = BuildObjectTree(treeStorage, aclList) - return -} diff --git a/common/testutil/testaccount/service.go b/common/testutil/accounttest/accountservice.go similarity index 82% rename from common/testutil/testaccount/service.go rename to common/testutil/accounttest/accountservice.go index 7995621d..d653e98d 100644 --- a/common/testutil/testaccount/service.go +++ b/common/testutil/accounttest/accountservice.go @@ -1,16 +1,16 @@ -package testaccount +package accounttest import ( - accountService "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + accountService "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) // AccountTestService provides service for test purposes, generates new random account every Init type AccountTestService struct { - acc *account.AccountData + acc *accountdata.AccountData } func (s *AccountTestService) Init(a *app.App) (err error) { @@ -27,7 +27,7 @@ func (s *AccountTestService) Init(a *app.App) (err error) { if err != nil { return } - s.acc = &account.AccountData{ + s.acc = &accountdata.AccountData{ Identity: ident, SignKey: signKey, EncKey: encKey, @@ -39,6 +39,6 @@ func (s *AccountTestService) Name() (name string) { return accountService.CName } -func (s *AccountTestService) Account() *account.AccountData { +func (s *AccountTestService) Account() *accountdata.AccountData { return s.acc } diff --git a/common/util/cid/cid.go b/common/util/cidutil/cid.go similarity index 96% rename from common/util/cid/cid.go rename to common/util/cidutil/cid.go index 437d23f9..1d80e97f 100644 --- a/common/util/cid/cid.go +++ b/common/util/cidutil/cid.go @@ -1,4 +1,4 @@ -package cid +package cidutil import ( "github.com/ipfs/go-cid" diff --git a/consensus/account/service.go b/consensus/account/service.go index 6f81b4fe..629a0de4 100644 --- a/consensus/account/service.go +++ b/consensus/account/service.go @@ -1,21 +1,21 @@ package account import ( - commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) type service struct { - accountData *account.AccountData + accountData *accountdata.AccountData peerId string } -func (s *service) Account() *account.AccountData { +func (s *service) Account() *accountdata.AccountData { return s.accountData } @@ -47,7 +47,7 @@ func (s *service) Init(a *app.App) (err error) { return err } - s.accountData = &account.AccountData{ + s.accountData = &accountdata.AccountData{ Identity: identity, SignKey: decodedSigningKey, EncKey: decodedEncryptionKey, diff --git a/consensus/cmd/consensusnode.go b/consensus/cmd/consensusnode.go index 136f2af9..8a56d5c5 100644 --- a/consensus/cmd/consensusnode.go +++ b/consensus/cmd/consensusnode.go @@ -8,7 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusrpc" @@ -89,7 +89,7 @@ func main() { func Bootstrap(a *app.App) { a.Register(metric.New()). Register(account.New()). - Register(secure.New()). + Register(secureservice.New()). Register(server.New()). Register(db.New()). Register(stream.New()). diff --git a/consensus/stream/service.go b/consensus/stream/service.go index e16da5ef..592e09cb 100644 --- a/consensus/stream/service.go +++ b/consensus/stream/service.go @@ -4,8 +4,8 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/db" "github.com/cheggaaa/mb/v3" diff --git a/filenode/account/service.go b/filenode/account/service.go index 91f237b4..cf7c5a44 100644 --- a/filenode/account/service.go +++ b/filenode/account/service.go @@ -1,21 +1,21 @@ package account import ( - commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) type service struct { - accountData *account.AccountData + accountData *accountdata.AccountData peerId string } -func (s *service) Account() *account.AccountData { +func (s *service) Account() *accountdata.AccountData { return s.accountData } @@ -55,7 +55,7 @@ func (s *service) Init(a *app.App) (err error) { return err } - s.accountData = &account.AccountData{ + s.accountData = &accountdata.AccountData{ Identity: identity, PeerKey: decodedPeerKey, SignKey: decodedSigningKey, diff --git a/filenode/cmd/filenode.go b/filenode/cmd/filenode.go index 46cf7429..b3e18864 100644 --- a/filenode/cmd/filenode.go +++ b/filenode/cmd/filenode.go @@ -8,7 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/filepogreb" "github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/fileserver" @@ -85,7 +85,7 @@ func main() { } func Bootstrap(a *app.App) { - a.Register(secure.New()). + a.Register(secureservice.New()). Register(server.New()). Register(filepogreb.New()). Register(fileserver.New()). diff --git a/node/account/service.go b/node/account/service.go index 91f237b4..cf7c5a44 100644 --- a/node/account/service.go +++ b/node/account/service.go @@ -1,21 +1,21 @@ package account import ( - commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" ) type service struct { - accountData *account.AccountData + accountData *accountdata.AccountData peerId string } -func (s *service) Account() *account.AccountData { +func (s *service) Account() *accountdata.AccountData { return s.accountData } @@ -55,7 +55,7 @@ func (s *service) Init(a *app.App) (err error) { return err } - s.accountData = &account.AccountData{ + s.accountData = &accountdata.AccountData{ Identity: identity, PeerKey: decodedPeerKey, SignKey: decodedSigningKey, diff --git a/node/acl/service.go b/node/acl/service.go index a417778c..8eaf7322 100644 --- a/node/acl/service.go +++ b/node/acl/service.go @@ -2,12 +2,12 @@ package acl import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusclient" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusproto" "time" @@ -31,12 +31,12 @@ type Service interface { type service struct { consService consensusclient.Service - account account.Service + account accountservice.Service } func (s *service) Init(a *app.App) (err error) { s.consService = a.MustComponent(consensusclient.CName).(consensusclient.Service) - s.account = a.MustComponent(account.CName).(account.Service) + s.account = a.MustComponent(accountservice.CName).(accountservice.Service) return } @@ -125,7 +125,7 @@ func (s *service) signAndMarshal(rawRec *aclrecordproto.RawACLRecord) (recId, pr if payload, err = rawRec.Marshal(); err != nil { return } - recCid, err := cid.NewCIDFromBytes(payload) + recCid, err := cidutil.NewCIDFromBytes(payload) if err != nil { return } diff --git a/node/acl/service_test.go b/node/acl/service_test.go index eb720d64..ed2df63a 100644 --- a/node/acl/service_test.go +++ b/node/acl/service_test.go @@ -4,10 +4,10 @@ import ( "context" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/testutil/testaccount" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/testutil/accounttest" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusclient" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusclient/mock_consensusclient" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusproto" @@ -28,7 +28,7 @@ func TestService_CreateLog(t *testing.T) { clog = l }) - aclId, _ := cid.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) rec := &aclrecordproto.ACLRecord{ PrevId: "", @@ -63,7 +63,7 @@ func TestService_AddRecord(t *testing.T) { clog = l }) - aclId, _ := cid.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) rec := &aclrecordproto.ACLRecord{ PrevId: "", @@ -108,7 +108,7 @@ func TestService_Watch(t *testing.T) { fx := newFixture(t) defer fx.Finish(t) var expErr = fmt.Errorf("error") - aclId, _ := cid.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) aclIdBytes, _ := cidToByte(aclId) fx.mockClient.EXPECT().Watch(aclIdBytes, gomock.Any()).Do(func(aid []byte, w consensusclient.Watcher) { assert.Equal(t, aclIdBytes, aid) @@ -125,14 +125,14 @@ func TestService_Watch(t *testing.T) { t.Run("success", func(t *testing.T) { fx := newFixture(t) defer fx.Finish(t) - aclId, _ := cid.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) aclIdBytes, _ := cidToByte(aclId) fx.mockClient.EXPECT().Watch(aclIdBytes, gomock.Any()).Do(func(aid []byte, w consensusclient.Watcher) { assert.Equal(t, aclIdBytes, aid) go func() { time.Sleep(time.Millisecond * 10) - r1cid, _ := cid.NewCIDFromBytes([]byte("r1")) - r2cid, _ := cid.NewCIDFromBytes([]byte("r2")) + r1cid, _ := cidutil.NewCIDFromBytes([]byte("r1")) + r2cid, _ := cidutil.NewCIDFromBytes([]byte("r2")) r1cidB, _ := cidToByte(r1cid) r2cidB, _ := cidToByte(r2cid) w.AddConsensusRecords([]*consensusproto.Record{ @@ -159,7 +159,7 @@ func newFixture(t *testing.T) *fixture { fx := &fixture{ a: new(app.App), ctrl: gomock.NewController(t), - account: &testaccount.AccountTestService{}, + account: &accounttest.AccountTestService{}, } fx.mockClient = mock_consensusclient.NewMockService(fx.ctrl) fx.mockClient.EXPECT().Name().Return(consensusclient.CName).AnyTimes() @@ -177,7 +177,7 @@ type fixture struct { mockClient *mock_consensusclient.MockService ctrl *gomock.Controller a *app.App - account *testaccount.AccountTestService + account *accounttest.AccountTestService } func (fx *fixture) Finish(t *testing.T) { diff --git a/node/acl/util_test.go b/node/acl/util_test.go index 1ebe5fcb..e042c49e 100644 --- a/node/acl/util_test.go +++ b/node/acl/util_test.go @@ -1,13 +1,13 @@ package acl import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cid" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/cidutil" "github.com/stretchr/testify/assert" "testing" ) func TestCIDLen(t *testing.T) { - s, _ := cid.NewCIDFromBytes([]byte("some data")) + s, _ := cidutil.NewCIDFromBytes([]byte("some data")) t.Log(s, len(s)) b, _ := cidToByte(s) t.Log(b, len(b)) diff --git a/node/acl/watcher.go b/node/acl/watcher.go index 6a88cb0e..1f5cbe60 100644 --- a/node/acl/watcher.go +++ b/node/acl/watcher.go @@ -2,9 +2,9 @@ package acl import ( "context" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/consensusproto" "go.uber.org/zap" "sync" diff --git a/node/cmd/node.go b/node/cmd/node.go index a931bdc4..65ece374 100644 --- a/node/cmd/node.go +++ b/node/cmd/node.go @@ -12,10 +12,10 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/dialer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace/nodecache" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/storage" @@ -97,11 +97,11 @@ func Bootstrap(a *app.App) { Register(storage.New()). Register(nodecache.New(200)). Register(nodeconf.New()). - Register(secure.New()). + Register(secureservice.New()). Register(dialer.New()). Register(pool.New()). Register(nodespace.New()). Register(commonspace.New()). Register(server.New()). - Register(api.New()) + Register(nodedebugrpc.New()) } diff --git a/node/api/service.go b/node/debug/nodedebugrpc/nodedebugrpc.go similarity index 65% rename from node/api/service.go rename to node/debug/nodedebugrpc/nodedebugrpc.go index 710e0914..17f1a6b1 100644 --- a/node/api/service.go +++ b/node/debug/nodedebugrpc/nodedebugrpc.go @@ -1,35 +1,35 @@ -package api +package nodedebugrpc import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secure" - "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" nodestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/node/storage" "storj.io/drpc" ) -const CName = "api.service" +const CName = "debug.nodedebugrpc" var log = logger.NewNamed(CName) -func New() Service { - return &service{BaseDrpcServer: server.NewBaseDrpcServer()} +func New() NodeDebugRpc { + return &nodeDebugRpc{BaseDrpcServer: server.NewBaseDrpcServer()} } -type Service interface { +type NodeDebugRpc interface { app.ComponentRunnable drpc.Mux } -type service struct { - transport secure.Service +type nodeDebugRpc struct { + transport secureservice.SecureService cfg *config.Config treeCache treegetter.TreeGetter spaceService nodespace.Service @@ -37,20 +37,20 @@ type service struct { *server.BaseDrpcServer } -func (s *service) Init(a *app.App) (err error) { +func (s *nodeDebugRpc) Init(a *app.App) (err error) { s.treeCache = a.MustComponent(treegetter.CName).(treegetter.TreeGetter) s.spaceService = a.MustComponent(nodespace.CName).(nodespace.Service) - s.storageService = a.MustComponent(storage.CName).(nodestorage.NodeStorage) + s.storageService = a.MustComponent(spacestorage.CName).(nodestorage.NodeStorage) s.cfg = a.MustComponent(config.CName).(*config.Config) - s.transport = a.MustComponent(secure.CName).(secure.Service) + s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) return nil } -func (s *service) Name() (name string) { +func (s *nodeDebugRpc) Name() (name string) { return CName } -func (s *service) Run(ctx context.Context) (err error) { +func (s *nodeDebugRpc) Run(ctx context.Context) (err error) { params := server.Params{ BufferSizeMb: s.cfg.Stream.MaxMsgSizeMb, TimeoutMillis: s.cfg.Stream.TimeoutMilliseconds, @@ -64,9 +64,9 @@ func (s *service) Run(ctx context.Context) (err error) { if err != nil { return } - return apiproto.DRPCRegisterNodeApi(s, &rpcHandler{s.treeCache, s.spaceService, s.storageService}) + return nodedebugrpcproto.DRPCRegisterNodeApi(s, &rpcHandler{s.treeCache, s.spaceService, s.storageService}) } -func (s *service) Close(ctx context.Context) (err error) { +func (s *nodeDebugRpc) Close(ctx context.Context) (err error) { return s.BaseDrpcServer.Close(ctx) } diff --git a/node/api/apiproto/api.pb.go b/node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go similarity index 99% rename from node/api/apiproto/api.pb.go rename to node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go index d7302194..718de42a 100644 --- a/node/api/apiproto/api.pb.go +++ b/node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: api/apiproto/protos/api.proto -package apiproto +package nodedebugrpcproto import ( fmt "fmt" diff --git a/node/api/apiproto/api_drpc.pb.go b/node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go similarity index 99% rename from node/api/apiproto/api_drpc.pb.go rename to node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go index 22440c92..f13b466b 100644 --- a/node/api/apiproto/api_drpc.pb.go +++ b/node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go @@ -2,7 +2,7 @@ // protoc-gen-go-drpc version: v0.0.32 // source: api/apiproto/protos/api.proto -package apiproto +package nodedebugrpcproto import ( bytes "bytes" diff --git a/node/api/apiproto/protos/api.proto b/node/debug/nodedebugrpc/nodedebugrpcproto/protos/api.proto similarity index 100% rename from node/api/apiproto/protos/api.proto rename to node/debug/nodedebugrpc/nodedebugrpcproto/protos/api.proto diff --git a/node/api/rpchandler.go b/node/debug/nodedebugrpc/rpchandler.go similarity index 52% rename from node/api/rpchandler.go rename to node/debug/nodedebugrpc/rpchandler.go index 98718ab1..6092cd70 100644 --- a/node/api/rpchandler.go +++ b/node/debug/nodedebugrpc/rpchandler.go @@ -1,9 +1,9 @@ -package api +package nodedebugrpc import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/storage" ) @@ -14,7 +14,7 @@ type rpcHandler struct { storageService storage.NodeStorage } -func (r *rpcHandler) DumpTree(ctx context.Context, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) { +func (r *rpcHandler) DumpTree(ctx context.Context, request *nodedebugrpcproto.DumpTreeRequest) (resp *nodedebugrpcproto.DumpTreeResponse, err error) { tree, err := r.treeCache.GetTree(context.Background(), request.SpaceId, request.DocumentId) if err != nil { return @@ -23,44 +23,44 @@ func (r *rpcHandler) DumpTree(ctx context.Context, request *apiproto.DumpTreeReq if err != nil { return } - resp = &apiproto.DumpTreeResponse{ + resp = &nodedebugrpcproto.DumpTreeResponse{ Dump: dump, } return } -func (r *rpcHandler) AllTrees(ctx context.Context, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) { +func (r *rpcHandler) AllTrees(ctx context.Context, request *nodedebugrpcproto.AllTreesRequest) (resp *nodedebugrpcproto.AllTreesResponse, err error) { space, err := r.spaceService.GetSpace(ctx, request.SpaceId) if err != nil { return } heads := space.DebugAllHeads() - var trees []*apiproto.Tree + var trees []*nodedebugrpcproto.Tree for _, head := range heads { - trees = append(trees, &apiproto.Tree{ + trees = append(trees, &nodedebugrpcproto.Tree{ Id: head.Id, Heads: head.Heads, }) } - resp = &apiproto.AllTreesResponse{Trees: trees} + resp = &nodedebugrpcproto.AllTreesResponse{Trees: trees} return } -func (r *rpcHandler) AllSpaces(ctx context.Context, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) { +func (r *rpcHandler) AllSpaces(ctx context.Context, request *nodedebugrpcproto.AllSpacesRequest) (resp *nodedebugrpcproto.AllSpacesResponse, err error) { ids, err := r.storageService.AllSpaceIds() if err != nil { return } - resp = &apiproto.AllSpacesResponse{SpaceIds: ids} + resp = &nodedebugrpcproto.AllSpacesResponse{SpaceIds: ids} return } -func (r *rpcHandler) TreeParams(ctx context.Context, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) { +func (r *rpcHandler) TreeParams(ctx context.Context, request *nodedebugrpcproto.TreeParamsRequest) (resp *nodedebugrpcproto.TreeParamsResponse, err error) { tree, err := r.treeCache.GetTree(context.Background(), request.SpaceId, request.DocumentId) if err != nil { return } - resp = &apiproto.TreeParamsResponse{ + resp = &nodedebugrpcproto.TreeParamsResponse{ RootId: tree.Root().Id, HeadIds: tree.Heads(), } diff --git a/node/nodespace/nodecache/treecache.go b/node/nodespace/nodecache/treecache.go index e14f9247..4757b3ba 100644 --- a/node/nodespace/nodecache/treecache.go +++ b/node/nodespace/nodecache/treecache.go @@ -5,9 +5,9 @@ import ( "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" "time" ) @@ -61,13 +61,13 @@ func (c *treeCache) Name() (name string) { return treegetter.CName } -func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr tree.ObjectTree, err error) { +func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr objecttree.ObjectTree, err error) { ctx = context.WithValue(ctx, spaceKey, spaceId) value, err := c.cache.Get(ctx, id) if err != nil { return } - tr = value.(tree.ObjectTree) + tr = value.(objecttree.ObjectTree) return } diff --git a/node/nodespace/service.go b/node/nodespace/service.go index 82faa71f..1d07efbb 100644 --- a/node/nodespace/service.go +++ b/node/nodespace/service.go @@ -4,12 +4,12 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" "time" ) @@ -29,14 +29,14 @@ type Service interface { type service struct { conf config.Space spaceCache ocache.OCache - commonSpace commonspace.Service - spaceStorageProvider storage.SpaceStorageProvider + commonSpace commonspace.SpaceService + spaceStorageProvider spacestorage.SpaceStorageProvider } func (s *service) Init(a *app.App) (err error) { s.conf = a.MustComponent(config.CName).(*config.Config).Space - s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.Service) - s.spaceStorageProvider = a.MustComponent(storage.CName).(storage.SpaceStorageProvider) + s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.SpaceService) + s.spaceStorageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.spaceCache = ocache.New( s.loadSpace, ocache.WithLogger(log.Sugar()), diff --git a/node/storage/keys.go b/node/storage/keys.go index 650d392c..902c58ac 100644 --- a/node/storage/keys.go +++ b/node/storage/keys.go @@ -2,7 +2,7 @@ package storage import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "strings" ) @@ -21,7 +21,7 @@ func (a aclKeys) RootIdKey() []byte { } func (a aclKeys) RawRecordKey(id string) []byte { - return storage.JoinStringsToBytes("a", id) + return treestorage.JoinStringsToBytes("a", id) } type treeKeys struct { @@ -33,7 +33,7 @@ type treeKeys struct { func newTreeKeys(id string) treeKeys { return treeKeys{ id: id, - headsKey: storage.JoinStringsToBytes("t", id, "heads"), + headsKey: treestorage.JoinStringsToBytes("t", id, "heads"), prefix: fmt.Sprintf("t/%s", id), } } @@ -43,7 +43,7 @@ func (t treeKeys) HeadsKey() []byte { } func (t treeKeys) RawChangeKey(id string) []byte { - return storage.JoinStringsToBytes("t", t.id, id) + return treestorage.JoinStringsToBytes("t", t.id, id) } func (t treeKeys) isTreeRelatedKey(key string) bool { @@ -55,7 +55,7 @@ type spaceKeys struct { } func newSpaceKeys(spaceId string) spaceKeys { - return spaceKeys{headerKey: storage.JoinStringsToBytes("s", spaceId)} + return spaceKeys{headerKey: treestorage.JoinStringsToBytes("s", spaceId)} } var ( @@ -76,7 +76,7 @@ func (s spaceKeys) SpaceSettingsIdKey() []byte { } func (s spaceKeys) TreeDeletedKey(id string) []byte { - return storage.JoinStringsToBytes("del", id) + return treestorage.JoinStringsToBytes("del", id) } func isTreeHeadsKey(key string) bool { diff --git a/node/storage/liststorage.go b/node/storage/liststorage.go index e7fa3aba..d83150da 100644 --- a/node/storage/liststorage.go +++ b/node/storage/liststorage.go @@ -3,8 +3,8 @@ package storage import ( "context" "github.com/akrylysov/pogreb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" ) type listStorage struct { @@ -14,14 +14,14 @@ type listStorage struct { root *aclrecordproto.RawACLRecordWithId } -func newListStorage(db *pogreb.DB) (ls storage.ListStorage, err error) { +func newListStorage(db *pogreb.DB) (ls liststorage.ListStorage, err error) { keys := aclKeys{} rootId, err := db.Get(keys.RootIdKey()) if err != nil { return } if rootId == nil { - err = storage.ErrUnknownACLId + err = liststorage.ErrUnknownACLId return } @@ -30,7 +30,7 @@ func newListStorage(db *pogreb.DB) (ls storage.ListStorage, err error) { return } if root == nil { - err = storage.ErrUnknownACLId + err = liststorage.ErrUnknownACLId return } @@ -48,7 +48,7 @@ func newListStorage(db *pogreb.DB) (ls storage.ListStorage, err error) { return } -func createListStorage(db *pogreb.DB, root *aclrecordproto.RawACLRecordWithId) (ls storage.ListStorage, err error) { +func createListStorage(db *pogreb.DB, root *aclrecordproto.RawACLRecordWithId) (ls liststorage.ListStorage, err error) { keys := aclKeys{} has, err := db.Has(keys.RootIdKey()) if err != nil { @@ -96,7 +96,7 @@ func (l *listStorage) Head() (head string, err error) { return } if bytes == nil { - err = storage.ErrUnknownACLId + err = liststorage.ErrUnknownACLId return } head = string(bytes) @@ -109,7 +109,7 @@ func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclreco return } if res == nil { - err = storage.ErrUnknownRecord + err = liststorage.ErrUnknownRecord return } diff --git a/node/storage/liststorage_test.go b/node/storage/liststorage_test.go index 4df253d2..a84cde5d 100644 --- a/node/storage/liststorage_test.go +++ b/node/storage/liststorage_test.go @@ -2,13 +2,13 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" "github.com/stretchr/testify/require" "testing" ) -func testList(t *testing.T, store storage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { +func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { require.Equal(t, store.Id(), root.Id) aclRoot, err := store.Root() diff --git a/node/storage/spacestorage.go b/node/storage/spacestorage.go index 15a88cf0..e24a14c2 100644 --- a/node/storage/spacestorage.go +++ b/node/storage/spacestorage.go @@ -3,10 +3,11 @@ package storage import ( "github.com/akrylysov/pogreb" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "go.uber.org/zap" "os" "path" @@ -24,7 +25,7 @@ type spaceStorage struct { spaceSettingsId string objDb *pogreb.DB keys spaceKeys - aclStorage storage.ListStorage + aclStorage liststorage.ListStorage header *spacesyncproto.RawSpaceHeaderWithId } @@ -138,7 +139,7 @@ func createSpaceStorage(rootPath string, payload spacestorage.SpaceStorageCreate header: payload.SpaceHeaderWithId, } - _, err = store.CreateTreeStorage(storage.TreeStorageCreatePayload{ + _, err = store.CreateTreeStorage(treestorage.TreeStorageCreatePayload{ RootRawChange: payload.SpaceSettingsWithId, Changes: []*treechangeproto.RawTreeChangeWithId{payload.SpaceSettingsWithId}, Heads: []string{payload.SpaceSettingsWithId.Id}, @@ -173,15 +174,15 @@ func (s *spaceStorage) SpaceSettingsId() string { return s.spaceSettingsId } -func (s *spaceStorage) TreeStorage(id string) (storage.TreeStorage, error) { +func (s *spaceStorage) TreeStorage(id string) (treestorage.TreeStorage, error) { return newTreeStorage(s.objDb, id) } -func (s *spaceStorage) CreateTreeStorage(payload storage.TreeStorageCreatePayload) (ts storage.TreeStorage, err error) { +func (s *spaceStorage) CreateTreeStorage(payload treestorage.TreeStorageCreatePayload) (ts treestorage.TreeStorage, err error) { return createTreeStorage(s.objDb, payload) } -func (s *spaceStorage) ACLStorage() (storage.ListStorage, error) { +func (s *spaceStorage) ACLStorage() (liststorage.ListStorage, error) { return s.aclStorage, nil } diff --git a/node/storage/spacestorage_test.go b/node/storage/spacestorage_test.go index 8b4460e0..52be2e12 100644 --- a/node/storage/spacestorage_test.go +++ b/node/storage/spacestorage_test.go @@ -1,10 +1,10 @@ package storage import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" "github.com/stretchr/testify/require" "os" "sort" diff --git a/node/storage/storageservice.go b/node/storage/storageservice.go index 24943a62..5c69b652 100644 --- a/node/storage/storageservice.go +++ b/node/storage/storageservice.go @@ -2,7 +2,7 @@ package storage import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "os" ) @@ -12,7 +12,7 @@ type storageService struct { } type NodeStorage interface { - storage.SpaceStorageProvider + spacestorage.SpaceStorageProvider AllSpaceIds() (ids []string, err error) } @@ -27,14 +27,14 @@ func (s *storageService) Init(a *app.App) (err error) { } func (s *storageService) Name() (name string) { - return storage.CName + return spacestorage.CName } -func (s *storageService) SpaceStorage(id string) (storage.SpaceStorage, error) { +func (s *storageService) SpaceStorage(id string) (spacestorage.SpaceStorage, error) { return newSpaceStorage(s.rootPath, id) } -func (s *storageService) CreateSpaceStorage(payload storage.SpaceStorageCreatePayload) (storage.SpaceStorage, error) { +func (s *storageService) CreateSpaceStorage(payload spacestorage.SpaceStorageCreatePayload) (spacestorage.SpaceStorage, error) { return createSpaceStorage(s.rootPath, payload) } diff --git a/node/storage/treestorage.go b/node/storage/treestorage.go index d1ab6fd6..65b8e20c 100644 --- a/node/storage/treestorage.go +++ b/node/storage/treestorage.go @@ -3,8 +3,8 @@ package storage import ( "context" "github.com/akrylysov/pogreb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" ) type treeStorage struct { @@ -14,14 +14,14 @@ type treeStorage struct { root *treechangeproto.RawTreeChangeWithId } -func newTreeStorage(db *pogreb.DB, treeId string) (ts storage.TreeStorage, err error) { +func newTreeStorage(db *pogreb.DB, treeId string) (ts treestorage.TreeStorage, err error) { keys := newTreeKeys(treeId) heads, err := db.Get(keys.HeadsKey()) if err != nil { return } if heads == nil { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId return } @@ -30,7 +30,7 @@ func newTreeStorage(db *pogreb.DB, treeId string) (ts storage.TreeStorage, err e return } if root == nil { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId return } @@ -47,18 +47,18 @@ func newTreeStorage(db *pogreb.DB, treeId string) (ts storage.TreeStorage, err e return } -func createTreeStorage(db *pogreb.DB, payload storage.TreeStorageCreatePayload) (ts storage.TreeStorage, err error) { +func createTreeStorage(db *pogreb.DB, payload treestorage.TreeStorageCreatePayload) (ts treestorage.TreeStorage, err error) { keys := newTreeKeys(payload.RootRawChange.Id) has, err := db.Has(keys.HeadsKey()) if err != nil { return } if has { - err = storage.ErrTreeExists + err = treestorage.ErrTreeExists return } - heads := storage.CreateHeadsPayload(payload.Heads) + heads := treestorage.CreateHeadsPayload(payload.Heads) for _, ch := range payload.Changes { err = db.Put(keys.RawChangeKey(ch.Id), ch.GetRawChange()) @@ -100,15 +100,15 @@ func (t *treeStorage) Heads() (heads []string, err error) { return } if headsBytes == nil { - err = storage.ErrUnknownTreeId + err = treestorage.ErrUnknownTreeId return } - heads = storage.ParseHeads(headsBytes) + heads = treestorage.ParseHeads(headsBytes) return } func (t *treeStorage) SetHeads(heads []string) (err error) { - payload := storage.CreateHeadsPayload(heads) + payload := treestorage.CreateHeadsPayload(heads) return t.db.Put(t.keys.HeadsKey(), payload) } @@ -122,7 +122,7 @@ func (t *treeStorage) GetRawChange(ctx context.Context, id string) (raw *treecha return } if res == nil { - err = storage.ErrUnknownChange + err = treestorage.ErrUnknownChange } raw = &treechangeproto.RawTreeChangeWithId{ diff --git a/node/storage/treestorage_test.go b/node/storage/treestorage_test.go index 85ba1e3d..118d557c 100644 --- a/node/storage/treestorage_test.go +++ b/node/storage/treestorage_test.go @@ -3,18 +3,18 @@ package storage import ( "context" "github.com/akrylysov/pogreb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" "github.com/stretchr/testify/require" "os" "testing" ) -func treeTestPayload() storage.TreeStorageCreatePayload { +func treeTestPayload() treestorage.TreeStorageCreatePayload { rootRawChange := &treechangeproto.RawTreeChangeWithId{RawChange: []byte("some"), Id: "rootId"} otherChange := &treechangeproto.RawTreeChangeWithId{RawChange: []byte("some other"), Id: "otherId"} changes := []*treechangeproto.RawTreeChangeWithId{rootRawChange, otherChange} - return storage.TreeStorageCreatePayload{ + return treestorage.TreeStorageCreatePayload{ RootRawChange: rootRawChange, Changes: changes, Heads: []string{rootRawChange.Id}, @@ -62,7 +62,7 @@ func (fx *fixture) testNoKeysExist(t *testing.T, treeId string) { require.False(t, res) } -func testTreePayload(t *testing.T, store storage.TreeStorage, payload storage.TreeStorageCreatePayload) { +func testTreePayload(t *testing.T, store treestorage.TreeStorage, payload treestorage.TreeStorageCreatePayload) { require.Equal(t, payload.RootRawChange.Id, store.Id()) root, err := store.Root() @@ -162,7 +162,7 @@ func TestTreeStorage_Delete(t *testing.T) { require.NoError(t, err) _, err = newTreeStorage(fx.db, payload.RootRawChange.Id) - require.Equal(t, err, storage.ErrUnknownTreeId) + require.Equal(t, err, treestorage.ErrUnknownTreeId) fx.testNoKeysExist(t, payload.RootRawChange.Id) }) diff --git a/util/cmd/debug/commands/client/service.go b/util/cmd/debug/commands/client/service.go index 7a629810..f370e0e0 100644 --- a/util/cmd/debug/commands/client/service.go +++ b/util/cmd/debug/commands/client/service.go @@ -2,7 +2,7 @@ package client import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cmd/debug/drpcclient" @@ -14,21 +14,21 @@ var log = logger.NewNamed(CName) type Service interface { app.Component - CreateSpace(ctx context.Context, ip string, request *apiproto.CreateSpaceRequest) (resp *apiproto.CreateSpaceResponse, err error) - DeriveSpace(ctx context.Context, ip string, request *apiproto.DeriveSpaceRequest) (resp *apiproto.DeriveSpaceResponse, err error) - CreateDocument(ctx context.Context, ip string, request *apiproto.CreateDocumentRequest) (resp *apiproto.CreateDocumentResponse, err error) - DeleteDocument(ctx context.Context, ip string, request *apiproto.DeleteDocumentRequest) (resp *apiproto.DeleteDocumentResponse, err error) - AddText(ctx context.Context, ip string, request *apiproto.AddTextRequest) (resp *apiproto.AddTextResponse, err error) - DumpTree(ctx context.Context, ip string, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) - TreeParams(ctx context.Context, ip string, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) - AllTrees(ctx context.Context, ip string, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) - AllSpaces(ctx context.Context, ip string, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) - LoadSpace(ctx context.Context, ip string, request *apiproto.LoadSpaceRequest) (res *apiproto.LoadSpaceResponse, err error) - Watch(ctx context.Context, ip string, request *apiproto.WatchRequest) (res *apiproto.WatchResponse, err error) - Unwatch(ctx context.Context, ip string, request *apiproto.UnwatchRequest) (res *apiproto.UnwatchResponse, err error) - PutFile(ctx context.Context, ip string, request *apiproto.PutFileRequest) (resp *apiproto.PutFileResponse, err error) - GetFile(ctx context.Context, ip string, request *apiproto.GetFileRequest) (resp *apiproto.GetFileResponse, err error) - DeleteFile(ctx context.Context, ip string, request *apiproto.DeleteFileRequest) (resp *apiproto.DeleteFileResponse, err error) + CreateSpace(ctx context.Context, ip string, request *clientdebugrpcproto.CreateSpaceRequest) (resp *clientdebugrpcproto.CreateSpaceResponse, err error) + DeriveSpace(ctx context.Context, ip string, request *clientdebugrpcproto.DeriveSpaceRequest) (resp *clientdebugrpcproto.DeriveSpaceResponse, err error) + CreateDocument(ctx context.Context, ip string, request *clientdebugrpcproto.CreateDocumentRequest) (resp *clientdebugrpcproto.CreateDocumentResponse, err error) + DeleteDocument(ctx context.Context, ip string, request *clientdebugrpcproto.DeleteDocumentRequest) (resp *clientdebugrpcproto.DeleteDocumentResponse, err error) + AddText(ctx context.Context, ip string, request *clientdebugrpcproto.AddTextRequest) (resp *clientdebugrpcproto.AddTextResponse, err error) + DumpTree(ctx context.Context, ip string, request *clientdebugrpcproto.DumpTreeRequest) (resp *clientdebugrpcproto.DumpTreeResponse, err error) + TreeParams(ctx context.Context, ip string, request *clientdebugrpcproto.TreeParamsRequest) (resp *clientdebugrpcproto.TreeParamsResponse, err error) + AllTrees(ctx context.Context, ip string, request *clientdebugrpcproto.AllTreesRequest) (resp *clientdebugrpcproto.AllTreesResponse, err error) + AllSpaces(ctx context.Context, ip string, request *clientdebugrpcproto.AllSpacesRequest) (resp *clientdebugrpcproto.AllSpacesResponse, err error) + LoadSpace(ctx context.Context, ip string, request *clientdebugrpcproto.LoadSpaceRequest) (res *clientdebugrpcproto.LoadSpaceResponse, err error) + Watch(ctx context.Context, ip string, request *clientdebugrpcproto.WatchRequest) (res *clientdebugrpcproto.WatchResponse, err error) + Unwatch(ctx context.Context, ip string, request *clientdebugrpcproto.UnwatchRequest) (res *clientdebugrpcproto.UnwatchResponse, err error) + PutFile(ctx context.Context, ip string, request *clientdebugrpcproto.PutFileRequest) (resp *clientdebugrpcproto.PutFileResponse, err error) + GetFile(ctx context.Context, ip string, request *clientdebugrpcproto.GetFileRequest) (resp *clientdebugrpcproto.GetFileResponse, err error) + DeleteFile(ctx context.Context, ip string, request *clientdebugrpcproto.DeleteFileRequest) (resp *clientdebugrpcproto.DeleteFileResponse, err error) } type service struct { @@ -48,7 +48,7 @@ func (s *service) Name() (name string) { return CName } -func (s *service) CreateSpace(ctx context.Context, ip string, request *apiproto.CreateSpaceRequest) (resp *apiproto.CreateSpaceResponse, err error) { +func (s *service) CreateSpace(ctx context.Context, ip string, request *clientdebugrpcproto.CreateSpaceRequest) (resp *clientdebugrpcproto.CreateSpaceResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -56,7 +56,7 @@ func (s *service) CreateSpace(ctx context.Context, ip string, request *apiproto. return cl.CreateSpace(ctx, request) } -func (s *service) DeriveSpace(ctx context.Context, ip string, request *apiproto.DeriveSpaceRequest) (resp *apiproto.DeriveSpaceResponse, err error) { +func (s *service) DeriveSpace(ctx context.Context, ip string, request *clientdebugrpcproto.DeriveSpaceRequest) (resp *clientdebugrpcproto.DeriveSpaceResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -64,7 +64,7 @@ func (s *service) DeriveSpace(ctx context.Context, ip string, request *apiproto. return cl.DeriveSpace(ctx, request) } -func (s *service) CreateDocument(ctx context.Context, ip string, request *apiproto.CreateDocumentRequest) (resp *apiproto.CreateDocumentResponse, err error) { +func (s *service) CreateDocument(ctx context.Context, ip string, request *clientdebugrpcproto.CreateDocumentRequest) (resp *clientdebugrpcproto.CreateDocumentResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -72,7 +72,7 @@ func (s *service) CreateDocument(ctx context.Context, ip string, request *apipro return cl.CreateDocument(ctx, request) } -func (s *service) DeleteDocument(ctx context.Context, ip string, request *apiproto.DeleteDocumentRequest) (resp *apiproto.DeleteDocumentResponse, err error) { +func (s *service) DeleteDocument(ctx context.Context, ip string, request *clientdebugrpcproto.DeleteDocumentRequest) (resp *clientdebugrpcproto.DeleteDocumentResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -80,7 +80,7 @@ func (s *service) DeleteDocument(ctx context.Context, ip string, request *apipro return cl.DeleteDocument(ctx, request) } -func (s *service) AddText(ctx context.Context, ip string, request *apiproto.AddTextRequest) (resp *apiproto.AddTextResponse, err error) { +func (s *service) AddText(ctx context.Context, ip string, request *clientdebugrpcproto.AddTextRequest) (resp *clientdebugrpcproto.AddTextResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -88,7 +88,7 @@ func (s *service) AddText(ctx context.Context, ip string, request *apiproto.AddT return cl.AddText(ctx, request) } -func (s *service) DumpTree(ctx context.Context, ip string, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) { +func (s *service) DumpTree(ctx context.Context, ip string, request *clientdebugrpcproto.DumpTreeRequest) (resp *clientdebugrpcproto.DumpTreeResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -96,7 +96,7 @@ func (s *service) DumpTree(ctx context.Context, ip string, request *apiproto.Dum return cl.DumpTree(ctx, request) } -func (s *service) TreeParams(ctx context.Context, ip string, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) { +func (s *service) TreeParams(ctx context.Context, ip string, request *clientdebugrpcproto.TreeParamsRequest) (resp *clientdebugrpcproto.TreeParamsResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -104,7 +104,7 @@ func (s *service) TreeParams(ctx context.Context, ip string, request *apiproto.T return cl.TreeParams(ctx, request) } -func (s *service) AllTrees(ctx context.Context, ip string, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) { +func (s *service) AllTrees(ctx context.Context, ip string, request *clientdebugrpcproto.AllTreesRequest) (resp *clientdebugrpcproto.AllTreesResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -112,7 +112,7 @@ func (s *service) AllTrees(ctx context.Context, ip string, request *apiproto.All return cl.AllTrees(ctx, request) } -func (s *service) AllSpaces(ctx context.Context, ip string, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) { +func (s *service) AllSpaces(ctx context.Context, ip string, request *clientdebugrpcproto.AllSpacesRequest) (resp *clientdebugrpcproto.AllSpacesResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -120,7 +120,7 @@ func (s *service) AllSpaces(ctx context.Context, ip string, request *apiproto.Al return cl.AllSpaces(ctx, request) } -func (s *service) LoadSpace(ctx context.Context, ip string, request *apiproto.LoadSpaceRequest) (res *apiproto.LoadSpaceResponse, err error) { +func (s *service) LoadSpace(ctx context.Context, ip string, request *clientdebugrpcproto.LoadSpaceRequest) (res *clientdebugrpcproto.LoadSpaceResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -128,7 +128,7 @@ func (s *service) LoadSpace(ctx context.Context, ip string, request *apiproto.Lo return cl.LoadSpace(ctx, request) } -func (s *service) Watch(ctx context.Context, ip string, request *apiproto.WatchRequest) (res *apiproto.WatchResponse, err error) { +func (s *service) Watch(ctx context.Context, ip string, request *clientdebugrpcproto.WatchRequest) (res *clientdebugrpcproto.WatchResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -136,7 +136,7 @@ func (s *service) Watch(ctx context.Context, ip string, request *apiproto.WatchR return cl.Watch(ctx, request) } -func (s *service) Unwatch(ctx context.Context, ip string, request *apiproto.UnwatchRequest) (res *apiproto.UnwatchResponse, err error) { +func (s *service) Unwatch(ctx context.Context, ip string, request *clientdebugrpcproto.UnwatchRequest) (res *clientdebugrpcproto.UnwatchResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -144,7 +144,7 @@ func (s *service) Unwatch(ctx context.Context, ip string, request *apiproto.Unwa return cl.Unwatch(ctx, request) } -func (s *service) PutFile(ctx context.Context, ip string, request *apiproto.PutFileRequest) (resp *apiproto.PutFileResponse, err error) { +func (s *service) PutFile(ctx context.Context, ip string, request *clientdebugrpcproto.PutFileRequest) (resp *clientdebugrpcproto.PutFileResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -152,7 +152,7 @@ func (s *service) PutFile(ctx context.Context, ip string, request *apiproto.PutF return cl.PutFile(ctx, request) } -func (s *service) GetFile(ctx context.Context, ip string, request *apiproto.GetFileRequest) (resp *apiproto.GetFileResponse, err error) { +func (s *service) GetFile(ctx context.Context, ip string, request *clientdebugrpcproto.GetFileRequest) (resp *clientdebugrpcproto.GetFileResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return @@ -160,7 +160,7 @@ func (s *service) GetFile(ctx context.Context, ip string, request *apiproto.GetF return cl.GetFile(ctx, request) } -func (s *service) DeleteFile(ctx context.Context, ip string, request *apiproto.DeleteFileRequest) (resp *apiproto.DeleteFileResponse, err error) { +func (s *service) DeleteFile(ctx context.Context, ip string, request *clientdebugrpcproto.DeleteFileRequest) (resp *clientdebugrpcproto.DeleteFileResponse, err error) { cl, err := s.client.GetClient(ctx, ip) if err != nil { return diff --git a/util/cmd/debug/commands/clientcmds.go b/util/cmd/debug/commands/clientcmds.go index 2b67a3da..f49fb082 100644 --- a/util/cmd/debug/commands/clientcmds.go +++ b/util/cmd/debug/commands/clientcmds.go @@ -3,7 +3,7 @@ package commands import ( "context" "fmt" - clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" + clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/spf13/cobra" ) diff --git a/util/cmd/debug/commands/node/service.go b/util/cmd/debug/commands/node/service.go index cc09f9f6..32b81fcb 100644 --- a/util/cmd/debug/commands/node/service.go +++ b/util/cmd/debug/commands/node/service.go @@ -4,7 +4,7 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cmd/debug/drpcclient" ) @@ -14,10 +14,10 @@ var log = logger.NewNamed(CName) type Service interface { app.Component - DumpTree(ctx context.Context, ip string, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) - TreeParams(ctx context.Context, ip string, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) - AllTrees(ctx context.Context, ip string, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) - AllSpaces(ctx context.Context, ip string, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) + DumpTree(ctx context.Context, ip string, request *nodedebugrpcproto.DumpTreeRequest) (resp *nodedebugrpcproto.DumpTreeResponse, err error) + TreeParams(ctx context.Context, ip string, request *nodedebugrpcproto.TreeParamsRequest) (resp *nodedebugrpcproto.TreeParamsResponse, err error) + AllTrees(ctx context.Context, ip string, request *nodedebugrpcproto.AllTreesRequest) (resp *nodedebugrpcproto.AllTreesResponse, err error) + AllSpaces(ctx context.Context, ip string, request *nodedebugrpcproto.AllSpacesRequest) (resp *nodedebugrpcproto.AllSpacesResponse, err error) } type service struct { @@ -37,7 +37,7 @@ func (s *service) Name() (name string) { return CName } -func (s *service) DumpTree(ctx context.Context, ip string, request *apiproto.DumpTreeRequest) (resp *apiproto.DumpTreeResponse, err error) { +func (s *service) DumpTree(ctx context.Context, ip string, request *nodedebugrpcproto.DumpTreeRequest) (resp *nodedebugrpcproto.DumpTreeResponse, err error) { cl, err := s.client.GetNode(ctx, ip) if err != nil { return @@ -45,7 +45,7 @@ func (s *service) DumpTree(ctx context.Context, ip string, request *apiproto.Dum return cl.DumpTree(ctx, request) } -func (s *service) TreeParams(ctx context.Context, ip string, request *apiproto.TreeParamsRequest) (resp *apiproto.TreeParamsResponse, err error) { +func (s *service) TreeParams(ctx context.Context, ip string, request *nodedebugrpcproto.TreeParamsRequest) (resp *nodedebugrpcproto.TreeParamsResponse, err error) { cl, err := s.client.GetNode(ctx, ip) if err != nil { return @@ -53,7 +53,7 @@ func (s *service) TreeParams(ctx context.Context, ip string, request *apiproto.T return cl.TreeParams(ctx, request) } -func (s *service) AllTrees(ctx context.Context, ip string, request *apiproto.AllTreesRequest) (resp *apiproto.AllTreesResponse, err error) { +func (s *service) AllTrees(ctx context.Context, ip string, request *nodedebugrpcproto.AllTreesRequest) (resp *nodedebugrpcproto.AllTreesResponse, err error) { cl, err := s.client.GetNode(ctx, ip) if err != nil { return @@ -61,7 +61,7 @@ func (s *service) AllTrees(ctx context.Context, ip string, request *apiproto.All return cl.AllTrees(ctx, request) } -func (s *service) AllSpaces(ctx context.Context, ip string, request *apiproto.AllSpacesRequest) (resp *apiproto.AllSpacesResponse, err error) { +func (s *service) AllSpaces(ctx context.Context, ip string, request *nodedebugrpcproto.AllSpacesRequest) (resp *nodedebugrpcproto.AllSpacesResponse, err error) { cl, err := s.client.GetNode(ctx, ip) if err != nil { return diff --git a/util/cmd/debug/commands/nodecmds.go b/util/cmd/debug/commands/nodecmds.go index 4e86875e..572cd710 100644 --- a/util/cmd/debug/commands/nodecmds.go +++ b/util/cmd/debug/commands/nodecmds.go @@ -3,7 +3,7 @@ package commands import ( "context" "fmt" - nodeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" + nodeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" "github.com/spf13/cobra" ) diff --git a/util/cmd/debug/commands/scripts.go b/util/cmd/debug/commands/scripts.go index 5f1c14f4..1101f8dd 100644 --- a/util/cmd/debug/commands/scripts.go +++ b/util/cmd/debug/commands/scripts.go @@ -3,7 +3,7 @@ package commands import ( "context" "fmt" - clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" + clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/spf13/cobra" "github.com/zeebo/errs" "math/rand" diff --git a/util/cmd/debug/drpcclient/service.go b/util/cmd/debug/drpcclient/service.go index 2f59cfd0..8a374170 100644 --- a/util/cmd/debug/drpcclient/service.go +++ b/util/cmd/debug/drpcclient/service.go @@ -2,11 +2,11 @@ package drpcclient import ( "context" - clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" + clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc/clientdebugrpcproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/ocache" - nodeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + nodeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" "net" "storj.io/drpc/drpcconn" "time" From f696d774bbd69de01e27dc1e1b7e800897a26d87 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Sun, 25 Dec 2022 21:12:17 +0100 Subject: [PATCH 03/17] Refactor spacesyncproto --- client/clientspace/rpchandler.go | 10 +- common/Makefile | 7 +- common/commonspace/headsync/diffsyncer.go | 4 +- .../commonspace/headsync/diffsyncer_test.go | 8 +- common/commonspace/headsync/headsync.go | 2 +- .../object/acl/aclrecordproto/aclrecord.pb.go | 163 ++++----- .../acl/aclrecordproto/protos/aclrecord.proto | 2 +- .../treechangeproto/protos/treechange.proto | 2 +- .../tree/treechangeproto/treechange.pb.go | 106 +++--- common/commonspace/objectsync/objectsync.go | 2 +- .../commonspace/objectsync/streamchecker.go | 2 +- common/commonspace/objectsync/streampool.go | 24 +- .../commonspace/objectsync/streampool_test.go | 24 +- common/commonspace/rpchandler.go | 4 +- common/commonspace/spaceservice.go | 4 +- .../mock_spacesyncproto.go | 78 ++--- .../spacesyncproto/protos/spacesync.proto | 18 +- .../commonspace/spacesyncproto/spacesync.go | 10 +- .../spacesyncproto/spacesync.pb.go | 326 +++++++++--------- .../spacesyncproto/spacesync_drpc.pb.go | 144 ++++---- node/nodespace/rpchandler.go | 10 +- 21 files changed, 474 insertions(+), 476 deletions(-) diff --git a/client/clientspace/rpchandler.go b/client/clientspace/rpchandler.go index 223efb84..df6a8dc0 100644 --- a/client/clientspace/rpchandler.go +++ b/client/clientspace/rpchandler.go @@ -10,7 +10,7 @@ type rpcHandler struct { s *service } -func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.PullSpaceRequest) (resp *spacesyncproto.PullSpaceResponse, err error) { +func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { sp, err := r.s.GetSpace(ctx, request.Id) if err != nil { if err != spacesyncproto.ErrSpaceMissing { @@ -25,7 +25,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull return } - resp = &spacesyncproto.PullSpaceResponse{ + resp = &spacesyncproto.SpacePullResponse{ Payload: &spacesyncproto.SpacePayload{ SpaceHeader: spaceDesc.SpaceHeader, AclPayloadId: spaceDesc.AclId, @@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull return } -func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpaceRequest) (resp *spacesyncproto.PushSpaceResponse, err error) { +func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { description := commonspace.SpaceDescription{ SpaceHeader: req.Payload.SpaceHeader, AclId: req.Payload.AclPayloadId, @@ -50,7 +50,7 @@ func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpac if err != nil { return } - resp = &spacesyncproto.PushSpaceResponse{} + resp = &spacesyncproto.SpacePushResponse{} return } @@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR return sp.SpaceSyncRpc().HeadSync(ctx, req) } -func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpace_StreamStream) error { +func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { msg, err := stream.Recv() if err != nil { return err diff --git a/common/Makefile b/common/Makefile index 8661453c..699dde33 100644 --- a/common/Makefile +++ b/common/Makefile @@ -5,20 +5,17 @@ proto: @echo 'Generating protobuf packages (Go)...' @$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1) - @$(eval P_ACL_RECORDS_PATH_PB := pkg/acl/aclrecordproto) - @$(eval P_TREE_CHANGES_PATH_PB := pkg/acl/treechangeproto) + @$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto) + @$(eval P_TREE_CHANGES_PATH_PB := commonspace/object/tree/treechangeproto) @$(eval P_SYNC_CHANGES_PATH_PB := syncproto) - @$(eval P_TEST_CHANGES_PATH_PB := pkg/acl/testutils/testchanges) @$(eval P_ACL_RECORDS := M$(P_ACL_RECORDS_PATH_PB)/protos/aclrecord.proto=github.com/anytypeio/go-anytype-infrastructure-experiments/common/$(P_ACL_RECORDS_PATH_PB)) @$(eval P_TREE_CHANGES := M$(P_TREE_CHANGES_PATH_PB)/protos/treechange.proto=github.com/anytypeio/go-anytype-infrastructure-experiments/common/$(P_TREE_CHANGES_PATH_PB)) $(GOGO_START) protoc --gogofaster_out=:. $(P_ACL_RECORDS_PATH_PB)/protos/*.proto $(GOGO_START) protoc --gogofaster_out=:. $(P_TREE_CHANGES_PATH_PB)/protos/*.proto - $(GOGO_START) protoc --gogofaster_out=:. $(P_TEST_CHANGES_PATH_PB)/proto/*.proto $(eval PKGMAP := $$(P_TREE_CHANGES),$$(P_ACL_RECORDS)) $(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonspace/spacesyncproto/protos/*.proto $(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonfile/fileproto/protos/*.proto - test: go test ./... --cover \ No newline at end of file diff --git a/common/commonspace/headsync/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go index ccbe96c7..ef855bf8 100644 --- a/common/commonspace/headsync/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -146,7 +146,7 @@ func (d *diffSyncer) pingTreesInCache(ctx context.Context, trees []string) { } } -func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, cl spacesyncproto.DRPCSpaceClient) (err error) { +func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, cl spacesyncproto.DRPCSpaceSyncClient) (err error) { aclStorage, err := d.storage.ACLStorage() if err != nil { return @@ -178,7 +178,7 @@ func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, cl spacesyncproto SpaceSettingsPayload: spaceSettingsRoot.RawChange, SpaceSettingsPayloadId: spaceSettingsRoot.Id, } - _, err = cl.PushSpace(ctx, &spacesyncproto.PushSpaceRequest{ + _, err = cl.SpacePush(ctx, &spacesyncproto.SpacePushRequest{ Payload: spacePayload, }) return diff --git a/common/commonspace/headsync/diffsyncer_test.go b/common/commonspace/headsync/diffsyncer_test.go index 6dfe9cbe..9cfb278d 100644 --- a/common/commonspace/headsync/diffsyncer_test.go +++ b/common/commonspace/headsync/diffsyncer_test.go @@ -33,7 +33,7 @@ type pushSpaceRequestMatcher struct { } func (p pushSpaceRequestMatcher) Matches(x interface{}) bool { - res, ok := x.(*spacesyncproto.PushSpaceRequest) + res, ok := x.(*spacesyncproto.SpacePushRequest) if !ok { return false } @@ -101,8 +101,8 @@ func TestDiffSyncer_Sync(t *testing.T) { connectorMock := mock_nodeconf.NewMockConfConnector(ctrl) cacheMock := mock_treegetter.NewMockTreeGetter(ctrl) stMock := mock_spacestorage.NewMockSpaceStorage(ctrl) - clientMock := mock_spacesyncproto.NewMockDRPCSpaceClient(ctrl) - factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceClient { + clientMock := mock_spacesyncproto.NewMockDRPCSpaceSyncClient(ctrl) + factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceSyncClient { return clientMock }) delState := mock_deletionstate.NewMockDeletionState(ctrl) @@ -186,7 +186,7 @@ func TestDiffSyncer_Sync(t *testing.T) { Root(). Return(aclRoot, nil) clientMock.EXPECT(). - PushSpace(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, spaceHeader)). + SpacePush(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, spaceHeader)). Return(nil, nil) require.NoError(t, diffSyncer.Sync(ctx)) diff --git a/common/commonspace/headsync/headsync.go b/common/commonspace/headsync/headsync.go index d6e527db..6f07bca4 100644 --- a/common/commonspace/headsync/headsync.go +++ b/common/commonspace/headsync/headsync.go @@ -54,7 +54,7 @@ func NewHeadSync( diff := ldiff.New(16, 16) l := log.With(zap.String("spaceId", spaceId)) - factory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceClient) + factory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceSyncClient) syncer := newDiffSyncer(spaceId, diff, confConnector, cache, storage, factory, syncStatus, l) periodicSync := periodicsync.NewPeriodicSync(syncPeriod, time.Minute, syncer.Sync, l) diff --git a/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go b/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go index ea582a27..ff10ae2b 100644 --- a/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go +++ b/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/acl/aclrecordproto/protos/aclrecord.proto +// source: commonspace/object/acl/aclrecordproto/protos/aclrecord.proto package aclrecordproto @@ -47,7 +47,7 @@ func (x ACLUserPermissions) String() string { } func (ACLUserPermissions) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{0} + return fileDescriptor_c8e9f754f34e929b, []int{0} } type RawACLRecord struct { @@ -61,7 +61,7 @@ func (m *RawACLRecord) Reset() { *m = RawACLRecord{} } func (m *RawACLRecord) String() string { return proto.CompactTextString(m) } func (*RawACLRecord) ProtoMessage() {} func (*RawACLRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{0} + return fileDescriptor_c8e9f754f34e929b, []int{0} } func (m *RawACLRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -127,7 +127,7 @@ func (m *RawACLRecordWithId) Reset() { *m = RawACLRecordWithId{} } func (m *RawACLRecordWithId) String() string { return proto.CompactTextString(m) } func (*RawACLRecordWithId) ProtoMessage() {} func (*RawACLRecordWithId) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{1} + return fileDescriptor_c8e9f754f34e929b, []int{1} } func (m *RawACLRecordWithId) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -182,7 +182,7 @@ func (m *ACLRecord) Reset() { *m = ACLRecord{} } func (m *ACLRecord) String() string { return proto.CompactTextString(m) } func (*ACLRecord) ProtoMessage() {} func (*ACLRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{2} + return fileDescriptor_c8e9f754f34e929b, []int{2} } func (m *ACLRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -260,7 +260,7 @@ func (m *ACLRoot) Reset() { *m = ACLRoot{} } func (m *ACLRoot) String() string { return proto.CompactTextString(m) } func (*ACLRoot) ProtoMessage() {} func (*ACLRoot) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{3} + return fileDescriptor_c8e9f754f34e929b, []int{3} } func (m *ACLRoot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -353,7 +353,7 @@ func (m *ACLContentValue) Reset() { *m = ACLContentValue{} } func (m *ACLContentValue) String() string { return proto.CompactTextString(m) } func (*ACLContentValue) ProtoMessage() {} func (*ACLContentValue) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{4} + return fileDescriptor_c8e9f754f34e929b, []int{4} } func (m *ACLContentValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -471,7 +471,7 @@ func (m *ACLData) Reset() { *m = ACLData{} } func (m *ACLData) String() string { return proto.CompactTextString(m) } func (*ACLData) ProtoMessage() {} func (*ACLData) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{5} + return fileDescriptor_c8e9f754f34e929b, []int{5} } func (m *ACLData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -517,7 +517,7 @@ func (m *ACLState) Reset() { *m = ACLState{} } func (m *ACLState) String() string { return proto.CompactTextString(m) } func (*ACLState) ProtoMessage() {} func (*ACLState) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{6} + return fileDescriptor_c8e9f754f34e929b, []int{6} } func (m *ACLState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -577,7 +577,7 @@ func (m *ACLUserState) Reset() { *m = ACLUserState{} } func (m *ACLUserState) String() string { return proto.CompactTextString(m) } func (*ACLUserState) ProtoMessage() {} func (*ACLUserState) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{7} + return fileDescriptor_c8e9f754f34e929b, []int{7} } func (m *ACLUserState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -638,7 +638,7 @@ func (m *ACLUserAdd) Reset() { *m = ACLUserAdd{} } func (m *ACLUserAdd) String() string { return proto.CompactTextString(m) } func (*ACLUserAdd) ProtoMessage() {} func (*ACLUserAdd) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{8} + return fileDescriptor_c8e9f754f34e929b, []int{8} } func (m *ACLUserAdd) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -706,7 +706,7 @@ func (m *ACLUserInvite) Reset() { *m = ACLUserInvite{} } func (m *ACLUserInvite) String() string { return proto.CompactTextString(m) } func (*ACLUserInvite) ProtoMessage() {} func (*ACLUserInvite) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{9} + return fileDescriptor_c8e9f754f34e929b, []int{9} } func (m *ACLUserInvite) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -775,7 +775,7 @@ func (m *ACLUserJoin) Reset() { *m = ACLUserJoin{} } func (m *ACLUserJoin) String() string { return proto.CompactTextString(m) } func (*ACLUserJoin) ProtoMessage() {} func (*ACLUserJoin) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{10} + return fileDescriptor_c8e9f754f34e929b, []int{10} } func (m *ACLUserJoin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -848,7 +848,7 @@ func (m *ACLUserRemove) Reset() { *m = ACLUserRemove{} } func (m *ACLUserRemove) String() string { return proto.CompactTextString(m) } func (*ACLUserRemove) ProtoMessage() {} func (*ACLUserRemove) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{11} + return fileDescriptor_c8e9f754f34e929b, []int{11} } func (m *ACLUserRemove) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -901,7 +901,7 @@ func (m *ACLReadKeyReplace) Reset() { *m = ACLReadKeyReplace{} } func (m *ACLReadKeyReplace) String() string { return proto.CompactTextString(m) } func (*ACLReadKeyReplace) ProtoMessage() {} func (*ACLReadKeyReplace) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{12} + return fileDescriptor_c8e9f754f34e929b, []int{12} } func (m *ACLReadKeyReplace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -960,7 +960,7 @@ func (m *ACLUserPermissionChange) Reset() { *m = ACLUserPermissionChange func (m *ACLUserPermissionChange) String() string { return proto.CompactTextString(m) } func (*ACLUserPermissionChange) ProtoMessage() {} func (*ACLUserPermissionChange) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{13} + return fileDescriptor_c8e9f754f34e929b, []int{13} } func (m *ACLUserPermissionChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1011,7 +1011,7 @@ func (m *ACLSyncMessage) Reset() { *m = ACLSyncMessage{} } func (m *ACLSyncMessage) String() string { return proto.CompactTextString(m) } func (*ACLSyncMessage) ProtoMessage() {} func (*ACLSyncMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{14} + return fileDescriptor_c8e9f754f34e929b, []int{14} } func (m *ACLSyncMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1059,7 +1059,7 @@ func (m *ACLSyncContentValue) Reset() { *m = ACLSyncContentValue{} } func (m *ACLSyncContentValue) String() string { return proto.CompactTextString(m) } func (*ACLSyncContentValue) ProtoMessage() {} func (*ACLSyncContentValue) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{15} + return fileDescriptor_c8e9f754f34e929b, []int{15} } func (m *ACLSyncContentValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1129,7 +1129,7 @@ func (m *ACLAddRecords) Reset() { *m = ACLAddRecords{} } func (m *ACLAddRecords) String() string { return proto.CompactTextString(m) } func (*ACLAddRecords) ProtoMessage() {} func (*ACLAddRecords) Descriptor() ([]byte, []int) { - return fileDescriptor_14abe0d1b4206d54, []int{16} + return fileDescriptor_c8e9f754f34e929b, []int{16} } func (m *ACLAddRecords) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1188,71 +1188,72 @@ func init() { } func init() { - proto.RegisterFile("pkg/acl/aclrecordproto/protos/aclrecord.proto", fileDescriptor_14abe0d1b4206d54) + proto.RegisterFile("commonspace/object/acl/aclrecordproto/protos/aclrecord.proto", fileDescriptor_c8e9f754f34e929b) } -var fileDescriptor_14abe0d1b4206d54 = []byte{ - // 954 bytes of a gzipped FileDescriptorProto +var fileDescriptor_c8e9f754f34e929b = []byte{ + // 965 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xac, 0x9d, 0x38, 0x7e, 0x76, 0x13, 0x67, 0x80, 0x74, 0x15, 0x15, 0x2b, 0x5a, 0x71, - 0x88, 0xaa, 0xe2, 0x82, 0x41, 0x4a, 0x95, 0x03, 0xc8, 0x35, 0x45, 0x76, 0x13, 0xa4, 0x6a, 0x02, - 0x14, 0xf5, 0x36, 0xdd, 0x1d, 0x25, 0xab, 0xda, 0xbb, 0xab, 0x99, 0xb1, 0xd1, 0x1e, 0x39, 0x73, - 0x81, 0x6f, 0x00, 0x1f, 0x84, 0x3b, 0x12, 0x97, 0x5e, 0x40, 0x1c, 0x51, 0xf2, 0x31, 0xb8, 0xa0, - 0x99, 0xd9, 0xff, 0xeb, 0x44, 0x54, 0x8a, 0x7a, 0x48, 0x32, 0xf3, 0xde, 0xef, 0x4d, 0x7e, 0xef, - 0xf7, 0xde, 0xbc, 0x59, 0xf8, 0x30, 0x7a, 0x75, 0xfe, 0x90, 0xba, 0x73, 0xf5, 0xc3, 0x99, 0x1b, - 0x72, 0x2f, 0xe2, 0xa1, 0x0c, 0x1f, 0xea, 0xdf, 0x22, 0xb7, 0x0e, 0xb5, 0x01, 0x77, 0x32, 0x83, - 0xf3, 0x0b, 0x82, 0x1e, 0xa1, 0xdf, 0x8f, 0x27, 0xa7, 0x44, 0x1b, 0xb0, 0x0d, 0xed, 0x88, 0xc6, - 0xf3, 0x90, 0x7a, 0x36, 0x3a, 0x40, 0x87, 0x3d, 0x92, 0x6e, 0xf1, 0x3d, 0xe8, 0x08, 0xff, 0x3c, - 0xa0, 0x72, 0xc9, 0x99, 0x6d, 0x69, 0x5f, 0x6e, 0xc0, 0xf7, 0xa1, 0x4f, 0x5d, 0x97, 0x45, 0x32, - 0xe4, 0x33, 0x8f, 0x05, 0xd2, 0x97, 0xb1, 0xdd, 0xd4, 0xa0, 0x9a, 0x1d, 0x3f, 0x80, 0xdd, 0xd4, - 0x76, 0x96, 0x9d, 0xd8, 0xd2, 0xe0, 0xba, 0xc3, 0xf9, 0x0c, 0x70, 0x91, 0xe1, 0x73, 0x5f, 0x5e, - 0xcc, 0x6e, 0xe2, 0xb9, 0x0d, 0x96, 0xef, 0x69, 0x82, 0x1d, 0x62, 0xf9, 0x9e, 0xf3, 0x2b, 0x82, - 0x4e, 0x9e, 0xdf, 0x1e, 0x6c, 0x46, 0x9c, 0xad, 0x66, 0x26, 0xac, 0x43, 0x92, 0x1d, 0xde, 0x87, - 0x2d, 0x3f, 0xe5, 0x6d, 0x92, 0xcb, 0xf6, 0x18, 0x43, 0xcb, 0xa3, 0x92, 0x26, 0xf9, 0xe8, 0x35, - 0x1e, 0x02, 0x76, 0x97, 0x9c, 0xb3, 0x40, 0x12, 0x46, 0xbd, 0x13, 0x16, 0x4f, 0xa9, 0xb8, 0xd0, - 0x49, 0xb4, 0xc8, 0x1a, 0x8f, 0x52, 0x4f, 0xfa, 0x0b, 0x26, 0x24, 0x5d, 0x44, 0xf6, 0xc6, 0x01, - 0x3a, 0x6c, 0x92, 0xdc, 0xe0, 0xfc, 0x68, 0x41, 0x5b, 0x71, 0x0c, 0x43, 0x59, 0x62, 0x82, 0x2a, - 0x4c, 0x3e, 0x80, 0x3b, 0x2c, 0x70, 0x79, 0x1c, 0x49, 0x3f, 0x0c, 0x4e, 0x58, 0x4a, 0xb5, 0x6c, - 0x54, 0xda, 0x88, 0x88, 0xba, 0x6c, 0xe6, 0x69, 0xca, 0x1d, 0x92, 0x6e, 0x55, 0x95, 0x12, 0x28, - 0xf3, 0x12, 0x76, 0x89, 0xf0, 0x35, 0xbb, 0xc2, 0x7a, 0x8c, 0xfb, 0x2b, 0xaa, 0x8e, 0x3d, 0x73, - 0x2f, 0xd8, 0x82, 0x69, 0xe2, 0x1d, 0x52, 0xb3, 0x5f, 0xa3, 0xc6, 0xe6, 0xff, 0x53, 0xa3, 0x5d, - 0x55, 0xe3, 0x4f, 0x0b, 0x76, 0xc6, 0x93, 0xd3, 0x49, 0x18, 0x48, 0x16, 0xc8, 0x6f, 0xe9, 0x7c, - 0xc9, 0xf0, 0xc7, 0xd0, 0x5e, 0x0a, 0xc6, 0xc7, 0x9e, 0x29, 0x5c, 0x77, 0xf4, 0xde, 0x30, 0x6f, - 0xeb, 0xf1, 0xe4, 0xf4, 0x1b, 0xe3, 0x9c, 0x36, 0x48, 0x8a, 0xc3, 0xc7, 0x00, 0x6a, 0x49, 0xd8, - 0x22, 0x5c, 0x99, 0x8e, 0xed, 0x8e, 0xec, 0x7a, 0x94, 0xf1, 0x4f, 0x1b, 0xa4, 0x80, 0xc6, 0xdf, - 0xc1, 0xbb, 0x6a, 0xf7, 0x8c, 0xf1, 0x85, 0x2f, 0x84, 0x1f, 0x06, 0x93, 0x0b, 0x1a, 0x9c, 0x33, - 0xad, 0x67, 0x77, 0xe4, 0xd4, 0x4f, 0xa9, 0x22, 0xa7, 0x0d, 0xb2, 0xf6, 0x84, 0x94, 0xd5, 0x2c, - 0x58, 0xf9, 0xd2, 0x74, 0xfd, 0x5a, 0x56, 0xc6, 0x9f, 0xb2, 0x32, 0x3b, 0xfc, 0x29, 0x6c, 0xa9, - 0xdd, 0xd3, 0xd0, 0x0f, 0x74, 0x29, 0xba, 0xa3, 0xbd, 0x7a, 0xa4, 0xf2, 0x4e, 0x1b, 0x24, 0x43, - 0x3e, 0x6e, 0xc3, 0xc6, 0x4a, 0x69, 0xe8, 0x3c, 0xd1, 0x4d, 0xf6, 0x85, 0x6a, 0xdf, 0x63, 0x00, - 0xea, 0xce, 0x13, 0x85, 0x6d, 0x74, 0xd0, 0x3c, 0xec, 0x8e, 0xf6, 0xcb, 0x67, 0x15, 0xe5, 0x27, - 0x05, 0xb4, 0xf3, 0x2f, 0x82, 0xad, 0xf1, 0xe4, 0xf4, 0x4c, 0x52, 0xc9, 0x54, 0x47, 0xf2, 0xbc, - 0xb0, 0x4c, 0xe8, 0xb3, 0x5a, 0xa4, 0x6c, 0xc4, 0x47, 0x26, 0x69, 0x1d, 0x22, 0x6c, 0x4b, 0xff, - 0xbb, 0xbb, 0x75, 0xea, 0xda, 0x4f, 0x0a, 0x50, 0x7c, 0x0c, 0x6d, 0x5f, 0xe7, 0x2e, 0xec, 0xa6, - 0x8e, 0x3a, 0x28, 0x47, 0x69, 0xd8, 0xd0, 0xc8, 0x23, 0x9e, 0x04, 0x92, 0xc7, 0x24, 0x0d, 0xd8, - 0xff, 0x1a, 0x7a, 0x45, 0x07, 0xee, 0x43, 0xf3, 0x15, 0x8b, 0x93, 0x7b, 0xaf, 0x96, 0x78, 0x98, - 0x28, 0x73, 0x7d, 0x73, 0x98, 0x03, 0x88, 0x81, 0x1d, 0x5b, 0x8f, 0x90, 0xf3, 0x33, 0x82, 0x5e, - 0x91, 0xee, 0x2d, 0xdc, 0xd7, 0xcf, 0xa1, 0x1b, 0x65, 0x6d, 0x22, 0x74, 0x8f, 0x6d, 0x8f, 0xde, - 0xbf, 0xa9, 0xc7, 0x04, 0x29, 0x46, 0x38, 0xbf, 0x21, 0x80, 0xfc, 0x0e, 0xdc, 0x02, 0xa3, 0x07, - 0xb0, 0x5b, 0x9d, 0x07, 0xa6, 0x00, 0x3d, 0x52, 0x77, 0x54, 0xf9, 0xb7, 0xde, 0x98, 0xff, 0x5f, - 0x08, 0xee, 0x94, 0x04, 0xc7, 0x87, 0xb0, 0x63, 0x5e, 0x82, 0x67, 0xcb, 0x97, 0x73, 0xdf, 0x3d, - 0x61, 0x69, 0x26, 0x55, 0x73, 0x81, 0xea, 0x59, 0xbc, 0x48, 0x27, 0x8f, 0xa5, 0x27, 0x4f, 0xdd, - 0xf1, 0xb6, 0x13, 0xfb, 0x03, 0x41, 0xb7, 0x70, 0x2d, 0x6f, 0xa1, 0x32, 0x99, 0x30, 0xf9, 0xcb, - 0xd9, 0x2c, 0x0a, 0x93, 0x99, 0xb1, 0x03, 0xbd, 0x4c, 0xab, 0x7c, 0xce, 0x97, 0x6c, 0xeb, 0xe5, - 0xd8, 0xb8, 0x46, 0x0e, 0x47, 0x64, 0x55, 0x4a, 0xa6, 0xe4, 0x4d, 0xe9, 0x7c, 0x09, 0x3b, 0xc9, - 0x0c, 0x20, 0x2c, 0x9a, 0x53, 0x37, 0xbb, 0xf7, 0xf7, 0xca, 0xfa, 0x91, 0x12, 0x88, 0x54, 0x83, - 0x9c, 0x1f, 0x10, 0xec, 0xd6, 0x60, 0xb7, 0x20, 0xe4, 0xba, 0xa7, 0xb0, 0xb9, 0xfe, 0x29, 0x74, - 0x56, 0x70, 0xf7, 0x9a, 0x31, 0x7f, 0x23, 0x91, 0x4a, 0xfb, 0x58, 0x6f, 0xdc, 0x3e, 0x4f, 0x61, - 0x5b, 0xcd, 0xb8, 0x38, 0x70, 0xbf, 0x62, 0x42, 0xd0, 0x73, 0x86, 0x1f, 0x41, 0xdb, 0x4d, 0x86, - 0xb6, 0x99, 0x59, 0x83, 0xca, 0x3c, 0x8c, 0x03, 0xb7, 0x34, 0xb8, 0x53, 0xb8, 0xf3, 0x02, 0xde, - 0x59, 0xe3, 0xd7, 0x0f, 0x81, 0xe7, 0x99, 0x8f, 0x23, 0x91, 0x3c, 0xad, 0x95, 0x39, 0x38, 0xce, - 0xfc, 0xea, 0x39, 0xca, 0xd1, 0xf9, 0xc3, 0x32, 0xd5, 0x8d, 0x91, 0xe3, 0xf0, 0x11, 0xb4, 0x79, - 0x76, 0xa4, 0x2a, 0x7a, 0x31, 0xeb, 0xfa, 0xd7, 0x1c, 0x49, 0xd1, 0xf7, 0x8f, 0x00, 0xd7, 0x45, - 0xc1, 0x1d, 0xd8, 0x18, 0x7b, 0x0b, 0x3f, 0xe8, 0x37, 0x30, 0xc0, 0xe6, 0x73, 0xee, 0x4b, 0xc6, - 0xfb, 0x48, 0xad, 0x55, 0x85, 0x18, 0xef, 0x5b, 0x8f, 0x3f, 0xfa, 0xfd, 0x72, 0x80, 0x5e, 0x5f, - 0x0e, 0xd0, 0x3f, 0x97, 0x03, 0xf4, 0xd3, 0xd5, 0xa0, 0xf1, 0xfa, 0x6a, 0xd0, 0xf8, 0xfb, 0x6a, - 0xd0, 0x78, 0xb1, 0xb7, 0xfe, 0xe3, 0xf8, 0xe5, 0xa6, 0xfe, 0xf3, 0xc9, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xa9, 0xbd, 0x7e, 0xe0, 0x3d, 0x0b, 0x00, 0x00, + 0x14, 0xf7, 0xac, 0x9d, 0x38, 0x7e, 0x76, 0x13, 0x67, 0x80, 0x76, 0x15, 0x15, 0x2b, 0x5a, 0x81, + 0x14, 0x55, 0x95, 0x23, 0x0c, 0x52, 0xaa, 0x08, 0x51, 0xb9, 0xa6, 0xc8, 0x6e, 0x82, 0x54, 0x4d, + 0x80, 0xa2, 0xde, 0x26, 0xbb, 0xa3, 0x64, 0xc1, 0xfb, 0x47, 0x33, 0x63, 0xa3, 0x3d, 0x72, 0xe6, + 0x02, 0xdf, 0x00, 0x3e, 0x08, 0x77, 0x24, 0x2e, 0xbd, 0x80, 0x38, 0xa2, 0xe4, 0x63, 0x70, 0x41, + 0x33, 0xfb, 0x7f, 0xd7, 0x89, 0x5a, 0xc9, 0xea, 0x21, 0xc9, 0xcc, 0x7b, 0xbf, 0x37, 0xf9, 0xbd, + 0xdf, 0x7b, 0xf3, 0x66, 0xe1, 0x53, 0x3b, 0xf0, 0xbc, 0xc0, 0x17, 0x21, 0xb5, 0xd9, 0x61, 0x70, + 0xfe, 0x1d, 0xb3, 0xe5, 0x21, 0xb5, 0xe7, 0xea, 0x87, 0x33, 0x3b, 0xe0, 0x4e, 0xc8, 0x03, 0x19, + 0x1c, 0xea, 0xdf, 0x22, 0xb7, 0x0e, 0xb5, 0x01, 0x77, 0x32, 0x83, 0xf5, 0x2b, 0x82, 0x1e, 0xa1, + 0x3f, 0x8c, 0x27, 0xa7, 0x44, 0x1b, 0xb0, 0x09, 0xed, 0x90, 0x46, 0xf3, 0x80, 0x3a, 0x26, 0xda, + 0x47, 0x07, 0x3d, 0x92, 0x6e, 0xf1, 0x7d, 0xe8, 0x08, 0xf7, 0xc2, 0xa7, 0x72, 0xc1, 0x99, 0x69, + 0x68, 0x5f, 0x6e, 0xc0, 0x0f, 0xa0, 0x4f, 0x6d, 0x9b, 0x85, 0x32, 0xe0, 0x33, 0x87, 0xf9, 0xd2, + 0x95, 0x91, 0xd9, 0xd4, 0xa0, 0x9a, 0x1d, 0x3f, 0x84, 0xdd, 0xd4, 0x76, 0x96, 0x9d, 0xd8, 0xd2, + 0xe0, 0xba, 0xc3, 0xfa, 0x0c, 0x70, 0x91, 0xe1, 0x0b, 0x57, 0x5e, 0xce, 0x6e, 0xe3, 0xb9, 0x0d, + 0x86, 0xeb, 0x68, 0x82, 0x1d, 0x62, 0xb8, 0x8e, 0xf5, 0x1b, 0x82, 0x4e, 0x9e, 0xdf, 0x5d, 0xd8, + 0x0c, 0x39, 0x5b, 0xce, 0xe2, 0xb0, 0x0e, 0x49, 0x76, 0x78, 0x0f, 0xb6, 0xdc, 0x94, 0x77, 0x9c, + 0x5c, 0xb6, 0xc7, 0x18, 0x5a, 0x0e, 0x95, 0x34, 0xc9, 0x47, 0xaf, 0xf1, 0x10, 0xb0, 0xbd, 0xe0, + 0x9c, 0xf9, 0x92, 0x30, 0xea, 0x9c, 0xb0, 0x68, 0x4a, 0xc5, 0xa5, 0x4e, 0xa2, 0x45, 0x56, 0x78, + 0x94, 0x7a, 0xd2, 0xf5, 0x98, 0x90, 0xd4, 0x0b, 0xcd, 0x8d, 0x7d, 0x74, 0xd0, 0x24, 0xb9, 0xc1, + 0xfa, 0xc9, 0x80, 0xb6, 0xe2, 0x18, 0x04, 0xb2, 0xc4, 0x04, 0x55, 0x98, 0x7c, 0x00, 0x77, 0x98, + 0x6f, 0xf3, 0x28, 0x94, 0x6e, 0xe0, 0x9f, 0xb0, 0x94, 0x6a, 0xd9, 0xa8, 0xb4, 0xd1, 0x9d, 0x31, + 0x73, 0x34, 0xe5, 0x0e, 0x49, 0xb7, 0xaa, 0x4a, 0x09, 0x94, 0x39, 0x09, 0xbb, 0x44, 0xf8, 0x9a, + 0x5d, 0x61, 0x1d, 0xc6, 0xdd, 0x25, 0x55, 0xc7, 0x9e, 0xd9, 0x97, 0xcc, 0x63, 0x9a, 0x78, 0x87, + 0xd4, 0xec, 0x37, 0xa8, 0xb1, 0xf9, 0x7a, 0x6a, 0xb4, 0xab, 0x6a, 0xfc, 0x65, 0xc0, 0xce, 0x78, + 0x72, 0x3a, 0x09, 0x7c, 0xc9, 0x7c, 0xf9, 0x0d, 0x9d, 0x2f, 0x18, 0xfe, 0x08, 0xda, 0x0b, 0xc1, + 0xf8, 0xd8, 0x89, 0x0b, 0xd7, 0x1d, 0xbd, 0x37, 0xcc, 0xdb, 0x7a, 0x3c, 0x39, 0xfd, 0x3a, 0x76, + 0x4e, 0x1b, 0x24, 0xc5, 0xe1, 0x63, 0x00, 0xb5, 0x24, 0xcc, 0x0b, 0x96, 0x71, 0xc7, 0x76, 0x47, + 0x66, 0x3d, 0x2a, 0xf6, 0x4f, 0x1b, 0xa4, 0x80, 0xc6, 0xdf, 0xc2, 0xbb, 0x6a, 0xf7, 0x9c, 0x71, + 0xcf, 0x15, 0xc2, 0x0d, 0xfc, 0xc9, 0x25, 0xf5, 0x2f, 0x98, 0xd6, 0xb3, 0x3b, 0xb2, 0xea, 0xa7, + 0x54, 0x91, 0xd3, 0x06, 0x59, 0x79, 0x42, 0xca, 0x6a, 0xe6, 0x2f, 0x5d, 0x19, 0x77, 0xfd, 0x4a, + 0x56, 0xb1, 0x3f, 0x65, 0x15, 0xef, 0xf0, 0x27, 0xb0, 0xa5, 0x76, 0xcf, 0x02, 0xd7, 0xd7, 0xa5, + 0xe8, 0x8e, 0xee, 0xd6, 0x23, 0x95, 0x77, 0xda, 0x20, 0x19, 0xf2, 0x49, 0x1b, 0x36, 0x96, 0x4a, + 0x43, 0xeb, 0xa9, 0x6e, 0xb2, 0xcf, 0x55, 0xfb, 0x1e, 0x03, 0x50, 0x7b, 0x9e, 0x28, 0x6c, 0xa2, + 0xfd, 0xe6, 0x41, 0x77, 0xb4, 0x57, 0x3e, 0xab, 0x28, 0x3f, 0x29, 0xa0, 0xad, 0xff, 0x10, 0x6c, + 0x8d, 0x27, 0xa7, 0x67, 0x92, 0x4a, 0xa6, 0x3a, 0x92, 0xe7, 0x85, 0x65, 0x42, 0x9f, 0xd5, 0x22, + 0x65, 0x23, 0x3e, 0x8a, 0x93, 0xd6, 0x21, 0xc2, 0x34, 0xf4, 0xbf, 0xbb, 0x57, 0xa7, 0xae, 0xfd, + 0xa4, 0x00, 0xc5, 0xc7, 0xd0, 0x76, 0x75, 0xee, 0xc2, 0x6c, 0xea, 0xa8, 0xfd, 0x72, 0x94, 0x86, + 0x0d, 0x63, 0x79, 0xc4, 0x53, 0x5f, 0xf2, 0x88, 0xa4, 0x01, 0x7b, 0x5f, 0x41, 0xaf, 0xe8, 0xc0, + 0x7d, 0x68, 0x7e, 0xcf, 0xa2, 0xe4, 0xde, 0xab, 0x25, 0x1e, 0x26, 0xca, 0xdc, 0xdc, 0x1c, 0xf1, + 0x01, 0x24, 0x86, 0x1d, 0x1b, 0x8f, 0x90, 0xf5, 0x0b, 0x82, 0x5e, 0x91, 0xee, 0x1a, 0xee, 0xeb, + 0x63, 0xe8, 0x86, 0x59, 0x9b, 0x08, 0xdd, 0x63, 0xdb, 0xa3, 0xf7, 0x6f, 0xeb, 0x31, 0x41, 0x8a, + 0x11, 0xd6, 0xef, 0x08, 0x20, 0xbf, 0x03, 0x6b, 0x60, 0xf4, 0x10, 0x76, 0xab, 0xf3, 0x20, 0x2e, + 0x40, 0x8f, 0xd4, 0x1d, 0x55, 0xfe, 0xad, 0x37, 0xe6, 0xff, 0x37, 0x82, 0x3b, 0x25, 0xc1, 0xf1, + 0x01, 0xec, 0xc4, 0x2f, 0xc1, 0xf3, 0xc5, 0xf9, 0xdc, 0xb5, 0x4f, 0x58, 0x9a, 0x49, 0xd5, 0x5c, + 0xa0, 0x7a, 0x16, 0x79, 0xe9, 0xe4, 0x31, 0xf4, 0xe4, 0xa9, 0x3b, 0xde, 0x76, 0x62, 0x7f, 0x22, + 0xe8, 0x16, 0xae, 0xe5, 0x1a, 0x2a, 0x93, 0x09, 0x93, 0xbf, 0x9c, 0xcd, 0xa2, 0x30, 0x99, 0x19, + 0x5b, 0xd0, 0xcb, 0xb4, 0xca, 0xe7, 0x7c, 0xc9, 0xb6, 0x5a, 0x8e, 0x8d, 0x1b, 0xe4, 0xb0, 0x44, + 0x56, 0xa5, 0x64, 0x4a, 0xde, 0x96, 0xce, 0x17, 0xb0, 0x93, 0xcc, 0x00, 0xc2, 0xc2, 0x39, 0xb5, + 0xb3, 0x7b, 0x7f, 0xbf, 0xac, 0x1f, 0x29, 0x81, 0x48, 0x35, 0xc8, 0xfa, 0x11, 0xc1, 0x6e, 0x0d, + 0xb6, 0x06, 0x21, 0x57, 0x3d, 0x85, 0xcd, 0xd5, 0x4f, 0xa1, 0xb5, 0x84, 0x7b, 0x37, 0x8c, 0xf9, + 0x5b, 0x89, 0x54, 0xda, 0xc7, 0x78, 0xe3, 0xf6, 0x79, 0x06, 0xdb, 0x6a, 0xc6, 0x45, 0xbe, 0xfd, + 0x25, 0x13, 0x82, 0x5e, 0x30, 0xfc, 0x08, 0xda, 0x76, 0x32, 0xb4, 0xe3, 0x99, 0x35, 0xa8, 0xcc, + 0xc3, 0xc8, 0xb7, 0x4b, 0x83, 0x3b, 0x85, 0x5b, 0x2f, 0xe1, 0x9d, 0x15, 0x7e, 0xfd, 0x10, 0x38, + 0x4e, 0xfc, 0x71, 0x24, 0x92, 0xa7, 0xb5, 0x32, 0x07, 0xc7, 0x99, 0x5f, 0x3d, 0x47, 0x39, 0x3a, + 0x7f, 0x58, 0xa6, 0xba, 0x31, 0x72, 0x1c, 0x3e, 0x82, 0x36, 0xcf, 0x8e, 0x54, 0x45, 0x2f, 0x66, + 0x5d, 0xff, 0x9a, 0x23, 0x29, 0xfa, 0xc1, 0x11, 0xe0, 0xba, 0x28, 0xb8, 0x03, 0x1b, 0x63, 0xc7, + 0x73, 0xfd, 0x7e, 0x03, 0x03, 0x6c, 0xbe, 0xe0, 0xae, 0x64, 0xbc, 0x8f, 0xd4, 0x5a, 0x55, 0x88, + 0xf1, 0xbe, 0xf1, 0xe4, 0xf1, 0x1f, 0x57, 0x03, 0xf4, 0xea, 0x6a, 0x80, 0xfe, 0xbd, 0x1a, 0xa0, + 0x9f, 0xaf, 0x07, 0x8d, 0x57, 0xd7, 0x83, 0xc6, 0x3f, 0xd7, 0x83, 0xc6, 0xcb, 0x0f, 0x5f, 0xeb, + 0x5b, 0xf9, 0x7c, 0x53, 0xff, 0xf9, 0xf8, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x03, 0x77, + 0x62, 0x5b, 0x0b, 0x00, 0x00, } func (m *RawACLRecord) Marshal() (dAtA []byte, err error) { diff --git a/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto b/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto index 51f74853..2eff7074 100644 --- a/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto +++ b/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package aclrecord; -option go_package = "pkg/acl/aclrecordproto"; +option go_package = "commonspace/object/acl/aclrecordproto"; message RawACLRecord { bytes payload = 1; diff --git a/common/commonspace/object/tree/treechangeproto/protos/treechange.proto b/common/commonspace/object/tree/treechangeproto/protos/treechange.proto index 3a55e031..9bc47b0a 100644 --- a/common/commonspace/object/tree/treechangeproto/protos/treechange.proto +++ b/common/commonspace/object/tree/treechangeproto/protos/treechange.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package treechange; -option go_package = "pkg/acl/treechangeproto"; +option go_package = "commonspace/object/tree/treechangeproto"; // RootChange is a root of a tree message RootChange { diff --git a/common/commonspace/object/tree/treechangeproto/treechange.pb.go b/common/commonspace/object/tree/treechangeproto/treechange.pb.go index 0c97164b..caf98ad2 100644 --- a/common/commonspace/object/tree/treechangeproto/treechange.pb.go +++ b/common/commonspace/object/tree/treechangeproto/treechange.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/acl/treechangeproto/protos/treechange.proto +// source: commonspace/object/tree/treechangeproto/protos/treechange.proto package treechangeproto @@ -42,7 +42,7 @@ func (m *RootChange) Reset() { *m = RootChange{} } func (m *RootChange) String() string { return proto.CompactTextString(m) } func (*RootChange) ProtoMessage() {} func (*RootChange) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{0} + return fileDescriptor_5033f0301ef9b772, []int{0} } func (m *RootChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -137,7 +137,7 @@ func (m *TreeChange) Reset() { *m = TreeChange{} } func (m *TreeChange) String() string { return proto.CompactTextString(m) } func (*TreeChange) ProtoMessage() {} func (*TreeChange) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{1} + return fileDescriptor_5033f0301ef9b772, []int{1} } func (m *TreeChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,7 +234,7 @@ func (m *RawTreeChange) Reset() { *m = RawTreeChange{} } func (m *RawTreeChange) String() string { return proto.CompactTextString(m) } func (*RawTreeChange) ProtoMessage() {} func (*RawTreeChange) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{2} + return fileDescriptor_5033f0301ef9b772, []int{2} } func (m *RawTreeChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +289,7 @@ func (m *RawTreeChangeWithId) Reset() { *m = RawTreeChangeWithId{} } func (m *RawTreeChangeWithId) String() string { return proto.CompactTextString(m) } func (*RawTreeChangeWithId) ProtoMessage() {} func (*RawTreeChangeWithId) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{3} + return fileDescriptor_5033f0301ef9b772, []int{3} } func (m *RawTreeChangeWithId) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -341,7 +341,7 @@ func (m *TreeSyncMessage) Reset() { *m = TreeSyncMessage{} } func (m *TreeSyncMessage) String() string { return proto.CompactTextString(m) } func (*TreeSyncMessage) ProtoMessage() {} func (*TreeSyncMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{4} + return fileDescriptor_5033f0301ef9b772, []int{4} } func (m *TreeSyncMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -399,7 +399,7 @@ func (m *TreeSyncContentValue) Reset() { *m = TreeSyncContentValue{} } func (m *TreeSyncContentValue) String() string { return proto.CompactTextString(m) } func (*TreeSyncContentValue) ProtoMessage() {} func (*TreeSyncContentValue) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{5} + return fileDescriptor_5033f0301ef9b772, []int{5} } func (m *TreeSyncContentValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -508,7 +508,7 @@ func (m *TreeHeadUpdate) Reset() { *m = TreeHeadUpdate{} } func (m *TreeHeadUpdate) String() string { return proto.CompactTextString(m) } func (*TreeHeadUpdate) ProtoMessage() {} func (*TreeHeadUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{6} + return fileDescriptor_5033f0301ef9b772, []int{6} } func (m *TreeHeadUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -569,7 +569,7 @@ func (m *TreeFullSyncRequest) Reset() { *m = TreeFullSyncRequest{} } func (m *TreeFullSyncRequest) String() string { return proto.CompactTextString(m) } func (*TreeFullSyncRequest) ProtoMessage() {} func (*TreeFullSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{7} + return fileDescriptor_5033f0301ef9b772, []int{7} } func (m *TreeFullSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -630,7 +630,7 @@ func (m *TreeFullSyncResponse) Reset() { *m = TreeFullSyncResponse{} } func (m *TreeFullSyncResponse) String() string { return proto.CompactTextString(m) } func (*TreeFullSyncResponse) ProtoMessage() {} func (*TreeFullSyncResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{8} + return fileDescriptor_5033f0301ef9b772, []int{8} } func (m *TreeFullSyncResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -689,7 +689,7 @@ func (m *TreeErrorResponse) Reset() { *m = TreeErrorResponse{} } func (m *TreeErrorResponse) String() string { return proto.CompactTextString(m) } func (*TreeErrorResponse) ProtoMessage() {} func (*TreeErrorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_f177d8514fae978f, []int{9} + return fileDescriptor_5033f0301ef9b772, []int{9} } func (m *TreeErrorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -739,52 +739,52 @@ func init() { } func init() { - proto.RegisterFile("pkg/acl/treechangeproto/protos/treechange.proto", fileDescriptor_f177d8514fae978f) + proto.RegisterFile("commonspace/object/tree/treechangeproto/protos/treechange.proto", fileDescriptor_5033f0301ef9b772) } -var fileDescriptor_f177d8514fae978f = []byte{ - // 647 bytes of a gzipped FileDescriptorProto +var fileDescriptor_5033f0301ef9b772 = []byte{ + // 656 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xf5, 0x3a, 0x69, 0xd3, 0x4e, 0xd3, 0x16, 0xb6, 0x95, 0xb0, 0x2a, 0x30, 0x96, 0x0f, 0x28, - 0x5c, 0x1a, 0x51, 0x4e, 0x20, 0x24, 0xa4, 0x96, 0x16, 0x57, 0x15, 0x08, 0x6d, 0x0b, 0x48, 0xdc, - 0x16, 0x7b, 0x48, 0x2c, 0x52, 0xdb, 0x78, 0x37, 0x54, 0xf9, 0x00, 0x2e, 0x20, 0x21, 0x3e, 0x81, + 0x10, 0xf5, 0x3a, 0x69, 0xd3, 0x4e, 0xd3, 0x16, 0xb6, 0x3d, 0x58, 0x15, 0x18, 0xcb, 0x07, 0x08, + 0x97, 0x56, 0x2a, 0x27, 0x10, 0x52, 0x45, 0x4b, 0x8b, 0xab, 0x0a, 0x84, 0xb6, 0x05, 0x24, 0x6e, + 0x5b, 0x7b, 0x68, 0x8c, 0x12, 0xdb, 0x78, 0x37, 0x54, 0xf9, 0x00, 0x2e, 0x20, 0x21, 0x3e, 0x81, 0x6f, 0xe0, 0x0f, 0xb8, 0x71, 0xec, 0x91, 0x23, 0x6a, 0x7e, 0x04, 0xed, 0x3a, 0x4e, 0xd6, 0x6e, - 0x90, 0xb8, 0xf5, 0x92, 0x78, 0xde, 0xce, 0xbc, 0x7d, 0xf3, 0x66, 0xd7, 0x86, 0x6e, 0xf6, 0xbe, - 0xd7, 0xe5, 0xe1, 0xa0, 0x2b, 0x73, 0xc4, 0xb0, 0xcf, 0x93, 0x1e, 0x66, 0x79, 0x2a, 0xd3, 0xae, - 0xfe, 0x15, 0x06, 0xbc, 0xad, 0x11, 0x0a, 0x33, 0xc4, 0xff, 0x41, 0x00, 0x58, 0x9a, 0xca, 0x3d, - 0x1d, 0xd2, 0x9b, 0xb0, 0xcc, 0xc3, 0x41, 0x80, 0x3c, 0x3a, 0x8c, 0x1c, 0xe2, 0x91, 0xce, 0x32, - 0x9b, 0x01, 0xd4, 0x81, 0x96, 0xc8, 0x78, 0x88, 0x87, 0x91, 0x63, 0xeb, 0xb5, 0x32, 0xa4, 0x2e, - 0x40, 0x41, 0x78, 0x32, 0xca, 0xd0, 0x69, 0xe8, 0x45, 0x03, 0x51, 0xbc, 0x32, 0x3e, 0x45, 0x21, - 0xf9, 0x69, 0xe6, 0x34, 0x3d, 0xd2, 0x69, 0xb0, 0x19, 0x40, 0x29, 0x34, 0x05, 0x62, 0xe4, 0x2c, - 0x78, 0xa4, 0xd3, 0x66, 0xfa, 0x99, 0x6e, 0xc1, 0x52, 0x1c, 0x61, 0x22, 0x63, 0x39, 0x72, 0x16, - 0x35, 0x3e, 0x8d, 0xfd, 0xef, 0x36, 0xc0, 0x49, 0x8e, 0x38, 0x11, 0xed, 0xc1, 0x8a, 0xea, 0xa8, - 0x10, 0x29, 0x1c, 0xe2, 0x35, 0x3a, 0xcb, 0xcc, 0x84, 0xaa, 0x6d, 0xd9, 0xf5, 0xb6, 0xee, 0xc0, - 0x9a, 0x48, 0x78, 0x26, 0xfa, 0xa9, 0xdc, 0xe5, 0x42, 0x75, 0x57, 0x34, 0x50, 0x43, 0xd5, 0x3e, - 0x45, 0x4b, 0xe2, 0x09, 0x97, 0x5c, 0xb7, 0xd1, 0x66, 0x26, 0x44, 0xb7, 0x81, 0x86, 0xc3, 0x3c, - 0xc7, 0x44, 0x32, 0xe4, 0xd1, 0x11, 0x8e, 0x02, 0x2e, 0xfa, 0xba, 0xad, 0x26, 0x9b, 0xb3, 0x52, - 0xb5, 0x65, 0xb1, 0x6e, 0x8b, 0x69, 0x41, 0xab, 0x6a, 0x81, 0x32, 0x3c, 0x16, 0xc7, 0x13, 0x7d, - 0xce, 0x92, 0x47, 0x3a, 0x4b, 0xcc, 0x40, 0xfc, 0xa7, 0xb0, 0xca, 0xf8, 0x99, 0x61, 0x92, 0x03, - 0xad, 0x8c, 0x8f, 0x06, 0x29, 0x2f, 0xe6, 0xda, 0x66, 0x65, 0xa8, 0x44, 0x88, 0xb8, 0x97, 0x70, - 0x39, 0xcc, 0x51, 0x9b, 0xd3, 0x66, 0x33, 0xc0, 0xdf, 0x83, 0x8d, 0x0a, 0xd1, 0xeb, 0x58, 0xf6, - 0x0f, 0x75, 0x51, 0xce, 0xcf, 0x0a, 0x68, 0x42, 0x38, 0x03, 0xe8, 0x1a, 0xd8, 0x71, 0x69, 0xb4, - 0x1d, 0x47, 0xfe, 0x57, 0x02, 0xeb, 0x8a, 0xe2, 0x78, 0x94, 0x84, 0xcf, 0x50, 0x08, 0xde, 0x43, - 0xfa, 0x10, 0x5a, 0x61, 0x9a, 0x48, 0x4c, 0xa4, 0xae, 0x5f, 0xd9, 0xf1, 0xb6, 0x8d, 0x93, 0x5a, - 0x66, 0xef, 0x15, 0x29, 0xaf, 0xf8, 0x60, 0x88, 0xac, 0x2c, 0xa0, 0x8f, 0x01, 0xf2, 0xe9, 0xa1, - 0xd5, 0xfb, 0xac, 0xec, 0xdc, 0x36, 0xcb, 0xe7, 0x48, 0x66, 0x46, 0x89, 0xff, 0xd3, 0x86, 0xcd, - 0x79, 0x5b, 0xd0, 0x47, 0x00, 0x7d, 0xe4, 0xd1, 0xcb, 0x2c, 0xe2, 0x12, 0x27, 0xc2, 0xb6, 0xea, - 0xc2, 0x82, 0x69, 0x46, 0x60, 0x31, 0x23, 0x9f, 0x1e, 0xc1, 0xfa, 0xbb, 0xe1, 0x60, 0xa0, 0x58, - 0x19, 0x7e, 0x18, 0xa2, 0x90, 0xf3, 0xc4, 0x29, 0x8a, 0x83, 0x6a, 0x5a, 0x60, 0xb1, 0x7a, 0x25, - 0x7d, 0x0e, 0xd7, 0x66, 0x90, 0xc8, 0xd2, 0x44, 0x14, 0x37, 0x6b, 0x8e, 0x53, 0x07, 0xb5, 0xbc, - 0xc0, 0x62, 0x97, 0x6a, 0xe9, 0x3e, 0xac, 0x62, 0x9e, 0xa7, 0xf9, 0x94, 0xac, 0xa9, 0xc9, 0x6e, - 0xd5, 0xc9, 0xf6, 0xcd, 0xa4, 0xc0, 0x62, 0xd5, 0xaa, 0xdd, 0x16, 0x2c, 0x7c, 0x54, 0x56, 0xf9, - 0x9f, 0x08, 0xac, 0x55, 0xdd, 0xa0, 0x9b, 0xb0, 0xa0, 0xdc, 0x28, 0xef, 0x60, 0x11, 0xd0, 0x07, - 0xd0, 0x9a, 0x5c, 0x12, 0xc7, 0xf6, 0x1a, 0xff, 0x33, 0xaa, 0x32, 0x9f, 0xfa, 0xd0, 0x2e, 0x2f, - 0xe1, 0x0b, 0x2e, 0xfb, 0x4e, 0x43, 0xf3, 0x56, 0x30, 0xff, 0x33, 0x81, 0x8d, 0x39, 0x96, 0x5e, - 0x8d, 0x98, 0x2f, 0xa4, 0x38, 0x58, 0xf5, 0x89, 0x5c, 0x8d, 0x9a, 0xbb, 0x70, 0xfd, 0xd2, 0x44, - 0x95, 0x12, 0x3d, 0xd1, 0xc9, 0xfb, 0xbd, 0x08, 0x76, 0xef, 0xfd, 0xba, 0x70, 0xc9, 0xf9, 0x85, - 0x4b, 0xfe, 0x5c, 0xb8, 0xe4, 0xdb, 0xd8, 0xb5, 0xce, 0xc7, 0xae, 0xf5, 0x7b, 0xec, 0x5a, 0x6f, - 0x6e, 0xfc, 0xe3, 0xfb, 0xf2, 0x76, 0x51, 0xff, 0xdd, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xca, - 0xe3, 0xc1, 0xeb, 0x81, 0x06, 0x00, 0x00, + 0x0e, 0xbd, 0xf5, 0xb2, 0xc9, 0xbc, 0x9d, 0x79, 0xfb, 0xe6, 0xcd, 0x6e, 0x02, 0x3b, 0x61, 0xda, + 0xef, 0xa7, 0x89, 0xc8, 0x78, 0x88, 0x5b, 0xe9, 0xe9, 0x47, 0x0c, 0xe5, 0x96, 0xcc, 0x11, 0xf5, + 0x12, 0x76, 0x79, 0x72, 0x86, 0x59, 0x9e, 0xca, 0x74, 0x4b, 0xaf, 0xc2, 0x80, 0x37, 0x35, 0x42, + 0x61, 0x8a, 0xf8, 0xbf, 0x08, 0x00, 0x4b, 0x53, 0xb9, 0xa7, 0x43, 0x7a, 0x07, 0x16, 0x79, 0xd8, + 0x0b, 0x90, 0x47, 0x87, 0x91, 0x43, 0x3c, 0xd2, 0x59, 0x64, 0x53, 0x80, 0x3a, 0xd0, 0xd2, 0xa7, + 0x1e, 0x46, 0x8e, 0xad, 0xf7, 0xca, 0x90, 0xba, 0x00, 0x05, 0xe1, 0xc9, 0x30, 0x43, 0xa7, 0xa1, + 0x37, 0x0d, 0x44, 0xf1, 0xca, 0xb8, 0x8f, 0x42, 0xf2, 0x7e, 0xe6, 0x34, 0x3d, 0xd2, 0x69, 0xb0, + 0x29, 0x40, 0x29, 0x34, 0x05, 0x62, 0xe4, 0xcc, 0x79, 0xa4, 0xd3, 0x66, 0xfa, 0x3b, 0xdd, 0x80, + 0x85, 0x38, 0xc2, 0x44, 0xc6, 0x72, 0xe8, 0xcc, 0x6b, 0x7c, 0x12, 0xfb, 0x3f, 0x6d, 0x80, 0x93, + 0x1c, 0x71, 0x2c, 0xda, 0x83, 0x25, 0xd5, 0x51, 0x21, 0x52, 0x38, 0xc4, 0x6b, 0x74, 0x16, 0x99, + 0x09, 0x55, 0xdb, 0xb2, 0xeb, 0x6d, 0xdd, 0x87, 0x15, 0x91, 0xf0, 0x4c, 0x74, 0x53, 0xb9, 0xcb, + 0x85, 0xea, 0xae, 0x68, 0xa0, 0x86, 0xaa, 0x73, 0x8a, 0x96, 0xc4, 0x73, 0x2e, 0xb9, 0x6e, 0xa3, + 0xcd, 0x4c, 0x88, 0x6e, 0x02, 0x0d, 0x07, 0x79, 0x8e, 0x89, 0x64, 0xc8, 0xa3, 0x23, 0x1c, 0x06, + 0x5c, 0x74, 0x75, 0x5b, 0x4d, 0x36, 0x63, 0xa7, 0x6a, 0xcb, 0x7c, 0xdd, 0x16, 0xd3, 0x82, 0x56, + 0xd5, 0x02, 0x65, 0x78, 0x2c, 0x8e, 0xc7, 0xfa, 0x9c, 0x05, 0x8f, 0x74, 0x16, 0x98, 0x81, 0xf8, + 0x2f, 0x60, 0x99, 0xf1, 0x73, 0xc3, 0x24, 0x07, 0x5a, 0x19, 0x1f, 0xf6, 0x52, 0x5e, 0xcc, 0xb5, + 0xcd, 0xca, 0x50, 0x89, 0x10, 0xf1, 0x59, 0xc2, 0xe5, 0x20, 0x47, 0x6d, 0x4e, 0x9b, 0x4d, 0x01, + 0x7f, 0x0f, 0xd6, 0x2a, 0x44, 0xef, 0x62, 0xd9, 0x3d, 0xd4, 0x45, 0x39, 0x3f, 0x2f, 0xa0, 0x31, + 0xe1, 0x14, 0xa0, 0x2b, 0x60, 0xc7, 0xa5, 0xd1, 0x76, 0x1c, 0xf9, 0xdf, 0x09, 0xac, 0x2a, 0x8a, + 0xe3, 0x61, 0x12, 0xbe, 0x44, 0x21, 0xf8, 0x19, 0xd2, 0x27, 0xd0, 0x0a, 0xd3, 0x44, 0x62, 0x22, + 0x75, 0xfd, 0xd2, 0xb6, 0xb7, 0x69, 0xdc, 0xd4, 0x32, 0x7b, 0xaf, 0x48, 0x79, 0xcb, 0x7b, 0x03, + 0x64, 0x65, 0x01, 0xdd, 0x01, 0xc8, 0x27, 0x97, 0x56, 0x9f, 0xb3, 0xb4, 0x7d, 0xcf, 0x2c, 0x9f, + 0x21, 0x99, 0x19, 0x25, 0xfe, 0x6f, 0x1b, 0xd6, 0x67, 0x1d, 0x41, 0x9f, 0x02, 0x74, 0x91, 0x47, + 0x6f, 0xb2, 0x88, 0x4b, 0x1c, 0x0b, 0xdb, 0xa8, 0x0b, 0x0b, 0x26, 0x19, 0x81, 0xc5, 0x8c, 0x7c, + 0x7a, 0x04, 0xab, 0x1f, 0x06, 0xbd, 0x9e, 0x62, 0x65, 0xf8, 0x69, 0x80, 0x42, 0xce, 0x12, 0xa7, + 0x28, 0x0e, 0xaa, 0x69, 0x81, 0xc5, 0xea, 0x95, 0xf4, 0x15, 0xdc, 0x9a, 0x42, 0x22, 0x4b, 0x13, + 0x51, 0xbc, 0xac, 0x19, 0x4e, 0x1d, 0xd4, 0xf2, 0x02, 0x8b, 0x5d, 0xa9, 0xa5, 0xfb, 0xb0, 0x8c, + 0x79, 0x9e, 0xe6, 0x13, 0xb2, 0xa6, 0x26, 0xbb, 0x5b, 0x27, 0xdb, 0x37, 0x93, 0x02, 0x8b, 0x55, + 0xab, 0x76, 0x5b, 0x30, 0xf7, 0x59, 0x59, 0xe5, 0x7f, 0x21, 0xb0, 0x52, 0x75, 0x83, 0xae, 0xc3, + 0x9c, 0x72, 0xa3, 0x7c, 0x83, 0x45, 0x40, 0x1f, 0x43, 0x6b, 0xfc, 0x48, 0x1c, 0xdb, 0x6b, 0x5c, + 0x67, 0x54, 0x65, 0x3e, 0xf5, 0xa1, 0x5d, 0x3e, 0xc2, 0xd7, 0x5c, 0x76, 0x9d, 0x86, 0xe6, 0xad, + 0x60, 0xfe, 0x57, 0x02, 0x6b, 0x33, 0x2c, 0xbd, 0x19, 0x31, 0xdf, 0x48, 0x71, 0xb1, 0xea, 0x13, + 0xb9, 0x19, 0x35, 0x0f, 0xe1, 0xf6, 0x95, 0x89, 0x2a, 0x25, 0x7a, 0xa2, 0xe3, 0xdf, 0xf7, 0x22, + 0xd8, 0x7d, 0xf6, 0xe7, 0xd2, 0x25, 0x17, 0x97, 0x2e, 0xf9, 0x77, 0xe9, 0x92, 0x1f, 0x23, 0xd7, + 0xba, 0x18, 0xb9, 0xd6, 0xdf, 0x91, 0x6b, 0xbd, 0x7f, 0x70, 0xcd, 0xff, 0x9b, 0xd3, 0x79, 0xfd, + 0xf1, 0xe8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xa5, 0xe2, 0x7c, 0xa1, 0x06, 0x00, 0x00, } func (m *RootChange) Marshal() (dAtA []byte, err error) { diff --git a/common/commonspace/objectsync/objectsync.go b/common/commonspace/objectsync/objectsync.go index 8b821193..5efbba5b 100644 --- a/common/commonspace/objectsync/objectsync.go +++ b/common/commonspace/objectsync/objectsync.go @@ -47,7 +47,7 @@ func NewObjectSync( streamPool := newStreamPool(func(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { return objectSync.HandleMessage(ctx, senderId, message) }) - clientFactory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceClient) + clientFactory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceSyncClient) syncLog := log.With(zap.String("id", spaceId)) syncCtx, cancel := context.WithCancel(context.Background()) checker := NewStreamChecker( diff --git a/common/commonspace/objectsync/streamchecker.go b/common/commonspace/objectsync/streamchecker.go index 6d199676..16d00f5c 100644 --- a/common/commonspace/objectsync/streamchecker.go +++ b/common/commonspace/objectsync/streamchecker.go @@ -110,7 +110,7 @@ func (s *streamChecker) CheckPeerConnection(peerId string) (err error) { } func (s *streamChecker) createStream(p peer.Peer) (err error) { - stream, err := s.clientFactory.Client(p).Stream(s.syncCtx) + stream, err := s.clientFactory.Client(p).ObjectSyncStream(s.syncCtx) if err != nil { // so here probably the request is failed because there is no such space, // but diffService should handle such cases by sending pushSpace diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index accda6fc..c9b45630 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -24,8 +24,8 @@ var ErrSyncTimeout = errors.New("too long wait on sync receive") // StreamPool can be made generic to work with different streams type StreamPool interface { ocache.ObjectLastUsage - AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (err error) - AddAndReadStreamAsync(stream spacesyncproto.SpaceStream) (err error) + AddAndReadStreamSync(stream spacesyncproto.ObjectSyncStream) (err error) + AddAndReadStreamAsync(stream spacesyncproto.ObjectSyncStream) (err error) SendSync(peerId string, message *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error) @@ -43,7 +43,7 @@ type responseWaiter struct { type streamPool struct { sync.Mutex - peerStreams map[string]spacesyncproto.SpaceStream + peerStreams map[string]spacesyncproto.ObjectSyncStream messageHandler MessageHandler wg *sync.WaitGroup waiters map[string]responseWaiter @@ -54,7 +54,7 @@ type streamPool struct { func newStreamPool(messageHandler MessageHandler) StreamPool { s := &streamPool{ - peerStreams: make(map[string]spacesyncproto.SpaceStream), + peerStreams: make(map[string]spacesyncproto.ObjectSyncStream), messageHandler: messageHandler, waiters: make(map[string]responseWaiter), wg: &sync.WaitGroup{}, @@ -110,7 +110,7 @@ func (s *streamPool) SendSync( func (s *streamPool) SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error) { s.lastUsage.Store(time.Now().Unix()) - getStreams := func() (streams []spacesyncproto.SpaceStream) { + getStreams := func() (streams []spacesyncproto.ObjectSyncStream) { for _, pId := range peers { stream, err := s.getOrDeleteStream(pId) if err != nil { @@ -139,7 +139,7 @@ func (s *streamPool) SendAsync(peers []string, message *spacesyncproto.ObjectSyn return err } -func (s *streamPool) getOrDeleteStream(id string) (stream spacesyncproto.SpaceStream, err error) { +func (s *streamPool) getOrDeleteStream(id string) (stream spacesyncproto.ObjectSyncStream, err error) { stream, exists := s.peerStreams[id] if !exists { err = ErrEmptyPeer @@ -156,7 +156,7 @@ func (s *streamPool) getOrDeleteStream(id string) (stream spacesyncproto.SpaceSt return } -func (s *streamPool) getAllStreams() (streams []spacesyncproto.SpaceStream) { +func (s *streamPool) getAllStreams() (streams []spacesyncproto.ObjectSyncStream) { s.Lock() defer s.Unlock() Loop: @@ -188,7 +188,7 @@ func (s *streamPool) BroadcastAsync(message *spacesyncproto.ObjectSyncMessage) ( return nil } -func (s *streamPool) AddAndReadStreamAsync(stream spacesyncproto.SpaceStream) (err error) { +func (s *streamPool) AddAndReadStreamAsync(stream spacesyncproto.ObjectSyncStream) (err error) { peerId, err := s.addStream(stream) if err != nil { return @@ -197,7 +197,7 @@ func (s *streamPool) AddAndReadStreamAsync(stream spacesyncproto.SpaceStream) (e return } -func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (err error) { +func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.ObjectSyncStream) (err error) { peerId, err := s.addStream(stream) if err != nil { return @@ -205,7 +205,7 @@ func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (er return s.readPeerLoop(peerId, stream) } -func (s *streamPool) addStream(stream spacesyncproto.SpaceStream) (peerId string, err error) { +func (s *streamPool) addStream(stream spacesyncproto.ObjectSyncStream) (peerId string, err error) { s.Lock() peerId, err = peer.CtxPeerId(stream.Context()) if err != nil { @@ -245,7 +245,7 @@ func (s *streamPool) Close() (err error) { return nil } -func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.SpaceStream) (err error) { +func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { log.With(zap.String("replyId", peerId)).Debug("reading stream from peer") defer s.wg.Done() limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) @@ -301,7 +301,7 @@ Loop: return } -func (s *streamPool) removePeer(peerId string, stream spacesyncproto.SpaceStream) (err error) { +func (s *streamPool) removePeer(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { s.Lock() defer s.Unlock() mapStream, ok := s.peerStreams[peerId] diff --git a/common/commonspace/objectsync/streampool_test.go b/common/commonspace/objectsync/streampool_test.go index bf32bbf9..7fe34317 100644 --- a/common/commonspace/objectsync/streampool_test.go +++ b/common/commonspace/objectsync/streampool_test.go @@ -12,7 +12,7 @@ import ( ) type testServer struct { - stream chan spacesyncproto.DRPCSpace_StreamStream + stream chan spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream addLog func(ctx context.Context, req *consensusproto.AddLogRequest) error addRecord func(ctx context.Context, req *consensusproto.AddRecordRequest) error releaseStream chan error @@ -23,20 +23,20 @@ func (t *testServer) HeadSync(ctx context.Context, request *spacesyncproto.HeadS panic("implement me") } -func (t *testServer) PushSpace(ctx context.Context, request *spacesyncproto.PushSpaceRequest) (*spacesyncproto.PushSpaceResponse, error) { +func (t *testServer) SpacePush(ctx context.Context, request *spacesyncproto.SpacePushRequest) (*spacesyncproto.SpacePushResponse, error) { panic("implement me") } -func (t *testServer) PullSpace(ctx context.Context, request *spacesyncproto.PullSpaceRequest) (*spacesyncproto.PullSpaceResponse, error) { +func (t *testServer) SpacePull(ctx context.Context, request *spacesyncproto.SpacePullRequest) (*spacesyncproto.SpacePullResponse, error) { panic("implement me") } -func (t *testServer) Stream(stream spacesyncproto.DRPCSpace_StreamStream) error { +func (t *testServer) ObjectSyncStream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { t.stream <- stream return <-t.releaseStream } -func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpace_StreamStream { +func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream { select { case <-time.After(time.Second * 5): test.Fatalf("waiteStream timeout") @@ -49,9 +49,9 @@ func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpace_Stream type fixture struct { testServer *testServer drpcTS *rpctest.TesServer - client spacesyncproto.DRPCSpaceClient - clientStream spacesyncproto.DRPCSpace_StreamStream - serverStream spacesyncproto.DRPCSpace_StreamStream + client spacesyncproto.DRPCSpaceSyncClient + clientStream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream + serverStream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream pool *streamPool clientId string serverId string @@ -64,12 +64,12 @@ func newFixture(t *testing.T, clientId, serverId string, handler MessageHandler) clientId: clientId, serverId: serverId, } - fx.testServer.stream = make(chan spacesyncproto.DRPCSpace_StreamStream, 1) - require.NoError(t, spacesyncproto.DRPCRegisterSpace(fx.drpcTS.Mux, fx.testServer)) - fx.client = spacesyncproto.NewDRPCSpaceClient(fx.drpcTS.Dial(peer.CtxWithPeerId(context.Background(), clientId))) + fx.testServer.stream = make(chan spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream, 1) + require.NoError(t, spacesyncproto.DRPCRegisterSpaceSync(fx.drpcTS.Mux, fx.testServer)) + fx.client = spacesyncproto.NewDRPCSpaceSyncClient(fx.drpcTS.Dial(peer.CtxWithPeerId(context.Background(), clientId))) var err error - fx.clientStream, err = fx.client.Stream(peer.CtxWithPeerId(context.Background(), serverId)) + fx.clientStream, err = fx.client.ObjectSyncStream(peer.CtxWithPeerId(context.Background(), serverId)) require.NoError(t, err) fx.serverStream = fx.testServer.waitStream(t) fx.pool = newStreamPool(handler).(*streamPool) diff --git a/common/commonspace/rpchandler.go b/common/commonspace/rpchandler.go index 99f506bf..6a454b28 100644 --- a/common/commonspace/rpchandler.go +++ b/common/commonspace/rpchandler.go @@ -7,7 +7,7 @@ import ( type RpcHandler interface { HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) - Stream(stream spacesyncproto.DRPCSpace_StreamStream) error + Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error } type rpcHandler struct { @@ -18,7 +18,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR return r.s.HeadSync().HandleRangeRequest(ctx, req) } -func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpace_StreamStream) (err error) { +func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) (err error) { // TODO: if needed we can launch full sync here return r.s.ObjectSync().StreamPool().AddAndReadStreamSync(stream) } diff --git a/common/commonspace/spaceservice.go b/common/commonspace/spaceservice.go index 914fd950..69e992b2 100644 --- a/common/commonspace/spaceservice.go +++ b/common/commonspace/spaceservice.go @@ -169,8 +169,8 @@ func (s *spaceService) getSpaceStorageFromRemote(ctx context.Context, id string) return } - cl := spacesyncproto.NewDRPCSpaceClient(p) - res, err := cl.PullSpace(ctx, &spacesyncproto.PullSpaceRequest{Id: id}) + cl := spacesyncproto.NewDRPCSpaceSyncClient(p) + res, err := cl.SpacePull(ctx, &spacesyncproto.SpacePullRequest{Id: id}) if err != nil { return } diff --git a/common/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go b/common/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go index 0df3a6ff..7c44b32a 100644 --- a/common/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go +++ b/common/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto (interfaces: DRPCSpaceClient) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto (interfaces: DRPCSpaceSyncClient) // Package mock_spacesyncproto is a generated GoMock package. package mock_spacesyncproto @@ -13,31 +13,31 @@ import ( drpc "storj.io/drpc" ) -// MockDRPCSpaceClient is a mock of DRPCSpaceClient interface. -type MockDRPCSpaceClient struct { +// MockDRPCSpaceSyncClient is a mock of DRPCSpaceSyncClient interface. +type MockDRPCSpaceSyncClient struct { ctrl *gomock.Controller - recorder *MockDRPCSpaceClientMockRecorder + recorder *MockDRPCSpaceSyncClientMockRecorder } -// MockDRPCSpaceClientMockRecorder is the mock recorder for MockDRPCSpaceClient. -type MockDRPCSpaceClientMockRecorder struct { - mock *MockDRPCSpaceClient +// MockDRPCSpaceSyncClientMockRecorder is the mock recorder for MockDRPCSpaceSyncClient. +type MockDRPCSpaceSyncClientMockRecorder struct { + mock *MockDRPCSpaceSyncClient } -// NewMockDRPCSpaceClient creates a new mock instance. -func NewMockDRPCSpaceClient(ctrl *gomock.Controller) *MockDRPCSpaceClient { - mock := &MockDRPCSpaceClient{ctrl: ctrl} - mock.recorder = &MockDRPCSpaceClientMockRecorder{mock} +// NewMockDRPCSpaceSyncClient creates a new mock instance. +func NewMockDRPCSpaceSyncClient(ctrl *gomock.Controller) *MockDRPCSpaceSyncClient { + mock := &MockDRPCSpaceSyncClient{ctrl: ctrl} + mock.recorder = &MockDRPCSpaceSyncClientMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockDRPCSpaceClient) EXPECT() *MockDRPCSpaceClientMockRecorder { +func (m *MockDRPCSpaceSyncClient) EXPECT() *MockDRPCSpaceSyncClientMockRecorder { return m.recorder } // DRPCConn mocks base method. -func (m *MockDRPCSpaceClient) DRPCConn() drpc.Conn { +func (m *MockDRPCSpaceSyncClient) DRPCConn() drpc.Conn { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DRPCConn") ret0, _ := ret[0].(drpc.Conn) @@ -45,13 +45,13 @@ func (m *MockDRPCSpaceClient) DRPCConn() drpc.Conn { } // DRPCConn indicates an expected call of DRPCConn. -func (mr *MockDRPCSpaceClientMockRecorder) DRPCConn() *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) DRPCConn() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DRPCConn", reflect.TypeOf((*MockDRPCSpaceClient)(nil).DRPCConn)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DRPCConn", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).DRPCConn)) } // HeadSync mocks base method. -func (m *MockDRPCSpaceClient) HeadSync(arg0 context.Context, arg1 *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) { +func (m *MockDRPCSpaceSyncClient) HeadSync(arg0 context.Context, arg1 *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HeadSync", arg0, arg1) ret0, _ := ret[0].(*spacesyncproto.HeadSyncResponse) @@ -60,52 +60,52 @@ func (m *MockDRPCSpaceClient) HeadSync(arg0 context.Context, arg1 *spacesyncprot } // HeadSync indicates an expected call of HeadSync. -func (mr *MockDRPCSpaceClientMockRecorder) HeadSync(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockDRPCSpaceSyncClientMockRecorder) HeadSync(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadSync", reflect.TypeOf((*MockDRPCSpaceClient)(nil).HeadSync), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadSync", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).HeadSync), arg0, arg1) } -// PullSpace mocks base method. -func (m *MockDRPCSpaceClient) PullSpace(arg0 context.Context, arg1 *spacesyncproto.PullSpaceRequest) (*spacesyncproto.PullSpaceResponse, error) { +// ObjectSyncStream mocks base method. +func (m *MockDRPCSpaceSyncClient) ObjectSyncStream(arg0 context.Context) (spacesyncproto.DRPCSpaceSync_ObjectSyncStreamClient, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PullSpace", arg0, arg1) - ret0, _ := ret[0].(*spacesyncproto.PullSpaceResponse) + ret := m.ctrl.Call(m, "ObjectSyncStream", arg0) + ret0, _ := ret[0].(spacesyncproto.DRPCSpaceSync_ObjectSyncStreamClient) ret1, _ := ret[1].(error) return ret0, ret1 } -// PullSpace indicates an expected call of PullSpace. -func (mr *MockDRPCSpaceClientMockRecorder) PullSpace(arg0, arg1 interface{}) *gomock.Call { +// ObjectSyncStream indicates an expected call of ObjectSyncStream. +func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSyncStream(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PullSpace", reflect.TypeOf((*MockDRPCSpaceClient)(nil).PullSpace), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ObjectSyncStream", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).ObjectSyncStream), arg0) } -// PushSpace mocks base method. -func (m *MockDRPCSpaceClient) PushSpace(arg0 context.Context, arg1 *spacesyncproto.PushSpaceRequest) (*spacesyncproto.PushSpaceResponse, error) { +// SpacePull mocks base method. +func (m *MockDRPCSpaceSyncClient) SpacePull(arg0 context.Context, arg1 *spacesyncproto.SpacePullRequest) (*spacesyncproto.SpacePullResponse, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PushSpace", arg0, arg1) - ret0, _ := ret[0].(*spacesyncproto.PushSpaceResponse) + ret := m.ctrl.Call(m, "SpacePull", arg0, arg1) + ret0, _ := ret[0].(*spacesyncproto.SpacePullResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// PushSpace indicates an expected call of PushSpace. -func (mr *MockDRPCSpaceClientMockRecorder) PushSpace(arg0, arg1 interface{}) *gomock.Call { +// SpacePull indicates an expected call of SpacePull. +func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePull(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PushSpace", reflect.TypeOf((*MockDRPCSpaceClient)(nil).PushSpace), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpacePull", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).SpacePull), arg0, arg1) } -// Stream mocks base method. -func (m *MockDRPCSpaceClient) Stream(arg0 context.Context) (spacesyncproto.DRPCSpace_StreamClient, error) { +// SpacePush mocks base method. +func (m *MockDRPCSpaceSyncClient) SpacePush(arg0 context.Context, arg1 *spacesyncproto.SpacePushRequest) (*spacesyncproto.SpacePushResponse, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stream", arg0) - ret0, _ := ret[0].(spacesyncproto.DRPCSpace_StreamClient) + ret := m.ctrl.Call(m, "SpacePush", arg0, arg1) + ret0, _ := ret[0].(*spacesyncproto.SpacePushResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// Stream indicates an expected call of Stream. -func (mr *MockDRPCSpaceClientMockRecorder) Stream(arg0 interface{}) *gomock.Call { +// SpacePush indicates an expected call of SpacePush. +func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePush(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stream", reflect.TypeOf((*MockDRPCSpaceClient)(nil).Stream), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpacePush", reflect.TypeOf((*MockDRPCSpaceSyncClient)(nil).SpacePush), arg0, arg1) } diff --git a/common/commonspace/spacesyncproto/protos/spacesync.proto b/common/commonspace/spacesyncproto/protos/spacesync.proto index 0582fffc..a9b911db 100644 --- a/common/commonspace/spacesyncproto/protos/spacesync.proto +++ b/common/commonspace/spacesyncproto/protos/spacesync.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package anySpace; +package spacesync; option go_package = "commonspace/spacesyncproto"; @@ -10,15 +10,15 @@ enum ErrCodes { ErrorOffset = 100; } -service Space { +service SpaceSync { // HeadSync compares all objects and their hashes in a space rpc HeadSync(HeadSyncRequest) returns (HeadSyncResponse); // PushSpace sends new space to the node - rpc PushSpace(PushSpaceRequest) returns (PushSpaceResponse); + rpc SpacePush(SpacePushRequest) returns (SpacePushResponse); // PullSpace gets space from the remote peer - rpc PullSpace(PullSpaceRequest) returns (PullSpaceResponse); + rpc SpacePull(SpacePullRequest) returns (SpacePullResponse); // Stream opens object sync stream with node or client - rpc Stream(stream ObjectSyncMessage) returns (stream ObjectSyncMessage); + rpc ObjectSyncStream(stream ObjectSyncMessage) returns (stream ObjectSyncMessage); } // HeadSyncRange presenting a request for one range @@ -63,20 +63,20 @@ message ObjectSyncMessage { } // PushSpaceRequest is a request to add space on a node containing only one acl record -message PushSpaceRequest { +message SpacePushRequest { SpacePayload payload = 1; } // PushSpaceResponse is an empty response -message PushSpaceResponse {} +message SpacePushResponse {} // PullSpaceRequest is a request to request a space on a node that doesn't have it -message PullSpaceRequest { +message SpacePullRequest { string id = 1; } // PullSpaceResponse is a response with header and acl root -message PullSpaceResponse { +message SpacePullResponse { SpacePayload payload = 1; } diff --git a/common/commonspace/spacesyncproto/spacesync.go b/common/commonspace/spacesyncproto/spacesync.go index 7c55930f..49cfc4a5 100644 --- a/common/commonspace/spacesyncproto/spacesync.go +++ b/common/commonspace/spacesyncproto/spacesync.go @@ -1,18 +1,18 @@ -//go:generate mockgen -destination mock_spacesyncproto/mock_spacesyncproto.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto DRPCSpaceClient +//go:generate mockgen -destination mock_spacesyncproto/mock_spacesyncproto.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto DRPCSpaceSyncClient package spacesyncproto import ( "storj.io/drpc" ) -type SpaceStream = DRPCSpace_StreamStream +type ObjectSyncStream = DRPCSpaceSync_ObjectSyncStreamStream -type ClientFactoryFunc func(cc drpc.Conn) DRPCSpaceClient +type ClientFactoryFunc func(cc drpc.Conn) DRPCSpaceSyncClient -func (c ClientFactoryFunc) Client(cc drpc.Conn) DRPCSpaceClient { +func (c ClientFactoryFunc) Client(cc drpc.Conn) DRPCSpaceSyncClient { return c(cc) } type ClientFactory interface { - Client(cc drpc.Conn) DRPCSpaceClient + Client(cc drpc.Conn) DRPCSpaceSyncClient } diff --git a/common/commonspace/spacesyncproto/spacesync.pb.go b/common/commonspace/spacesyncproto/spacesync.pb.go index d0672626..c38245ae 100644 --- a/common/commonspace/spacesyncproto/spacesync.pb.go +++ b/common/commonspace/spacesyncproto/spacesync.pb.go @@ -396,22 +396,22 @@ func (m *ObjectSyncMessage) GetObjectId() string { } // PushSpaceRequest is a request to add space on a node containing only one acl record -type PushSpaceRequest struct { +type SpacePushRequest struct { Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } -func (m *PushSpaceRequest) Reset() { *m = PushSpaceRequest{} } -func (m *PushSpaceRequest) String() string { return proto.CompactTextString(m) } -func (*PushSpaceRequest) ProtoMessage() {} -func (*PushSpaceRequest) Descriptor() ([]byte, []int) { +func (m *SpacePushRequest) Reset() { *m = SpacePushRequest{} } +func (m *SpacePushRequest) String() string { return proto.CompactTextString(m) } +func (*SpacePushRequest) ProtoMessage() {} +func (*SpacePushRequest) Descriptor() ([]byte, []int) { return fileDescriptor_80e49f1f4ac27799, []int{6} } -func (m *PushSpaceRequest) XXX_Unmarshal(b []byte) error { +func (m *SpacePushRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PushSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpacePushRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PushSpaceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_SpacePushRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -421,19 +421,19 @@ func (m *PushSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *PushSpaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PushSpaceRequest.Merge(m, src) +func (m *SpacePushRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpacePushRequest.Merge(m, src) } -func (m *PushSpaceRequest) XXX_Size() int { +func (m *SpacePushRequest) XXX_Size() int { return m.Size() } -func (m *PushSpaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PushSpaceRequest.DiscardUnknown(m) +func (m *SpacePushRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpacePushRequest.DiscardUnknown(m) } -var xxx_messageInfo_PushSpaceRequest proto.InternalMessageInfo +var xxx_messageInfo_SpacePushRequest proto.InternalMessageInfo -func (m *PushSpaceRequest) GetPayload() *SpacePayload { +func (m *SpacePushRequest) GetPayload() *SpacePayload { if m != nil { return m.Payload } @@ -441,21 +441,21 @@ func (m *PushSpaceRequest) GetPayload() *SpacePayload { } // PushSpaceResponse is an empty response -type PushSpaceResponse struct { +type SpacePushResponse struct { } -func (m *PushSpaceResponse) Reset() { *m = PushSpaceResponse{} } -func (m *PushSpaceResponse) String() string { return proto.CompactTextString(m) } -func (*PushSpaceResponse) ProtoMessage() {} -func (*PushSpaceResponse) Descriptor() ([]byte, []int) { +func (m *SpacePushResponse) Reset() { *m = SpacePushResponse{} } +func (m *SpacePushResponse) String() string { return proto.CompactTextString(m) } +func (*SpacePushResponse) ProtoMessage() {} +func (*SpacePushResponse) Descriptor() ([]byte, []int) { return fileDescriptor_80e49f1f4ac27799, []int{7} } -func (m *PushSpaceResponse) XXX_Unmarshal(b []byte) error { +func (m *SpacePushResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PushSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpacePushResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PushSpaceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_SpacePushResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -465,35 +465,35 @@ func (m *PushSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *PushSpaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PushSpaceResponse.Merge(m, src) +func (m *SpacePushResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpacePushResponse.Merge(m, src) } -func (m *PushSpaceResponse) XXX_Size() int { +func (m *SpacePushResponse) XXX_Size() int { return m.Size() } -func (m *PushSpaceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PushSpaceResponse.DiscardUnknown(m) +func (m *SpacePushResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpacePushResponse.DiscardUnknown(m) } -var xxx_messageInfo_PushSpaceResponse proto.InternalMessageInfo +var xxx_messageInfo_SpacePushResponse proto.InternalMessageInfo // PullSpaceRequest is a request to request a space on a node that doesn't have it -type PullSpaceRequest struct { +type SpacePullRequest struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } -func (m *PullSpaceRequest) Reset() { *m = PullSpaceRequest{} } -func (m *PullSpaceRequest) String() string { return proto.CompactTextString(m) } -func (*PullSpaceRequest) ProtoMessage() {} -func (*PullSpaceRequest) Descriptor() ([]byte, []int) { +func (m *SpacePullRequest) Reset() { *m = SpacePullRequest{} } +func (m *SpacePullRequest) String() string { return proto.CompactTextString(m) } +func (*SpacePullRequest) ProtoMessage() {} +func (*SpacePullRequest) Descriptor() ([]byte, []int) { return fileDescriptor_80e49f1f4ac27799, []int{8} } -func (m *PullSpaceRequest) XXX_Unmarshal(b []byte) error { +func (m *SpacePullRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PullSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpacePullRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PullSpaceRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_SpacePullRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -503,19 +503,19 @@ func (m *PullSpaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *PullSpaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PullSpaceRequest.Merge(m, src) +func (m *SpacePullRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpacePullRequest.Merge(m, src) } -func (m *PullSpaceRequest) XXX_Size() int { +func (m *SpacePullRequest) XXX_Size() int { return m.Size() } -func (m *PullSpaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PullSpaceRequest.DiscardUnknown(m) +func (m *SpacePullRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpacePullRequest.DiscardUnknown(m) } -var xxx_messageInfo_PullSpaceRequest proto.InternalMessageInfo +var xxx_messageInfo_SpacePullRequest proto.InternalMessageInfo -func (m *PullSpaceRequest) GetId() string { +func (m *SpacePullRequest) GetId() string { if m != nil { return m.Id } @@ -523,22 +523,22 @@ func (m *PullSpaceRequest) GetId() string { } // PullSpaceResponse is a response with header and acl root -type PullSpaceResponse struct { +type SpacePullResponse struct { Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } -func (m *PullSpaceResponse) Reset() { *m = PullSpaceResponse{} } -func (m *PullSpaceResponse) String() string { return proto.CompactTextString(m) } -func (*PullSpaceResponse) ProtoMessage() {} -func (*PullSpaceResponse) Descriptor() ([]byte, []int) { +func (m *SpacePullResponse) Reset() { *m = SpacePullResponse{} } +func (m *SpacePullResponse) String() string { return proto.CompactTextString(m) } +func (*SpacePullResponse) ProtoMessage() {} +func (*SpacePullResponse) Descriptor() ([]byte, []int) { return fileDescriptor_80e49f1f4ac27799, []int{9} } -func (m *PullSpaceResponse) XXX_Unmarshal(b []byte) error { +func (m *SpacePullResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PullSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SpacePullResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PullSpaceResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_SpacePullResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -548,19 +548,19 @@ func (m *PullSpaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *PullSpaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PullSpaceResponse.Merge(m, src) +func (m *SpacePullResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpacePullResponse.Merge(m, src) } -func (m *PullSpaceResponse) XXX_Size() int { +func (m *SpacePullResponse) XXX_Size() int { return m.Size() } -func (m *PullSpaceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PullSpaceResponse.DiscardUnknown(m) +func (m *SpacePullResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpacePullResponse.DiscardUnknown(m) } -var xxx_messageInfo_PullSpaceResponse proto.InternalMessageInfo +var xxx_messageInfo_SpacePullResponse proto.InternalMessageInfo -func (m *PullSpaceResponse) GetPayload() *SpacePayload { +func (m *SpacePullResponse) GetPayload() *SpacePayload { if m != nil { return m.Payload } @@ -1038,25 +1038,25 @@ func (m *SettingsData) GetSnapshot() *SpaceSettingsSnapshot { } func init() { - proto.RegisterEnum("anySpace.ErrCodes", ErrCodes_name, ErrCodes_value) - proto.RegisterType((*HeadSyncRange)(nil), "anySpace.HeadSyncRange") - proto.RegisterType((*HeadSyncResult)(nil), "anySpace.HeadSyncResult") - proto.RegisterType((*HeadSyncResultElement)(nil), "anySpace.HeadSyncResultElement") - proto.RegisterType((*HeadSyncRequest)(nil), "anySpace.HeadSyncRequest") - proto.RegisterType((*HeadSyncResponse)(nil), "anySpace.HeadSyncResponse") - proto.RegisterType((*ObjectSyncMessage)(nil), "anySpace.ObjectSyncMessage") - proto.RegisterType((*PushSpaceRequest)(nil), "anySpace.PushSpaceRequest") - proto.RegisterType((*PushSpaceResponse)(nil), "anySpace.PushSpaceResponse") - proto.RegisterType((*PullSpaceRequest)(nil), "anySpace.PullSpaceRequest") - proto.RegisterType((*PullSpaceResponse)(nil), "anySpace.PullSpaceResponse") - proto.RegisterType((*SpacePayload)(nil), "anySpace.SpacePayload") - proto.RegisterType((*SpaceHeader)(nil), "anySpace.SpaceHeader") - proto.RegisterType((*RawSpaceHeader)(nil), "anySpace.RawSpaceHeader") - proto.RegisterType((*RawSpaceHeaderWithId)(nil), "anySpace.RawSpaceHeaderWithId") - proto.RegisterType((*SpaceSettingsContent)(nil), "anySpace.SpaceSettingsContent") - proto.RegisterType((*ObjectDelete)(nil), "anySpace.ObjectDelete") - proto.RegisterType((*SpaceSettingsSnapshot)(nil), "anySpace.SpaceSettingsSnapshot") - proto.RegisterType((*SettingsData)(nil), "anySpace.SettingsData") + proto.RegisterEnum("spacesync.ErrCodes", ErrCodes_name, ErrCodes_value) + proto.RegisterType((*HeadSyncRange)(nil), "spacesync.HeadSyncRange") + proto.RegisterType((*HeadSyncResult)(nil), "spacesync.HeadSyncResult") + proto.RegisterType((*HeadSyncResultElement)(nil), "spacesync.HeadSyncResultElement") + proto.RegisterType((*HeadSyncRequest)(nil), "spacesync.HeadSyncRequest") + proto.RegisterType((*HeadSyncResponse)(nil), "spacesync.HeadSyncResponse") + proto.RegisterType((*ObjectSyncMessage)(nil), "spacesync.ObjectSyncMessage") + proto.RegisterType((*SpacePushRequest)(nil), "spacesync.SpacePushRequest") + proto.RegisterType((*SpacePushResponse)(nil), "spacesync.SpacePushResponse") + proto.RegisterType((*SpacePullRequest)(nil), "spacesync.SpacePullRequest") + proto.RegisterType((*SpacePullResponse)(nil), "spacesync.SpacePullResponse") + proto.RegisterType((*SpacePayload)(nil), "spacesync.SpacePayload") + proto.RegisterType((*SpaceHeader)(nil), "spacesync.SpaceHeader") + proto.RegisterType((*RawSpaceHeader)(nil), "spacesync.RawSpaceHeader") + proto.RegisterType((*RawSpaceHeaderWithId)(nil), "spacesync.RawSpaceHeaderWithId") + proto.RegisterType((*SpaceSettingsContent)(nil), "spacesync.SpaceSettingsContent") + proto.RegisterType((*ObjectDelete)(nil), "spacesync.ObjectDelete") + proto.RegisterType((*SpaceSettingsSnapshot)(nil), "spacesync.SpaceSettingsSnapshot") + proto.RegisterType((*SettingsData)(nil), "spacesync.SettingsData") } func init() { @@ -1064,63 +1064,63 @@ func init() { } var fileDescriptor_80e49f1f4ac27799 = []byte{ - // 882 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0x6e, 0x9c, 0xc4, 0x7e, 0xd9, 0xba, 0xee, 0x90, 0x96, 0xc5, 0x45, 0x4b, 0x34, 0x07, - 0x14, 0x71, 0x48, 0x8a, 0x41, 0x80, 0x54, 0x0e, 0xd0, 0xda, 0x55, 0x2d, 0x54, 0x12, 0x8d, 0x41, - 0x48, 0x08, 0x0e, 0xd3, 0xdd, 0x89, 0xbd, 0x68, 0xbd, 0xb3, 0xec, 0x8c, 0x49, 0x7d, 0x40, 0xe2, - 0xc2, 0x9d, 0x4f, 0x80, 0xc4, 0xb7, 0xe1, 0xd8, 0x23, 0x47, 0x94, 0x7c, 0x11, 0x34, 0x6f, 0xff, - 0x3b, 0x9b, 0x4a, 0x5c, 0xd6, 0xf3, 0xfe, 0xfd, 0xde, 0x9f, 0x79, 0xf3, 0x93, 0xe1, 0x43, 0x5f, - 0xae, 0x56, 0x32, 0x56, 0x09, 0xf7, 0xc5, 0x29, 0x7e, 0xd5, 0x26, 0xf6, 0x93, 0x54, 0x6a, 0x79, - 0x8a, 0x5f, 0x55, 0x69, 0x4f, 0x50, 0x41, 0x7a, 0x3c, 0xde, 0xcc, 0x8d, 0x8e, 0xce, 0xe0, 0xce, - 0x73, 0xc1, 0x83, 0xf9, 0x26, 0xf6, 0x19, 0x8f, 0x17, 0x82, 0x10, 0xe8, 0x5e, 0xa4, 0x72, 0xe5, - 0x5a, 0x47, 0xd6, 0x71, 0x97, 0xe1, 0x99, 0x0c, 0xc0, 0xd6, 0xd2, 0xb5, 0x51, 0x63, 0x6b, 0x49, - 0x0e, 0x61, 0x37, 0x0a, 0x57, 0xa1, 0x76, 0x77, 0x8e, 0xac, 0xe3, 0x3b, 0x2c, 0x13, 0xe8, 0x25, - 0x0c, 0x4a, 0x28, 0xa1, 0xd6, 0x91, 0x36, 0x58, 0x4b, 0xae, 0x96, 0x88, 0xe5, 0x30, 0x3c, 0x93, - 0xc7, 0xd0, 0x13, 0x91, 0x58, 0x89, 0x58, 0x2b, 0xd7, 0x3e, 0xda, 0x39, 0x3e, 0x18, 0xbf, 0x77, - 0x52, 0x54, 0x73, 0xd2, 0x8c, 0x9f, 0x66, 0x7e, 0xac, 0x0c, 0x30, 0x89, 0x7d, 0xb9, 0x8e, 0xcb, - 0xc4, 0x28, 0xd0, 0xc7, 0x70, 0xbf, 0x35, 0xd0, 0xd4, 0x1d, 0x06, 0x98, 0xbd, 0xcf, 0xec, 0x30, - 0xc0, 0x7a, 0x04, 0x0f, 0xb0, 0x93, 0x3e, 0xc3, 0x33, 0xfd, 0x01, 0xee, 0x56, 0xc1, 0x3f, 0xaf, - 0x85, 0xd2, 0xc4, 0x85, 0x7d, 0x1c, 0xd8, 0xac, 0x88, 0x2d, 0x44, 0x72, 0x0a, 0x7b, 0xa9, 0x99, - 0x52, 0x51, 0xfa, 0xdb, 0x2d, 0xa5, 0x1b, 0x3b, 0xcb, 0xdd, 0xe8, 0x33, 0x18, 0xd6, 0x4a, 0x4b, - 0x64, 0xac, 0x04, 0x19, 0xc3, 0x7e, 0x8a, 0x65, 0x2a, 0xd7, 0x42, 0x14, 0xf7, 0xb6, 0x01, 0xb0, - 0xc2, 0x91, 0xfe, 0x0a, 0xf7, 0xce, 0x5e, 0xfe, 0x24, 0x7c, 0x6d, 0x8c, 0x2f, 0x84, 0x52, 0x7c, - 0x21, 0xde, 0x50, 0xa7, 0x6b, 0x52, 0x24, 0xd1, 0x66, 0x56, 0xf4, 0x5a, 0x88, 0xc6, 0x92, 0xf0, - 0x4d, 0x24, 0x79, 0x80, 0x33, 0x74, 0x58, 0x21, 0x92, 0x11, 0xf4, 0x24, 0xa6, 0x98, 0x05, 0x6e, - 0x17, 0x83, 0x4a, 0x99, 0x4e, 0x60, 0x78, 0xbe, 0x56, 0x4b, 0xac, 0xb1, 0x98, 0xd2, 0xa3, 0x0a, - 0xc9, 0x64, 0x3f, 0x18, 0x3f, 0xa8, 0xda, 0xc0, 0xef, 0x79, 0x66, 0x2d, 0x33, 0xd0, 0xb7, 0xe0, - 0x5e, 0x0d, 0x25, 0x9b, 0x06, 0xa5, 0x06, 0x3a, 0x8a, 0x1a, 0xd0, 0x5b, 0xf7, 0x46, 0xa7, 0x26, - 0xb0, 0xf4, 0xc9, 0xc7, 0xf8, 0xff, 0xf3, 0xff, 0x66, 0x83, 0x53, 0xb7, 0x90, 0x2f, 0xe0, 0x00, - 0x27, 0x66, 0xa6, 0x2e, 0xd2, 0x1c, 0xc6, 0xab, 0x60, 0x18, 0xbf, 0x9c, 0x57, 0xf6, 0xef, 0x42, - 0xbd, 0x9c, 0x05, 0xac, 0x1e, 0x42, 0x3c, 0x00, 0xee, 0x47, 0x39, 0x1e, 0xce, 0xda, 0x61, 0x35, - 0x0d, 0xa1, 0xe0, 0x54, 0xd2, 0x2c, 0x9b, 0x79, 0x9f, 0x35, 0x74, 0x64, 0x0c, 0x87, 0x08, 0x39, - 0x17, 0x5a, 0x87, 0xf1, 0x42, 0x15, 0x68, 0x5d, 0x44, 0x6b, 0xb5, 0x91, 0x4f, 0xe0, 0x41, 0x9b, - 0x7e, 0x16, 0xb8, 0xbb, 0x98, 0xe1, 0x16, 0x2b, 0xfd, 0xcb, 0x82, 0x83, 0x5a, 0x4b, 0xe6, 0xd2, - 0xc3, 0x40, 0xc4, 0x3a, 0xd4, 0x9b, 0xfc, 0x95, 0x96, 0x32, 0x79, 0x17, 0xfa, 0x3a, 0x5c, 0x09, - 0xa5, 0xf9, 0x2a, 0xc1, 0xd6, 0x76, 0x58, 0xa5, 0x30, 0x56, 0xcc, 0xf1, 0xcd, 0x26, 0x11, 0x79, - 0x5b, 0x95, 0x82, 0xbc, 0x0f, 0x03, 0xb3, 0x71, 0xa1, 0xcf, 0x75, 0x28, 0xe3, 0xaf, 0xc4, 0x06, - 0xbb, 0xe9, 0xb2, 0x2d, 0xad, 0x79, 0x91, 0x4a, 0x88, 0xac, 0x6a, 0x87, 0xe1, 0x99, 0x9e, 0xc3, - 0xa0, 0x39, 0x78, 0x72, 0x74, 0xf3, 0x9e, 0x9c, 0xe6, 0x3d, 0x98, 0x6a, 0xc2, 0x45, 0xcc, 0xf5, - 0x3a, 0x15, 0xf9, 0x35, 0x54, 0x0a, 0x3a, 0x81, 0xc3, 0xb6, 0xab, 0x34, 0x51, 0x29, 0xbf, 0x6c, - 0xa0, 0x56, 0x8a, 0x7c, 0x0b, 0xed, 0x72, 0x0b, 0x7f, 0x84, 0xc3, 0x79, 0x7d, 0xaa, 0x4f, 0x65, - 0xac, 0x0d, 0xcb, 0x7c, 0x0e, 0x4e, 0xf6, 0x50, 0x26, 0x22, 0x12, 0x5a, 0xdc, 0xdc, 0xc6, 0xb3, - 0x9a, 0xf5, 0x79, 0x87, 0x35, 0xbc, 0x9f, 0xec, 0xc3, 0xee, 0x2f, 0x3c, 0x5a, 0x0b, 0xea, 0x81, - 0x53, 0x77, 0xbc, 0xf1, 0x08, 0x3e, 0x85, 0xfb, 0x8d, 0xf4, 0xf3, 0x98, 0x27, 0x6a, 0x29, 0xb5, - 0xd9, 0xc1, 0x00, 0x43, 0x82, 0x59, 0x90, 0x51, 0x4a, 0x9f, 0xd5, 0x34, 0xf4, 0x77, 0x0b, 0x9c, - 0x22, 0x68, 0xc2, 0x35, 0x27, 0x9f, 0xc1, 0xbe, 0x9f, 0xd5, 0x9e, 0x13, 0x90, 0xb7, 0xf5, 0x72, - 0xb6, 0x3a, 0x64, 0x85, 0xbb, 0x21, 0x6f, 0x95, 0xa7, 0xc5, 0xc1, 0x34, 0xc8, 0xbb, 0xb5, 0x3a, - 0x56, 0x06, 0x7c, 0xf0, 0x35, 0xf4, 0xa6, 0x69, 0xfa, 0x54, 0x06, 0x42, 0x91, 0x01, 0xc0, 0xb7, - 0xb1, 0x78, 0x95, 0x08, 0x5f, 0x8b, 0x60, 0xd8, 0x21, 0xc3, 0xfc, 0x65, 0xbe, 0x08, 0x95, 0x0a, - 0xe3, 0xc5, 0xd0, 0x22, 0x77, 0xf3, 0x45, 0x9d, 0xbe, 0x0a, 0x95, 0x56, 0x43, 0xdb, 0x28, 0xa6, - 0x69, 0x2a, 0xd3, 0xb3, 0x8b, 0x0b, 0x25, 0xf4, 0x30, 0x18, 0xff, 0x69, 0xc3, 0x2e, 0xba, 0x90, - 0x2f, 0xa1, 0x57, 0x10, 0x27, 0x79, 0xa7, 0x8d, 0x4c, 0x91, 0x56, 0x46, 0xa3, 0x56, 0x9e, 0xcd, - 0xd8, 0x64, 0x02, 0xfd, 0x92, 0x9b, 0x48, 0xcd, 0x71, 0x9b, 0xf6, 0x46, 0x0f, 0x5b, 0x6d, 0x75, - 0x94, 0x9c, 0xa8, 0x9a, 0x28, 0x4d, 0x86, 0x6b, 0xa2, 0x6c, 0x33, 0xdb, 0x33, 0xd8, 0x9b, 0xeb, - 0x54, 0xf0, 0x15, 0x79, 0xb8, 0xbd, 0x44, 0x35, 0xfa, 0x1f, 0xbd, 0xc9, 0x78, 0x6c, 0x3d, 0xb2, - 0x9e, 0x7c, 0xfc, 0xf7, 0x95, 0x67, 0xbd, 0xbe, 0xf2, 0xac, 0x7f, 0xaf, 0x3c, 0xeb, 0x8f, 0x6b, - 0xaf, 0xf3, 0xfa, 0xda, 0xeb, 0xfc, 0x73, 0xed, 0x75, 0xbe, 0x1f, 0xdd, 0xfe, 0x97, 0xe1, 0xe5, - 0x1e, 0xfe, 0x7c, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x86, 0xe7, 0xfa, 0x57, 0x08, - 0x00, 0x00, + // 887 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0x1b, 0x45, + 0x18, 0xf6, 0x6e, 0x9c, 0x26, 0x7e, 0xb3, 0x75, 0xdd, 0x21, 0x85, 0xc5, 0x8d, 0x5c, 0x6b, 0x0e, + 0x28, 0xe2, 0xd0, 0x8f, 0x14, 0x81, 0x10, 0x70, 0xa0, 0x89, 0x4b, 0x2d, 0x54, 0x52, 0x8d, 0x41, + 0x48, 0x48, 0x20, 0x4d, 0x77, 0xdf, 0xd8, 0x8b, 0xd6, 0x33, 0xcb, 0xce, 0x98, 0xc6, 0x07, 0x0e, + 0x9c, 0xb8, 0xf2, 0x17, 0xf8, 0x0f, 0xfc, 0x08, 0x8e, 0x3d, 0x72, 0x44, 0xc9, 0x1f, 0x41, 0x33, + 0xfb, 0x1d, 0x6f, 0x7a, 0xe8, 0x65, 0x33, 0xef, 0xd7, 0xf3, 0x7e, 0xcc, 0x3b, 0x4f, 0x0c, 0x8f, + 0x02, 0xb9, 0x5c, 0x4a, 0xa1, 0x12, 0x1e, 0xe0, 0x03, 0xfb, 0x55, 0x6b, 0x11, 0x24, 0xa9, 0xd4, + 0xf2, 0x81, 0xfd, 0xaa, 0x4a, 0x7b, 0xdf, 0x2a, 0x48, 0xaf, 0x54, 0xd0, 0x29, 0xdc, 0x7c, 0x86, + 0x3c, 0x9c, 0xad, 0x45, 0xc0, 0xb8, 0x98, 0x23, 0x21, 0xd0, 0x3d, 0x4b, 0xe5, 0xd2, 0x77, 0xc6, + 0xce, 0x61, 0x97, 0xd9, 0x33, 0xe9, 0x83, 0xab, 0xa5, 0xef, 0x5a, 0x8d, 0xab, 0x25, 0xd9, 0x87, + 0xed, 0x38, 0x5a, 0x46, 0xda, 0xdf, 0x1a, 0x3b, 0x87, 0x37, 0x59, 0x26, 0xd0, 0x73, 0xe8, 0x97, + 0x50, 0xa8, 0x56, 0xb1, 0x36, 0x58, 0x0b, 0xae, 0x16, 0x16, 0xcb, 0x63, 0xf6, 0x4c, 0x3e, 0x87, + 0x5d, 0x8c, 0x71, 0x89, 0x42, 0x2b, 0xdf, 0x1d, 0x6f, 0x1d, 0xee, 0x1d, 0x8d, 0xef, 0x57, 0xf5, + 0x35, 0x01, 0x26, 0x99, 0x23, 0x2b, 0x23, 0x4c, 0xe6, 0x40, 0xae, 0x44, 0x99, 0xd9, 0x0a, 0xf4, + 0x33, 0xb8, 0xd3, 0x1a, 0x68, 0x0a, 0x8f, 0x42, 0x9b, 0xbe, 0xc7, 0xdc, 0x28, 0xb4, 0x05, 0x21, + 0x0f, 0x6d, 0x2b, 0x3d, 0x66, 0xcf, 0xf4, 0x47, 0xb8, 0x55, 0x05, 0xff, 0xb2, 0x42, 0xa5, 0x89, + 0x0f, 0x3b, 0xb6, 0xa4, 0x69, 0x11, 0x5b, 0x88, 0xe4, 0x21, 0xdc, 0x48, 0xcd, 0x98, 0x8a, 0xda, + 0xfd, 0xb6, 0xda, 0x8d, 0x03, 0xcb, 0xfd, 0xe8, 0x57, 0x30, 0xa8, 0xd5, 0x96, 0x48, 0xa1, 0x90, + 0x3c, 0x86, 0x9d, 0xd4, 0xd6, 0xa9, 0x7c, 0xc7, 0xc2, 0xbc, 0x7f, 0xed, 0x08, 0x58, 0xe1, 0x49, + 0x7f, 0x83, 0xdb, 0xa7, 0x2f, 0x7f, 0xc6, 0x40, 0x1b, 0xe3, 0x73, 0x54, 0x8a, 0xcf, 0xf1, 0x0d, + 0x95, 0xfa, 0x26, 0x47, 0x12, 0xaf, 0xa7, 0x45, 0xb7, 0x85, 0x68, 0x2c, 0x09, 0x5f, 0xc7, 0x92, + 0x87, 0x76, 0x8a, 0x1e, 0x2b, 0x44, 0x32, 0x84, 0x5d, 0x69, 0x53, 0x4c, 0x43, 0xbf, 0x6b, 0x83, + 0x4a, 0x99, 0x4e, 0x60, 0x30, 0x33, 0xd0, 0x2f, 0x56, 0x6a, 0x51, 0xcc, 0xe9, 0x51, 0x85, 0x64, + 0xb2, 0xef, 0x1d, 0xbd, 0x57, 0xeb, 0x23, 0xf3, 0xce, 0xcc, 0x65, 0x0a, 0xfa, 0x0e, 0xdc, 0xae, + 0xc1, 0x64, 0xf3, 0xa0, 0xb4, 0xc4, 0x8e, 0xe3, 0x02, 0xfb, 0xca, 0xd5, 0xd1, 0xa7, 0x65, 0xa0, + 0xf1, 0xc9, 0x07, 0xf9, 0x16, 0x05, 0xfc, 0xee, 0x82, 0x57, 0xb7, 0x90, 0x2f, 0x61, 0xcf, 0xc6, + 0x98, 0xb9, 0x63, 0x9a, 0xe3, 0xdc, 0xab, 0xe1, 0x30, 0xfe, 0x6a, 0x56, 0x39, 0x7c, 0x1f, 0xe9, + 0xc5, 0x34, 0x64, 0xf5, 0x18, 0x32, 0x02, 0xe0, 0x41, 0x9c, 0x03, 0xda, 0x71, 0x7b, 0xac, 0xa6, + 0x21, 0x14, 0xbc, 0x4a, 0x9a, 0x66, 0x63, 0xef, 0xb1, 0x86, 0x8e, 0x1c, 0xc1, 0xbe, 0x85, 0x9c, + 0xa1, 0xd6, 0x91, 0x98, 0xab, 0x02, 0xad, 0x6b, 0xd1, 0x5a, 0x6d, 0xe4, 0x63, 0x78, 0xb7, 0x4d, + 0x3f, 0x0d, 0xfd, 0x6d, 0x9b, 0xe1, 0x1a, 0x2b, 0xfd, 0xcb, 0x81, 0xbd, 0x5a, 0x4b, 0xe6, 0xde, + 0xa3, 0x10, 0x85, 0x8e, 0xf4, 0x3a, 0x7f, 0xab, 0xa5, 0x4c, 0x0e, 0xa0, 0xa7, 0xa3, 0x25, 0x2a, + 0xcd, 0x97, 0x89, 0x6d, 0x6d, 0x8b, 0x55, 0x0a, 0x63, 0xb5, 0x39, 0xbe, 0x5d, 0x27, 0x98, 0xb7, + 0x55, 0x29, 0xc8, 0x07, 0xd0, 0x37, 0x4b, 0x17, 0x05, 0x5c, 0x47, 0x52, 0x7c, 0x8d, 0x6b, 0xdb, + 0x4d, 0x97, 0x5d, 0xd1, 0x9a, 0x67, 0xa9, 0x10, 0xb3, 0xaa, 0x3d, 0x66, 0xcf, 0xf4, 0x05, 0xf4, + 0x9b, 0x83, 0x27, 0xe3, 0xcd, 0x8b, 0xf2, 0x9a, 0xf7, 0x60, 0xaa, 0x89, 0xe6, 0x82, 0xeb, 0x55, + 0x8a, 0xf9, 0x35, 0x54, 0x0a, 0x7a, 0x02, 0xfb, 0x6d, 0x57, 0x69, 0xa2, 0x52, 0xfe, 0xaa, 0x81, + 0x5a, 0x29, 0xf2, 0x3d, 0x74, 0xcb, 0x3d, 0xfc, 0x09, 0xf6, 0x67, 0xf5, 0xa9, 0x1e, 0x4b, 0xa1, + 0x0d, 0xd5, 0x7c, 0x01, 0x5e, 0xf6, 0x56, 0x4e, 0x30, 0x46, 0x8d, 0x2d, 0xfb, 0x78, 0x5a, 0x33, + 0x3f, 0xeb, 0xb0, 0x86, 0xfb, 0x93, 0x1d, 0xd8, 0xfe, 0x95, 0xc7, 0x2b, 0xa4, 0x23, 0xf0, 0xea, + 0x8e, 0x1b, 0xef, 0xe0, 0x13, 0xb8, 0xd3, 0xc8, 0x3f, 0x13, 0x3c, 0x51, 0x0b, 0xa9, 0xcd, 0x12, + 0x86, 0x36, 0x24, 0x9c, 0x86, 0x19, 0xaf, 0xf4, 0x58, 0x4d, 0x43, 0xff, 0x70, 0xc0, 0x2b, 0x82, + 0x4e, 0xb8, 0xe6, 0xe4, 0x53, 0xd8, 0x09, 0xb2, 0xe2, 0x73, 0x16, 0xba, 0x77, 0xf5, 0xf1, 0x5c, + 0xe9, 0x91, 0x15, 0xfe, 0x86, 0xc4, 0x55, 0x9e, 0xd7, 0x8e, 0xa6, 0x49, 0xe2, 0xad, 0xf5, 0xb1, + 0x32, 0xe2, 0xc3, 0x6f, 0x60, 0x77, 0x92, 0xa6, 0xc7, 0x32, 0x44, 0x45, 0xfa, 0x00, 0xdf, 0x09, + 0x3c, 0x4f, 0x30, 0xd0, 0x18, 0x0e, 0x3a, 0x64, 0x90, 0xbf, 0xce, 0xe7, 0x91, 0x52, 0x91, 0x98, + 0x0f, 0x1c, 0x72, 0x2b, 0xdf, 0xd5, 0xc9, 0x79, 0xa4, 0xb4, 0x1a, 0xb8, 0x46, 0x31, 0x49, 0x53, + 0x99, 0x9e, 0x9e, 0x9d, 0x29, 0xd4, 0x83, 0xf0, 0xe8, 0x6f, 0x17, 0x7a, 0x59, 0xce, 0xb5, 0x08, + 0xc8, 0x31, 0xec, 0x16, 0x14, 0x4a, 0x86, 0xad, 0xbc, 0x6a, 0x09, 0x66, 0x78, 0xb7, 0x9d, 0x73, + 0x33, 0x62, 0x79, 0x9a, 0x23, 0x1a, 0x9a, 0x22, 0x77, 0x37, 0x48, 0xa5, 0xe2, 0xc0, 0xe1, 0x41, + 0xbb, 0x71, 0x03, 0x27, 0x8e, 0xdb, 0x70, 0x4a, 0xbe, 0x6b, 0xc3, 0xa9, 0x11, 0x1d, 0x83, 0x41, + 0x45, 0xfe, 0x33, 0x9d, 0x22, 0x5f, 0x92, 0x83, 0x8d, 0xdd, 0xaa, 0xfd, 0x67, 0x18, 0xbe, 0xd1, + 0x7a, 0xe8, 0x3c, 0x74, 0x9e, 0x7c, 0xf4, 0xcf, 0xc5, 0xc8, 0x79, 0x7d, 0x31, 0x72, 0xfe, 0xbb, + 0x18, 0x39, 0x7f, 0x5e, 0x8e, 0x3a, 0xaf, 0x2f, 0x47, 0x9d, 0x7f, 0x2f, 0x47, 0x9d, 0x1f, 0x86, + 0xd7, 0xff, 0xa4, 0x78, 0x79, 0xc3, 0xfe, 0x79, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, + 0xf0, 0x9f, 0x14, 0x77, 0x08, 0x00, 0x00, } func (m *HeadSyncRange) Marshal() (dAtA []byte, err error) { @@ -1379,7 +1379,7 @@ func (m *ObjectSyncMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PushSpaceRequest) Marshal() (dAtA []byte, err error) { +func (m *SpacePushRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1389,12 +1389,12 @@ func (m *PushSpaceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PushSpaceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *SpacePushRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PushSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpacePushRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1414,7 +1414,7 @@ func (m *PushSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PushSpaceResponse) Marshal() (dAtA []byte, err error) { +func (m *SpacePushResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1424,12 +1424,12 @@ func (m *PushSpaceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PushSpaceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *SpacePushResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PushSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpacePushResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1437,7 +1437,7 @@ func (m *PushSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PullSpaceRequest) Marshal() (dAtA []byte, err error) { +func (m *SpacePullRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1447,12 +1447,12 @@ func (m *PullSpaceRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PullSpaceRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *SpacePullRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PullSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpacePullRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1467,7 +1467,7 @@ func (m *PullSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PullSpaceResponse) Marshal() (dAtA []byte, err error) { +func (m *SpacePullResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1477,12 +1477,12 @@ func (m *PullSpaceResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PullSpaceResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *SpacePullResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PullSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SpacePullResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1984,7 +1984,7 @@ func (m *ObjectSyncMessage) Size() (n int) { return n } -func (m *PushSpaceRequest) Size() (n int) { +func (m *SpacePushRequest) Size() (n int) { if m == nil { return 0 } @@ -1997,7 +1997,7 @@ func (m *PushSpaceRequest) Size() (n int) { return n } -func (m *PushSpaceResponse) Size() (n int) { +func (m *SpacePushResponse) Size() (n int) { if m == nil { return 0 } @@ -2006,7 +2006,7 @@ func (m *PushSpaceResponse) Size() (n int) { return n } -func (m *PullSpaceRequest) Size() (n int) { +func (m *SpacePullRequest) Size() (n int) { if m == nil { return 0 } @@ -2019,7 +2019,7 @@ func (m *PullSpaceRequest) Size() (n int) { return n } -func (m *PullSpaceResponse) Size() (n int) { +func (m *SpacePullResponse) Size() (n int) { if m == nil { return 0 } @@ -2937,7 +2937,7 @@ func (m *ObjectSyncMessage) Unmarshal(dAtA []byte) error { } return nil } -func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error { +func (m *SpacePushRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2960,10 +2960,10 @@ func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PushSpaceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: SpacePushRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PushSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpacePushRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3023,7 +3023,7 @@ func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error { +func (m *SpacePushResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3046,10 +3046,10 @@ func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PushSpaceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: SpacePushResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PushSpaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpacePushResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -3073,7 +3073,7 @@ func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error { +func (m *SpacePullRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3096,10 +3096,10 @@ func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PullSpaceRequest: wiretype end group for non-group") + return fmt.Errorf("proto: SpacePullRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PullSpaceRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpacePullRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3155,7 +3155,7 @@ func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *PullSpaceResponse) Unmarshal(dAtA []byte) error { +func (m *SpacePullResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3178,10 +3178,10 @@ func (m *PullSpaceResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PullSpaceResponse: wiretype end group for non-group") + return fmt.Errorf("proto: SpacePullResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PullSpaceResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: SpacePullResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/common/commonspace/spacesyncproto/spacesync_drpc.pb.go b/common/commonspace/spacesyncproto/spacesync_drpc.pb.go index b1a0a929..2c82a645 100644 --- a/common/commonspace/spacesyncproto/spacesync_drpc.pb.go +++ b/common/commonspace/spacesyncproto/spacesync_drpc.pb.go @@ -37,76 +37,76 @@ func (drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto) JSONU return jsonpb.Unmarshal(bytes.NewReader(buf), msg.(proto.Message)) } -type DRPCSpaceClient interface { +type DRPCSpaceSyncClient interface { DRPCConn() drpc.Conn HeadSync(ctx context.Context, in *HeadSyncRequest) (*HeadSyncResponse, error) - PushSpace(ctx context.Context, in *PushSpaceRequest) (*PushSpaceResponse, error) - PullSpace(ctx context.Context, in *PullSpaceRequest) (*PullSpaceResponse, error) - Stream(ctx context.Context) (DRPCSpace_StreamClient, error) + SpacePush(ctx context.Context, in *SpacePushRequest) (*SpacePushResponse, error) + SpacePull(ctx context.Context, in *SpacePullRequest) (*SpacePullResponse, error) + ObjectSyncStream(ctx context.Context) (DRPCSpaceSync_ObjectSyncStreamClient, error) } -type drpcSpaceClient struct { +type drpcSpaceSyncClient struct { cc drpc.Conn } -func NewDRPCSpaceClient(cc drpc.Conn) DRPCSpaceClient { - return &drpcSpaceClient{cc} +func NewDRPCSpaceSyncClient(cc drpc.Conn) DRPCSpaceSyncClient { + return &drpcSpaceSyncClient{cc} } -func (c *drpcSpaceClient) DRPCConn() drpc.Conn { return c.cc } +func (c *drpcSpaceSyncClient) DRPCConn() drpc.Conn { return c.cc } -func (c *drpcSpaceClient) HeadSync(ctx context.Context, in *HeadSyncRequest) (*HeadSyncResponse, error) { +func (c *drpcSpaceSyncClient) HeadSync(ctx context.Context, in *HeadSyncRequest) (*HeadSyncResponse, error) { out := new(HeadSyncResponse) - err := c.cc.Invoke(ctx, "/anySpace.Space/HeadSync", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) + err := c.cc.Invoke(ctx, "/spacesync.SpaceSync/HeadSync", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcSpaceClient) PushSpace(ctx context.Context, in *PushSpaceRequest) (*PushSpaceResponse, error) { - out := new(PushSpaceResponse) - err := c.cc.Invoke(ctx, "/anySpace.Space/PushSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) +func (c *drpcSpaceSyncClient) SpacePush(ctx context.Context, in *SpacePushRequest) (*SpacePushResponse, error) { + out := new(SpacePushResponse) + err := c.cc.Invoke(ctx, "/spacesync.SpaceSync/SpacePush", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcSpaceClient) PullSpace(ctx context.Context, in *PullSpaceRequest) (*PullSpaceResponse, error) { - out := new(PullSpaceResponse) - err := c.cc.Invoke(ctx, "/anySpace.Space/PullSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) +func (c *drpcSpaceSyncClient) SpacePull(ctx context.Context, in *SpacePullRequest) (*SpacePullResponse, error) { + out := new(SpacePullResponse) + err := c.cc.Invoke(ctx, "/spacesync.SpaceSync/SpacePull", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcSpaceClient) Stream(ctx context.Context) (DRPCSpace_StreamClient, error) { - stream, err := c.cc.NewStream(ctx, "/anySpace.Space/Stream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) +func (c *drpcSpaceSyncClient) ObjectSyncStream(ctx context.Context) (DRPCSpaceSync_ObjectSyncStreamClient, error) { + stream, err := c.cc.NewStream(ctx, "/spacesync.SpaceSync/ObjectSyncStream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) if err != nil { return nil, err } - x := &drpcSpace_StreamClient{stream} + x := &drpcSpaceSync_ObjectSyncStreamClient{stream} return x, nil } -type DRPCSpace_StreamClient interface { +type DRPCSpaceSync_ObjectSyncStreamClient interface { drpc.Stream Send(*ObjectSyncMessage) error Recv() (*ObjectSyncMessage, error) } -type drpcSpace_StreamClient struct { +type drpcSpaceSync_ObjectSyncStreamClient struct { drpc.Stream } -func (x *drpcSpace_StreamClient) Send(m *ObjectSyncMessage) error { +func (x *drpcSpaceSync_ObjectSyncStreamClient) Send(m *ObjectSyncMessage) error { return x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) } -func (x *drpcSpace_StreamClient) Recv() (*ObjectSyncMessage, error) { +func (x *drpcSpaceSync_ObjectSyncStreamClient) Recv() (*ObjectSyncMessage, error) { m := new(ObjectSyncMessage) if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { return nil, err @@ -114,148 +114,148 @@ func (x *drpcSpace_StreamClient) Recv() (*ObjectSyncMessage, error) { return m, nil } -func (x *drpcSpace_StreamClient) RecvMsg(m *ObjectSyncMessage) error { +func (x *drpcSpaceSync_ObjectSyncStreamClient) RecvMsg(m *ObjectSyncMessage) error { return x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) } -type DRPCSpaceServer interface { +type DRPCSpaceSyncServer interface { HeadSync(context.Context, *HeadSyncRequest) (*HeadSyncResponse, error) - PushSpace(context.Context, *PushSpaceRequest) (*PushSpaceResponse, error) - PullSpace(context.Context, *PullSpaceRequest) (*PullSpaceResponse, error) - Stream(DRPCSpace_StreamStream) error + SpacePush(context.Context, *SpacePushRequest) (*SpacePushResponse, error) + SpacePull(context.Context, *SpacePullRequest) (*SpacePullResponse, error) + ObjectSyncStream(DRPCSpaceSync_ObjectSyncStreamStream) error } -type DRPCSpaceUnimplementedServer struct{} +type DRPCSpaceSyncUnimplementedServer struct{} -func (s *DRPCSpaceUnimplementedServer) HeadSync(context.Context, *HeadSyncRequest) (*HeadSyncResponse, error) { +func (s *DRPCSpaceSyncUnimplementedServer) HeadSync(context.Context, *HeadSyncRequest) (*HeadSyncResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -func (s *DRPCSpaceUnimplementedServer) PushSpace(context.Context, *PushSpaceRequest) (*PushSpaceResponse, error) { +func (s *DRPCSpaceSyncUnimplementedServer) SpacePush(context.Context, *SpacePushRequest) (*SpacePushResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -func (s *DRPCSpaceUnimplementedServer) PullSpace(context.Context, *PullSpaceRequest) (*PullSpaceResponse, error) { +func (s *DRPCSpaceSyncUnimplementedServer) SpacePull(context.Context, *SpacePullRequest) (*SpacePullResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -func (s *DRPCSpaceUnimplementedServer) Stream(DRPCSpace_StreamStream) error { +func (s *DRPCSpaceSyncUnimplementedServer) ObjectSyncStream(DRPCSpaceSync_ObjectSyncStreamStream) error { return drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } -type DRPCSpaceDescription struct{} +type DRPCSpaceSyncDescription struct{} -func (DRPCSpaceDescription) NumMethods() int { return 4 } +func (DRPCSpaceSyncDescription) NumMethods() int { return 4 } -func (DRPCSpaceDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { +func (DRPCSpaceSyncDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { case 0: - return "/anySpace.Space/HeadSync", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, + return "/spacesync.SpaceSync/HeadSync", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCSpaceServer). + return srv.(DRPCSpaceSyncServer). HeadSync( ctx, in1.(*HeadSyncRequest), ) - }, DRPCSpaceServer.HeadSync, true + }, DRPCSpaceSyncServer.HeadSync, true case 1: - return "/anySpace.Space/PushSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, + return "/spacesync.SpaceSync/SpacePush", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCSpaceServer). - PushSpace( + return srv.(DRPCSpaceSyncServer). + SpacePush( ctx, - in1.(*PushSpaceRequest), + in1.(*SpacePushRequest), ) - }, DRPCSpaceServer.PushSpace, true + }, DRPCSpaceSyncServer.SpacePush, true case 2: - return "/anySpace.Space/PullSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, + return "/spacesync.SpaceSync/SpacePull", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCSpaceServer). - PullSpace( + return srv.(DRPCSpaceSyncServer). + SpacePull( ctx, - in1.(*PullSpaceRequest), + in1.(*SpacePullRequest), ) - }, DRPCSpaceServer.PullSpace, true + }, DRPCSpaceSyncServer.SpacePull, true case 3: - return "/anySpace.Space/Stream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, + return "/spacesync.SpaceSync/ObjectSyncStream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return nil, srv.(DRPCSpaceServer). - Stream( - &drpcSpace_StreamStream{in1.(drpc.Stream)}, + return nil, srv.(DRPCSpaceSyncServer). + ObjectSyncStream( + &drpcSpaceSync_ObjectSyncStreamStream{in1.(drpc.Stream)}, ) - }, DRPCSpaceServer.Stream, true + }, DRPCSpaceSyncServer.ObjectSyncStream, true default: return "", nil, nil, nil, false } } -func DRPCRegisterSpace(mux drpc.Mux, impl DRPCSpaceServer) error { - return mux.Register(impl, DRPCSpaceDescription{}) +func DRPCRegisterSpaceSync(mux drpc.Mux, impl DRPCSpaceSyncServer) error { + return mux.Register(impl, DRPCSpaceSyncDescription{}) } -type DRPCSpace_HeadSyncStream interface { +type DRPCSpaceSync_HeadSyncStream interface { drpc.Stream SendAndClose(*HeadSyncResponse) error } -type drpcSpace_HeadSyncStream struct { +type drpcSpaceSync_HeadSyncStream struct { drpc.Stream } -func (x *drpcSpace_HeadSyncStream) SendAndClose(m *HeadSyncResponse) error { +func (x *drpcSpaceSync_HeadSyncStream) SendAndClose(m *HeadSyncResponse) error { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCSpace_PushSpaceStream interface { +type DRPCSpaceSync_SpacePushStream interface { drpc.Stream - SendAndClose(*PushSpaceResponse) error + SendAndClose(*SpacePushResponse) error } -type drpcSpace_PushSpaceStream struct { +type drpcSpaceSync_SpacePushStream struct { drpc.Stream } -func (x *drpcSpace_PushSpaceStream) SendAndClose(m *PushSpaceResponse) error { +func (x *drpcSpaceSync_SpacePushStream) SendAndClose(m *SpacePushResponse) error { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCSpace_PullSpaceStream interface { +type DRPCSpaceSync_SpacePullStream interface { drpc.Stream - SendAndClose(*PullSpaceResponse) error + SendAndClose(*SpacePullResponse) error } -type drpcSpace_PullSpaceStream struct { +type drpcSpaceSync_SpacePullStream struct { drpc.Stream } -func (x *drpcSpace_PullSpaceStream) SendAndClose(m *PullSpaceResponse) error { +func (x *drpcSpaceSync_SpacePullStream) SendAndClose(m *SpacePullResponse) error { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCSpace_StreamStream interface { +type DRPCSpaceSync_ObjectSyncStreamStream interface { drpc.Stream Send(*ObjectSyncMessage) error Recv() (*ObjectSyncMessage, error) } -type drpcSpace_StreamStream struct { +type drpcSpaceSync_ObjectSyncStreamStream struct { drpc.Stream } -func (x *drpcSpace_StreamStream) Send(m *ObjectSyncMessage) error { +func (x *drpcSpaceSync_ObjectSyncStreamStream) Send(m *ObjectSyncMessage) error { return x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) } -func (x *drpcSpace_StreamStream) Recv() (*ObjectSyncMessage, error) { +func (x *drpcSpaceSync_ObjectSyncStreamStream) Recv() (*ObjectSyncMessage, error) { m := new(ObjectSyncMessage) if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { return nil, err @@ -263,6 +263,6 @@ func (x *drpcSpace_StreamStream) Recv() (*ObjectSyncMessage, error) { return m, nil } -func (x *drpcSpace_StreamStream) RecvMsg(m *ObjectSyncMessage) error { +func (x *drpcSpaceSync_ObjectSyncStreamStream) RecvMsg(m *ObjectSyncMessage) error { return x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) } diff --git a/node/nodespace/rpchandler.go b/node/nodespace/rpchandler.go index f7b3f6a1..0e9d7da4 100644 --- a/node/nodespace/rpchandler.go +++ b/node/nodespace/rpchandler.go @@ -10,7 +10,7 @@ type rpcHandler struct { s *service } -func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.PullSpaceRequest) (resp *spacesyncproto.PullSpaceResponse, err error) { +func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { sp, err := r.s.GetSpace(ctx, request.Id) if err != nil { if err != spacesyncproto.ErrSpaceMissing { @@ -25,7 +25,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull return } - resp = &spacesyncproto.PullSpaceResponse{ + resp = &spacesyncproto.SpacePullResponse{ Payload: &spacesyncproto.SpacePayload{ SpaceHeader: spaceDesc.SpaceHeader, AclPayloadId: spaceDesc.AclId, @@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull return } -func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpaceRequest) (resp *spacesyncproto.PushSpaceResponse, err error) { +func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { description := commonspace.SpaceDescription{ SpaceHeader: req.Payload.SpaceHeader, AclId: req.Payload.AclPayloadId, @@ -50,7 +50,7 @@ func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpac if err != nil { return } - resp = &spacesyncproto.PushSpaceResponse{} + resp = &spacesyncproto.SpacePushResponse{} return } @@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR return sp.SpaceSyncRpc().HeadSync(ctx, req) } -func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpace_StreamStream) error { +func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { msg, err := stream.Recv() if err != nil { return err From e736ff313f2aa3b72c0b663edf1271421620c774 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Sun, 25 Dec 2022 21:20:41 +0100 Subject: [PATCH 04/17] Add generation for textchanges in test client --- client/Makefile | 3 +- .../{api.pb.go => clientdebugrpc.pb.go} | 815 +++++++++--------- ...i_drpc.pb.go => clientdebugrpc_drpc.pb.go} | 102 +-- .../{api.proto => clientdebugrpc.proto} | 4 +- .../protos/{test.proto => textchange.proto} | 2 +- .../{test.pb.go => textchange.pb.go} | 159 ++-- common/Makefile | 1 - 7 files changed, 544 insertions(+), 542 deletions(-) rename client/debug/clientdebugrpc/clientdebugrpcproto/{api.pb.go => clientdebugrpc.pb.go} (83%) rename client/debug/clientdebugrpc/clientdebugrpcproto/{api_drpc.pb.go => clientdebugrpc_drpc.pb.go} (71%) rename client/debug/clientdebugrpc/clientdebugrpcproto/protos/{api.proto => clientdebugrpc.proto} (96%) rename client/document/textchangeproto/protos/{test.proto => textchange.proto} (85%) rename client/document/textchangeproto/{test.pb.go => textchange.pb.go} (80%) diff --git a/client/Makefile b/client/Makefile index 2c12bf1f..f8466e93 100644 --- a/client/Makefile +++ b/client/Makefile @@ -3,7 +3,8 @@ export GOPRIVATE=github.com/anytypeio proto: @$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1) - $(GOGO_START) protoc --gogofaster_out=:. --go-drpc_out=protolib=github.com/gogo/protobuf:. api/apiproto/protos/*.proto + $(GOGO_START) protoc --gogofaster_out=:. --go-drpc_out=protolib=github.com/gogo/protobuf:. debug/clientdebugrpc/clientdebugrpcproto/protos/*.proto + $(GOGO_START) protoc --gogofaster_out=:. document/textchangeproto/protos/*.proto build: @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-infrastructure-experiments/client)) diff --git a/client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go b/client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc.pb.go similarity index 83% rename from client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go rename to client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc.pb.go index 1a77d7b6..25ac5f66 100644 --- a/client/debug/clientdebugrpc/clientdebugrpcproto/api.pb.go +++ b/client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: api/apiproto/protos/api.proto +// source: debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto package clientdebugrpcproto @@ -29,7 +29,7 @@ func (m *CreateSpaceRequest) Reset() { *m = CreateSpaceRequest{} } func (m *CreateSpaceRequest) String() string { return proto.CompactTextString(m) } func (*CreateSpaceRequest) ProtoMessage() {} func (*CreateSpaceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{0} + return fileDescriptor_b1497d7bbf3441cb, []int{0} } func (m *CreateSpaceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -66,7 +66,7 @@ func (m *CreateSpaceResponse) Reset() { *m = CreateSpaceResponse{} } func (m *CreateSpaceResponse) String() string { return proto.CompactTextString(m) } func (*CreateSpaceResponse) ProtoMessage() {} func (*CreateSpaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{1} + return fileDescriptor_b1497d7bbf3441cb, []int{1} } func (m *CreateSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -109,7 +109,7 @@ func (m *DeriveSpaceRequest) Reset() { *m = DeriveSpaceRequest{} } func (m *DeriveSpaceRequest) String() string { return proto.CompactTextString(m) } func (*DeriveSpaceRequest) ProtoMessage() {} func (*DeriveSpaceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{2} + return fileDescriptor_b1497d7bbf3441cb, []int{2} } func (m *DeriveSpaceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,7 +146,7 @@ func (m *DeriveSpaceResponse) Reset() { *m = DeriveSpaceResponse{} } func (m *DeriveSpaceResponse) String() string { return proto.CompactTextString(m) } func (*DeriveSpaceResponse) ProtoMessage() {} func (*DeriveSpaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{3} + return fileDescriptor_b1497d7bbf3441cb, []int{3} } func (m *DeriveSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -190,7 +190,7 @@ func (m *CreateDocumentRequest) Reset() { *m = CreateDocumentRequest{} } func (m *CreateDocumentRequest) String() string { return proto.CompactTextString(m) } func (*CreateDocumentRequest) ProtoMessage() {} func (*CreateDocumentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{4} + return fileDescriptor_b1497d7bbf3441cb, []int{4} } func (m *CreateDocumentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,7 +234,7 @@ func (m *CreateDocumentResponse) Reset() { *m = CreateDocumentResponse{} func (m *CreateDocumentResponse) String() string { return proto.CompactTextString(m) } func (*CreateDocumentResponse) ProtoMessage() {} func (*CreateDocumentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{5} + return fileDescriptor_b1497d7bbf3441cb, []int{5} } func (m *CreateDocumentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ func (m *DeleteDocumentRequest) Reset() { *m = DeleteDocumentRequest{} } func (m *DeleteDocumentRequest) String() string { return proto.CompactTextString(m) } func (*DeleteDocumentRequest) ProtoMessage() {} func (*DeleteDocumentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{6} + return fileDescriptor_b1497d7bbf3441cb, []int{6} } func (m *DeleteDocumentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -329,7 +329,7 @@ func (m *DeleteDocumentResponse) Reset() { *m = DeleteDocumentResponse{} func (m *DeleteDocumentResponse) String() string { return proto.CompactTextString(m) } func (*DeleteDocumentResponse) ProtoMessage() {} func (*DeleteDocumentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{7} + return fileDescriptor_b1497d7bbf3441cb, []int{7} } func (m *DeleteDocumentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -369,7 +369,7 @@ func (m *AddTextRequest) Reset() { *m = AddTextRequest{} } func (m *AddTextRequest) String() string { return proto.CompactTextString(m) } func (*AddTextRequest) ProtoMessage() {} func (*AddTextRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{8} + return fileDescriptor_b1497d7bbf3441cb, []int{8} } func (m *AddTextRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -436,7 +436,7 @@ func (m *AddTextResponse) Reset() { *m = AddTextResponse{} } func (m *AddTextResponse) String() string { return proto.CompactTextString(m) } func (*AddTextResponse) ProtoMessage() {} func (*AddTextResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{9} + return fileDescriptor_b1497d7bbf3441cb, []int{9} } func (m *AddTextResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -495,7 +495,7 @@ func (m *DumpTreeRequest) Reset() { *m = DumpTreeRequest{} } func (m *DumpTreeRequest) String() string { return proto.CompactTextString(m) } func (*DumpTreeRequest) ProtoMessage() {} func (*DumpTreeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{10} + return fileDescriptor_b1497d7bbf3441cb, []int{10} } func (m *DumpTreeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -546,7 +546,7 @@ func (m *DumpTreeResponse) Reset() { *m = DumpTreeResponse{} } func (m *DumpTreeResponse) String() string { return proto.CompactTextString(m) } func (*DumpTreeResponse) ProtoMessage() {} func (*DumpTreeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{11} + return fileDescriptor_b1497d7bbf3441cb, []int{11} } func (m *DumpTreeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +590,7 @@ func (m *AllTreesRequest) Reset() { *m = AllTreesRequest{} } func (m *AllTreesRequest) String() string { return proto.CompactTextString(m) } func (*AllTreesRequest) ProtoMessage() {} func (*AllTreesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{12} + return fileDescriptor_b1497d7bbf3441cb, []int{12} } func (m *AllTreesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -635,7 +635,7 @@ func (m *Tree) Reset() { *m = Tree{} } func (m *Tree) String() string { return proto.CompactTextString(m) } func (*Tree) ProtoMessage() {} func (*Tree) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{13} + return fileDescriptor_b1497d7bbf3441cb, []int{13} } func (m *Tree) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -686,7 +686,7 @@ func (m *AllTreesResponse) Reset() { *m = AllTreesResponse{} } func (m *AllTreesResponse) String() string { return proto.CompactTextString(m) } func (*AllTreesResponse) ProtoMessage() {} func (*AllTreesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{14} + return fileDescriptor_b1497d7bbf3441cb, []int{14} } func (m *AllTreesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -729,7 +729,7 @@ func (m *AllSpacesRequest) Reset() { *m = AllSpacesRequest{} } func (m *AllSpacesRequest) String() string { return proto.CompactTextString(m) } func (*AllSpacesRequest) ProtoMessage() {} func (*AllSpacesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{15} + return fileDescriptor_b1497d7bbf3441cb, []int{15} } func (m *AllSpacesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -766,7 +766,7 @@ func (m *AllSpacesResponse) Reset() { *m = AllSpacesResponse{} } func (m *AllSpacesResponse) String() string { return proto.CompactTextString(m) } func (*AllSpacesResponse) ProtoMessage() {} func (*AllSpacesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{16} + return fileDescriptor_b1497d7bbf3441cb, []int{16} } func (m *AllSpacesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -810,7 +810,7 @@ func (m *LoadSpaceRequest) Reset() { *m = LoadSpaceRequest{} } func (m *LoadSpaceRequest) String() string { return proto.CompactTextString(m) } func (*LoadSpaceRequest) ProtoMessage() {} func (*LoadSpaceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{17} + return fileDescriptor_b1497d7bbf3441cb, []int{17} } func (m *LoadSpaceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -853,7 +853,7 @@ func (m *LoadSpaceResponse) Reset() { *m = LoadSpaceResponse{} } func (m *LoadSpaceResponse) String() string { return proto.CompactTextString(m) } func (*LoadSpaceResponse) ProtoMessage() {} func (*LoadSpaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{18} + return fileDescriptor_b1497d7bbf3441cb, []int{18} } func (m *LoadSpaceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -891,7 +891,7 @@ func (m *TreeParamsRequest) Reset() { *m = TreeParamsRequest{} } func (m *TreeParamsRequest) String() string { return proto.CompactTextString(m) } func (*TreeParamsRequest) ProtoMessage() {} func (*TreeParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{19} + return fileDescriptor_b1497d7bbf3441cb, []int{19} } func (m *TreeParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -943,7 +943,7 @@ func (m *TreeParamsResponse) Reset() { *m = TreeParamsResponse{} } func (m *TreeParamsResponse) String() string { return proto.CompactTextString(m) } func (*TreeParamsResponse) ProtoMessage() {} func (*TreeParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{20} + return fileDescriptor_b1497d7bbf3441cb, []int{20} } func (m *TreeParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -995,7 +995,7 @@ func (m *WatchRequest) Reset() { *m = WatchRequest{} } func (m *WatchRequest) String() string { return proto.CompactTextString(m) } func (*WatchRequest) ProtoMessage() {} func (*WatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{21} + return fileDescriptor_b1497d7bbf3441cb, []int{21} } func (m *WatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1045,7 +1045,7 @@ func (m *WatchResponse) Reset() { *m = WatchResponse{} } func (m *WatchResponse) String() string { return proto.CompactTextString(m) } func (*WatchResponse) ProtoMessage() {} func (*WatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{22} + return fileDescriptor_b1497d7bbf3441cb, []int{22} } func (m *WatchResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1083,7 +1083,7 @@ func (m *UnwatchRequest) Reset() { *m = UnwatchRequest{} } func (m *UnwatchRequest) String() string { return proto.CompactTextString(m) } func (*UnwatchRequest) ProtoMessage() {} func (*UnwatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{23} + return fileDescriptor_b1497d7bbf3441cb, []int{23} } func (m *UnwatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1133,7 +1133,7 @@ func (m *UnwatchResponse) Reset() { *m = UnwatchResponse{} } func (m *UnwatchResponse) String() string { return proto.CompactTextString(m) } func (*UnwatchResponse) ProtoMessage() {} func (*UnwatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{24} + return fileDescriptor_b1497d7bbf3441cb, []int{24} } func (m *UnwatchResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1171,7 +1171,7 @@ func (m *PutFileRequest) Reset() { *m = PutFileRequest{} } func (m *PutFileRequest) String() string { return proto.CompactTextString(m) } func (*PutFileRequest) ProtoMessage() {} func (*PutFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{25} + return fileDescriptor_b1497d7bbf3441cb, []int{25} } func (m *PutFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1222,7 +1222,7 @@ func (m *PutFileResponse) Reset() { *m = PutFileResponse{} } func (m *PutFileResponse) String() string { return proto.CompactTextString(m) } func (*PutFileResponse) ProtoMessage() {} func (*PutFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{26} + return fileDescriptor_b1497d7bbf3441cb, []int{26} } func (m *PutFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1267,7 +1267,7 @@ func (m *GetFileRequest) Reset() { *m = GetFileRequest{} } func (m *GetFileRequest) String() string { return proto.CompactTextString(m) } func (*GetFileRequest) ProtoMessage() {} func (*GetFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{27} + return fileDescriptor_b1497d7bbf3441cb, []int{27} } func (m *GetFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1318,7 +1318,7 @@ func (m *GetFileResponse) Reset() { *m = GetFileResponse{} } func (m *GetFileResponse) String() string { return proto.CompactTextString(m) } func (*GetFileResponse) ProtoMessage() {} func (*GetFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{28} + return fileDescriptor_b1497d7bbf3441cb, []int{28} } func (m *GetFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1362,7 +1362,7 @@ func (m *DeleteFileRequest) Reset() { *m = DeleteFileRequest{} } func (m *DeleteFileRequest) String() string { return proto.CompactTextString(m) } func (*DeleteFileRequest) ProtoMessage() {} func (*DeleteFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{29} + return fileDescriptor_b1497d7bbf3441cb, []int{29} } func (m *DeleteFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1405,7 +1405,7 @@ func (m *DeleteFileResponse) Reset() { *m = DeleteFileResponse{} } func (m *DeleteFileResponse) String() string { return proto.CompactTextString(m) } func (*DeleteFileResponse) ProtoMessage() {} func (*DeleteFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{30} + return fileDescriptor_b1497d7bbf3441cb, []int{30} } func (m *DeleteFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1435,94 +1435,97 @@ func (m *DeleteFileResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteFileResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*CreateSpaceRequest)(nil), "clientapi.CreateSpaceRequest") - proto.RegisterType((*CreateSpaceResponse)(nil), "clientapi.CreateSpaceResponse") - proto.RegisterType((*DeriveSpaceRequest)(nil), "clientapi.DeriveSpaceRequest") - proto.RegisterType((*DeriveSpaceResponse)(nil), "clientapi.DeriveSpaceResponse") - proto.RegisterType((*CreateDocumentRequest)(nil), "clientapi.CreateDocumentRequest") - proto.RegisterType((*CreateDocumentResponse)(nil), "clientapi.CreateDocumentResponse") - proto.RegisterType((*DeleteDocumentRequest)(nil), "clientapi.DeleteDocumentRequest") - proto.RegisterType((*DeleteDocumentResponse)(nil), "clientapi.DeleteDocumentResponse") - proto.RegisterType((*AddTextRequest)(nil), "clientapi.AddTextRequest") - proto.RegisterType((*AddTextResponse)(nil), "clientapi.AddTextResponse") - proto.RegisterType((*DumpTreeRequest)(nil), "clientapi.DumpTreeRequest") - proto.RegisterType((*DumpTreeResponse)(nil), "clientapi.DumpTreeResponse") - proto.RegisterType((*AllTreesRequest)(nil), "clientapi.AllTreesRequest") - proto.RegisterType((*Tree)(nil), "clientapi.Tree") - proto.RegisterType((*AllTreesResponse)(nil), "clientapi.AllTreesResponse") - proto.RegisterType((*AllSpacesRequest)(nil), "clientapi.AllSpacesRequest") - proto.RegisterType((*AllSpacesResponse)(nil), "clientapi.AllSpacesResponse") - proto.RegisterType((*LoadSpaceRequest)(nil), "clientapi.LoadSpaceRequest") - proto.RegisterType((*LoadSpaceResponse)(nil), "clientapi.LoadSpaceResponse") - proto.RegisterType((*TreeParamsRequest)(nil), "clientapi.TreeParamsRequest") - proto.RegisterType((*TreeParamsResponse)(nil), "clientapi.TreeParamsResponse") - proto.RegisterType((*WatchRequest)(nil), "clientapi.WatchRequest") - proto.RegisterType((*WatchResponse)(nil), "clientapi.WatchResponse") - proto.RegisterType((*UnwatchRequest)(nil), "clientapi.UnwatchRequest") - proto.RegisterType((*UnwatchResponse)(nil), "clientapi.UnwatchResponse") - proto.RegisterType((*PutFileRequest)(nil), "clientapi.PutFileRequest") - proto.RegisterType((*PutFileResponse)(nil), "clientapi.PutFileResponse") - proto.RegisterType((*GetFileRequest)(nil), "clientapi.GetFileRequest") - proto.RegisterType((*GetFileResponse)(nil), "clientapi.GetFileResponse") - proto.RegisterType((*DeleteFileRequest)(nil), "clientapi.DeleteFileRequest") - proto.RegisterType((*DeleteFileResponse)(nil), "clientapi.DeleteFileResponse") + proto.RegisterType((*CreateSpaceRequest)(nil), "clientdebugrpc.CreateSpaceRequest") + proto.RegisterType((*CreateSpaceResponse)(nil), "clientdebugrpc.CreateSpaceResponse") + proto.RegisterType((*DeriveSpaceRequest)(nil), "clientdebugrpc.DeriveSpaceRequest") + proto.RegisterType((*DeriveSpaceResponse)(nil), "clientdebugrpc.DeriveSpaceResponse") + proto.RegisterType((*CreateDocumentRequest)(nil), "clientdebugrpc.CreateDocumentRequest") + proto.RegisterType((*CreateDocumentResponse)(nil), "clientdebugrpc.CreateDocumentResponse") + proto.RegisterType((*DeleteDocumentRequest)(nil), "clientdebugrpc.DeleteDocumentRequest") + proto.RegisterType((*DeleteDocumentResponse)(nil), "clientdebugrpc.DeleteDocumentResponse") + proto.RegisterType((*AddTextRequest)(nil), "clientdebugrpc.AddTextRequest") + proto.RegisterType((*AddTextResponse)(nil), "clientdebugrpc.AddTextResponse") + proto.RegisterType((*DumpTreeRequest)(nil), "clientdebugrpc.DumpTreeRequest") + proto.RegisterType((*DumpTreeResponse)(nil), "clientdebugrpc.DumpTreeResponse") + proto.RegisterType((*AllTreesRequest)(nil), "clientdebugrpc.AllTreesRequest") + proto.RegisterType((*Tree)(nil), "clientdebugrpc.Tree") + proto.RegisterType((*AllTreesResponse)(nil), "clientdebugrpc.AllTreesResponse") + proto.RegisterType((*AllSpacesRequest)(nil), "clientdebugrpc.AllSpacesRequest") + proto.RegisterType((*AllSpacesResponse)(nil), "clientdebugrpc.AllSpacesResponse") + proto.RegisterType((*LoadSpaceRequest)(nil), "clientdebugrpc.LoadSpaceRequest") + proto.RegisterType((*LoadSpaceResponse)(nil), "clientdebugrpc.LoadSpaceResponse") + proto.RegisterType((*TreeParamsRequest)(nil), "clientdebugrpc.TreeParamsRequest") + proto.RegisterType((*TreeParamsResponse)(nil), "clientdebugrpc.TreeParamsResponse") + proto.RegisterType((*WatchRequest)(nil), "clientdebugrpc.WatchRequest") + proto.RegisterType((*WatchResponse)(nil), "clientdebugrpc.WatchResponse") + proto.RegisterType((*UnwatchRequest)(nil), "clientdebugrpc.UnwatchRequest") + proto.RegisterType((*UnwatchResponse)(nil), "clientdebugrpc.UnwatchResponse") + proto.RegisterType((*PutFileRequest)(nil), "clientdebugrpc.PutFileRequest") + proto.RegisterType((*PutFileResponse)(nil), "clientdebugrpc.PutFileResponse") + proto.RegisterType((*GetFileRequest)(nil), "clientdebugrpc.GetFileRequest") + proto.RegisterType((*GetFileResponse)(nil), "clientdebugrpc.GetFileResponse") + proto.RegisterType((*DeleteFileRequest)(nil), "clientdebugrpc.DeleteFileRequest") + proto.RegisterType((*DeleteFileResponse)(nil), "clientdebugrpc.DeleteFileResponse") } -func init() { proto.RegisterFile("api/apiproto/protos/api.proto", fileDescriptor_fc31080c27db9707) } +func init() { + proto.RegisterFile("debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto", fileDescriptor_b1497d7bbf3441cb) +} -var fileDescriptor_fc31080c27db9707 = []byte{ - // 813 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x4d, 0x4f, 0xdb, 0x4c, - 0x10, 0xc7, 0x71, 0x08, 0x90, 0x0c, 0x3c, 0x31, 0x59, 0x20, 0x8f, 0xeb, 0x12, 0x2b, 0x5d, 0x09, - 0x1a, 0xa9, 0x08, 0x54, 0x7a, 0x69, 0x7b, 0xa8, 0x78, 0x89, 0xa8, 0xa2, 0x52, 0x89, 0x06, 0x50, - 0xa5, 0xde, 0xb6, 0xf1, 0x4a, 0xb1, 0x94, 0xc4, 0x6e, 0xec, 0xb4, 0x9c, 0xfa, 0x19, 0xfa, 0xb1, - 0xda, 0x1b, 0xc7, 0x1e, 0x2b, 0xf8, 0x22, 0xd5, 0xda, 0x6b, 0xef, 0x8b, 0x13, 0xa2, 0x2a, 0x17, - 0xd8, 0xd9, 0x99, 0xf9, 0xcf, 0xd8, 0x3b, 0xfe, 0x6d, 0xa0, 0x4e, 0x02, 0xef, 0x80, 0x04, 0x5e, - 0x30, 0xf2, 0x23, 0xff, 0x20, 0xfe, 0x1b, 0x32, 0x7b, 0x3f, 0x5e, 0xa2, 0x72, 0xb7, 0xef, 0xd1, - 0x61, 0x44, 0x02, 0x0f, 0x6f, 0x02, 0x3a, 0x1d, 0x51, 0x12, 0xd1, 0xcb, 0x80, 0x74, 0x69, 0x87, - 0x7e, 0x19, 0xd3, 0x30, 0xc2, 0x3b, 0xb0, 0xa1, 0xec, 0x86, 0x81, 0x3f, 0x0c, 0x29, 0xaa, 0x40, - 0xc1, 0x73, 0x2d, 0xa3, 0x61, 0x34, 0xcb, 0x9d, 0x82, 0xe7, 0xb2, 0xe4, 0x16, 0x1d, 0x79, 0x5f, - 0x73, 0xc9, 0xca, 0xee, 0x94, 0xe4, 0xe7, 0xb0, 0x95, 0xd4, 0x68, 0xf9, 0xdd, 0xf1, 0x80, 0x0e, - 0x23, 0x9e, 0x8f, 0x2c, 0x58, 0x09, 0x59, 0x66, 0x3b, 0x8d, 0x4e, 0x4d, 0xdc, 0x84, 0x9a, 0x9e, - 0x32, 0x45, 0xfc, 0x03, 0x6c, 0xb5, 0x68, 0x9f, 0xfe, 0x83, 0x38, 0x72, 0x00, 0x5c, 0x1e, 0xdc, - 0x76, 0xad, 0x42, 0xec, 0x94, 0x76, 0xb0, 0x05, 0x35, 0x5d, 0x32, 0x29, 0x8e, 0xbf, 0x43, 0xe5, - 0xd8, 0x75, 0xaf, 0xe8, 0xcd, 0xfc, 0x55, 0x10, 0x82, 0x62, 0x44, 0x6f, 0x22, 0x6b, 0x31, 0xf6, - 0xc4, 0x6b, 0x96, 0xe3, 0x85, 0x97, 0x43, 0x12, 0x84, 0x3d, 0x3f, 0xb2, 0x8a, 0x0d, 0xa3, 0x59, - 0xea, 0x48, 0x3b, 0x98, 0x80, 0x99, 0xd5, 0xe7, 0xef, 0x43, 0x2d, 0x63, 0xe4, 0xca, 0xd4, 0x60, - 0xb9, 0x47, 0x89, 0x9b, 0xb5, 0xc0, 0x2d, 0xb6, 0x3f, 0xf2, 0x7d, 0x96, 0x93, 0x34, 0xc0, 0x2d, - 0xfc, 0x0e, 0xcc, 0xd6, 0x78, 0x10, 0x5c, 0x8d, 0x28, 0x9d, 0xff, 0x4d, 0xee, 0xc2, 0xba, 0x10, - 0xe3, 0x0d, 0x23, 0x28, 0xba, 0xe3, 0x41, 0xc0, 0xa5, 0xe2, 0x35, 0x7e, 0x06, 0xe6, 0x71, 0xbf, - 0xcf, 0xc2, 0xc2, 0xd9, 0xb3, 0xb1, 0x07, 0x45, 0x16, 0xa9, 0x4f, 0x02, 0xda, 0x84, 0x25, 0xf6, - 0x6c, 0xa1, 0x55, 0x68, 0x2c, 0x36, 0xcb, 0x9d, 0xc4, 0xc0, 0xaf, 0x60, 0x5d, 0x48, 0xf3, 0x16, - 0x76, 0x60, 0x29, 0x62, 0x1b, 0x96, 0xd1, 0x58, 0x6c, 0xae, 0x1e, 0x9a, 0xfb, 0xd9, 0x57, 0xb2, - 0x1f, 0xb7, 0x9a, 0x78, 0x31, 0x8a, 0x53, 0xe3, 0xd9, 0x4e, 0xdb, 0xc2, 0x07, 0x50, 0x95, 0xf6, - 0xb8, 0x9e, 0x0d, 0x25, 0xde, 0x5c, 0x22, 0x59, 0xee, 0x64, 0x36, 0xde, 0x83, 0xf5, 0x73, 0x9f, - 0xb8, 0xf2, 0x77, 0xf3, 0xc0, 0xb3, 0x6d, 0x40, 0x55, 0x8a, 0xe6, 0x53, 0xf7, 0x1e, 0xaa, 0xac, - 0xad, 0x0b, 0x32, 0x22, 0x83, 0x70, 0xfe, 0x43, 0x39, 0x03, 0x24, 0xcb, 0xf1, 0x67, 0x10, 0xf3, - 0x60, 0xc8, 0xf3, 0xc0, 0xea, 0x24, 0x13, 0x93, 0xbe, 0xd7, 0xd4, 0xc4, 0x47, 0xb0, 0xf6, 0x91, - 0x44, 0xdd, 0xde, 0xec, 0x8e, 0x6a, 0xb0, 0xcc, 0xde, 0xa8, 0x98, 0xc1, 0xc4, 0xc2, 0x26, 0xfc, - 0xc7, 0x15, 0xf8, 0x93, 0x9e, 0x40, 0xe5, 0x7a, 0xf8, 0x6d, 0x3e, 0xd1, 0x2a, 0x98, 0x99, 0x06, - 0x97, 0x7d, 0x03, 0x95, 0x8b, 0x71, 0x74, 0xe6, 0xf5, 0xb3, 0x13, 0x40, 0x50, 0x0c, 0x48, 0xd4, - 0x4b, 0x87, 0x90, 0xad, 0xe5, 0x52, 0x05, 0xf5, 0x54, 0x76, 0xc0, 0xcc, 0xf2, 0xc5, 0x14, 0xf7, - 0x48, 0x98, 0x09, 0xb0, 0x35, 0x7e, 0x09, 0x95, 0xb7, 0x54, 0x2f, 0xa3, 0x47, 0x65, 0xa5, 0x0b, - 0xa2, 0x34, 0x2b, 0x90, 0x65, 0x8a, 0x02, 0x7a, 0x87, 0xf8, 0x29, 0x54, 0x13, 0x30, 0xcd, 0xa8, - 0x91, 0xe0, 0x5a, 0x04, 0x26, 0x92, 0x87, 0xbf, 0x4a, 0x50, 0x3e, 0x8d, 0x27, 0xfd, 0x38, 0xf0, - 0xd0, 0x39, 0xac, 0x4a, 0xe4, 0x47, 0x75, 0xe9, 0x23, 0xc8, 0xdf, 0x13, 0xb6, 0x33, 0xcd, 0xcd, - 0xdb, 0x3d, 0x87, 0x55, 0xe9, 0x2a, 0x50, 0xd4, 0xf2, 0x17, 0x87, 0xa2, 0x36, 0xe9, 0x06, 0xb9, - 0x86, 0x8a, 0x8a, 0x7f, 0xd4, 0xc8, 0xd5, 0xd7, 0x78, 0x6f, 0x3f, 0x79, 0x20, 0x42, 0xc8, 0xaa, - 0x60, 0x57, 0x64, 0x27, 0x5e, 0x23, 0x8a, 0xec, 0xe4, 0x5b, 0x01, 0x1d, 0xc1, 0x0a, 0xa7, 0x32, - 0x7a, 0x24, 0x45, 0xab, 0x37, 0x85, 0x6d, 0x4f, 0x72, 0x71, 0x85, 0x53, 0x28, 0xa5, 0x9c, 0x44, - 0x72, 0x9c, 0x46, 0x62, 0xfb, 0xf1, 0x44, 0x1f, 0x17, 0x69, 0x03, 0x88, 0xef, 0x1a, 0x6d, 0x6b, - 0x50, 0x53, 0xe8, 0x61, 0xd7, 0xa7, 0x78, 0x45, 0x3f, 0x29, 0x34, 0x95, 0x7e, 0x34, 0x48, 0x2b, - 0xfd, 0xe4, 0x28, 0x7b, 0x06, 0xe5, 0x0c, 0x95, 0x48, 0x8b, 0x54, 0xa0, 0x6a, 0x6f, 0x4f, 0x76, - 0x0a, 0x9d, 0x8c, 0x89, 0x8a, 0x8e, 0xce, 0x55, 0x45, 0x27, 0x87, 0x51, 0xf4, 0x1a, 0x96, 0x62, - 0xda, 0xa0, 0xff, 0xa5, 0x30, 0x99, 0x60, 0xb6, 0x95, 0x77, 0x88, 0x23, 0xe6, 0x50, 0x51, 0x8e, - 0x58, 0x85, 0x95, 0x72, 0xc4, 0x1a, 0x83, 0x98, 0x02, 0x67, 0x88, 0xa2, 0xa0, 0x72, 0x49, 0x51, - 0xd0, 0x91, 0x73, 0x04, 0x2b, 0x1c, 0x12, 0x8a, 0x82, 0x8a, 0x1c, 0x45, 0x41, 0x67, 0x4a, 0x1b, - 0x40, 0x60, 0x41, 0x99, 0x90, 0x1c, 0x56, 0xec, 0xfa, 0x14, 0x6f, 0x22, 0x75, 0xb2, 0xfb, 0xf3, - 0xce, 0x31, 0x6e, 0xef, 0x1c, 0xe3, 0xcf, 0x9d, 0x63, 0xfc, 0xb8, 0x77, 0x16, 0x6e, 0xef, 0x9d, - 0x85, 0xdf, 0xf7, 0xce, 0xc2, 0xa7, 0x35, 0xf9, 0x17, 0xe9, 0xe7, 0xe5, 0xf8, 0xdf, 0x8b, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x55, 0x8b, 0x17, 0x27, 0xa8, 0x0a, 0x00, 0x00, +var fileDescriptor_b1497d7bbf3441cb = []byte{ + // 819 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xad, 0xd3, 0xf4, 0x23, 0x53, 0x70, 0x9a, 0x6d, 0x1b, 0x59, 0x16, 0x98, 0x74, 0x51, 0x4b, + 0x04, 0x55, 0x2b, 0xca, 0x85, 0x53, 0x45, 0xdb, 0xa8, 0xa8, 0x85, 0x4a, 0x25, 0x29, 0x45, 0xe2, + 0x82, 0xdc, 0x78, 0x45, 0x2c, 0x25, 0xb1, 0xb1, 0x1d, 0xe8, 0x89, 0xdf, 0xc0, 0xcf, 0xe2, 0xd8, + 0x23, 0x37, 0x50, 0xf3, 0x47, 0xd0, 0xda, 0x6b, 0xaf, 0x77, 0x37, 0x1f, 0xa0, 0x5c, 0xda, 0xdd, + 0xd9, 0x37, 0xef, 0x8d, 0xd7, 0xe3, 0x37, 0x81, 0x86, 0x43, 0xae, 0x07, 0x9f, 0xf7, 0xda, 0x5d, + 0x97, 0xf4, 0xa3, 0x78, 0x1d, 0xf8, 0x6d, 0x69, 0xeb, 0x07, 0x5e, 0xe4, 0xed, 0xc5, 0x7f, 0x43, + 0xe9, 0x68, 0x37, 0x8e, 0x22, 0x5d, 0x8c, 0xe2, 0x75, 0x40, 0xc7, 0x01, 0xb1, 0x23, 0xd2, 0xf2, + 0xed, 0x36, 0x69, 0x92, 0x2f, 0x03, 0x12, 0x46, 0x78, 0x0b, 0xd6, 0x84, 0x68, 0xe8, 0x7b, 0xfd, + 0x90, 0x20, 0x1d, 0x0a, 0xae, 0x63, 0x68, 0x35, 0xad, 0x5e, 0x6a, 0x16, 0x5c, 0x87, 0x26, 0x37, + 0x48, 0xe0, 0x7e, 0x55, 0x92, 0x85, 0xe8, 0x98, 0xe4, 0xe7, 0xb0, 0x91, 0x68, 0x34, 0xbc, 0xf6, + 0xa0, 0x47, 0xfa, 0x11, 0xcb, 0x47, 0x06, 0x2c, 0x85, 0x34, 0xf3, 0x34, 0x45, 0xa7, 0x5b, 0x5c, + 0x87, 0xaa, 0x9c, 0x32, 0x86, 0xfc, 0x1d, 0x6c, 0x34, 0x48, 0x97, 0xfc, 0x07, 0x39, 0xb2, 0x00, + 0x1c, 0x06, 0x3e, 0x75, 0x8c, 0x42, 0x7c, 0x98, 0x8b, 0x60, 0x03, 0xaa, 0x32, 0x65, 0x22, 0x8e, + 0xbf, 0x83, 0x7e, 0xe8, 0x38, 0x97, 0xe4, 0x66, 0x76, 0x15, 0x84, 0xa0, 0x18, 0x91, 0x9b, 0xc8, + 0x98, 0x8f, 0x4f, 0xe2, 0x35, 0xcd, 0x71, 0xc3, 0x56, 0xdf, 0xf6, 0xc3, 0x8e, 0x17, 0x19, 0xc5, + 0x9a, 0x56, 0x5f, 0x6e, 0xe6, 0x22, 0xd8, 0x86, 0x72, 0xa6, 0xcf, 0xee, 0x43, 0x94, 0xd1, 0x14, + 0x99, 0x2a, 0x2c, 0x76, 0x88, 0xed, 0x64, 0x25, 0xb0, 0x1d, 0x8d, 0x07, 0x9e, 0x47, 0x73, 0x92, + 0x02, 0xd8, 0x0e, 0xbf, 0x81, 0x72, 0x63, 0xd0, 0xf3, 0x2f, 0x03, 0x42, 0x66, 0xbf, 0xc9, 0x6d, + 0x58, 0xe5, 0x64, 0xac, 0x60, 0x04, 0x45, 0x67, 0xd0, 0xf3, 0x19, 0x55, 0xbc, 0xc6, 0xcf, 0xa0, + 0x7c, 0xd8, 0xed, 0x52, 0x58, 0x38, 0xbd, 0x37, 0x76, 0xa0, 0x48, 0x91, 0x72, 0x27, 0xa0, 0x75, + 0x58, 0xa0, 0xcf, 0x16, 0x1a, 0x85, 0xda, 0x7c, 0xbd, 0xd4, 0x4c, 0x36, 0xf8, 0x00, 0x56, 0x39, + 0x35, 0x2b, 0xe1, 0x29, 0x2c, 0x44, 0x34, 0x60, 0x68, 0xb5, 0xf9, 0xfa, 0xca, 0xfe, 0xfa, 0xae, + 0xf4, 0x01, 0xc5, 0xf5, 0x26, 0x10, 0x8c, 0xe2, 0xfc, 0xb8, 0xc1, 0xd3, 0xda, 0xf0, 0x1e, 0x54, + 0x72, 0x31, 0x46, 0x6a, 0xc2, 0x32, 0xab, 0x30, 0xe1, 0x2d, 0x35, 0xb3, 0x3d, 0xde, 0x81, 0xd5, + 0xb7, 0x9e, 0xed, 0xe4, 0x3f, 0x9e, 0x09, 0x0f, 0xb8, 0x06, 0x95, 0x1c, 0x9a, 0xb5, 0xde, 0x39, + 0x54, 0x68, 0x59, 0x17, 0x76, 0x60, 0xf7, 0xc2, 0xd9, 0xdf, 0xcc, 0x09, 0xa0, 0x3c, 0x1d, 0x7b, + 0x06, 0xde, 0x14, 0x5a, 0xbe, 0x29, 0xa8, 0x4e, 0xd2, 0x36, 0xe9, 0xe5, 0xa6, 0x5b, 0xfc, 0x0a, + 0xee, 0x7d, 0xb0, 0xa3, 0x76, 0x67, 0x7a, 0x45, 0x55, 0x58, 0xa4, 0x37, 0xca, 0x1b, 0x31, 0xd9, + 0xe1, 0x32, 0xdc, 0x67, 0x0c, 0xec, 0x49, 0x8f, 0x40, 0x7f, 0xdf, 0xff, 0x36, 0x1b, 0x69, 0x05, + 0xca, 0x19, 0x07, 0xa3, 0x3d, 0x00, 0xfd, 0x62, 0x10, 0x9d, 0xb8, 0xdd, 0xec, 0x0d, 0x20, 0x28, + 0xfa, 0x76, 0xd4, 0x49, 0x3b, 0x91, 0xae, 0xf3, 0x52, 0x05, 0xf1, 0xad, 0x6c, 0x41, 0x39, 0xcb, + 0xe7, 0xad, 0xdc, 0xb1, 0xc3, 0x8c, 0x80, 0xae, 0xf1, 0x4b, 0xd0, 0x5f, 0x13, 0x59, 0x46, 0x46, + 0x65, 0xd2, 0x05, 0x2e, 0x4d, 0x05, 0xb2, 0x4c, 0x2e, 0x20, 0x57, 0x88, 0x9f, 0x40, 0x25, 0x71, + 0xa7, 0x29, 0x1a, 0x89, 0x67, 0x73, 0x60, 0x42, 0xb9, 0xff, 0xbb, 0x04, 0xa5, 0xe3, 0xb8, 0xdd, + 0x0f, 0x7d, 0x17, 0x5d, 0xc1, 0x4a, 0xce, 0xfe, 0x11, 0x96, 0xbf, 0x04, 0x75, 0x62, 0x98, 0x8f, + 0x27, 0x62, 0x58, 0xe1, 0x57, 0xb0, 0x92, 0x9b, 0x0c, 0x2a, 0xaf, 0x3a, 0x4c, 0x54, 0xde, 0x51, + 0xa3, 0xe5, 0x13, 0xe8, 0xe2, 0x5c, 0x40, 0x5b, 0xa3, 0xcb, 0x91, 0xa6, 0x81, 0xb9, 0x3d, 0x0d, + 0xc6, 0x05, 0x44, 0xef, 0x57, 0x05, 0x46, 0x8e, 0x1b, 0x55, 0x60, 0xf4, 0x08, 0x41, 0x67, 0xb0, + 0xc4, 0x2c, 0x1c, 0x59, 0x72, 0x8a, 0x38, 0x5b, 0xcc, 0x47, 0x63, 0xcf, 0x19, 0xd7, 0x39, 0x2c, + 0xa7, 0xf6, 0x8a, 0x14, 0xb0, 0xe4, 0xe2, 0x66, 0x6d, 0x3c, 0x80, 0xd1, 0xb5, 0x00, 0xb8, 0x27, + 0xa0, 0xcd, 0x51, 0xae, 0x28, 0xd8, 0x8f, 0x89, 0x27, 0x41, 0x78, 0x8d, 0xa9, 0xff, 0xaa, 0x35, + 0x4a, 0xa6, 0xaf, 0xd6, 0xa8, 0x58, 0xf7, 0x05, 0x94, 0x32, 0xeb, 0x45, 0xa3, 0xe0, 0x82, 0x53, + 0x9b, 0x9b, 0x13, 0x10, 0x9c, 0x31, 0x73, 0x5b, 0x95, 0x51, 0xb6, 0x6d, 0x95, 0x51, 0xb1, 0x6a, + 0xd4, 0x80, 0x85, 0xd8, 0xd1, 0xd0, 0x03, 0x19, 0x9b, 0xb7, 0x4a, 0xf3, 0xe1, 0x98, 0x53, 0xde, + 0x28, 0xcc, 0xc2, 0xd4, 0x46, 0x11, 0xfd, 0x51, 0x6d, 0x14, 0xc9, 0xfb, 0x28, 0x17, 0xf3, 0x2e, + 0x95, 0x4b, 0x34, 0x45, 0x95, 0x4b, 0x36, 0xbd, 0x33, 0x58, 0x62, 0x36, 0xa5, 0x72, 0x89, 0xce, + 0xa7, 0x72, 0xc9, 0xfe, 0xd6, 0x02, 0xe0, 0x16, 0xa5, 0x76, 0x9c, 0xe2, 0x73, 0x26, 0x9e, 0x04, + 0x49, 0x48, 0x8f, 0x8e, 0x7e, 0xde, 0x59, 0xda, 0xed, 0x9d, 0xa5, 0xfd, 0xb9, 0xb3, 0xb4, 0x1f, + 0x43, 0x6b, 0xee, 0x76, 0x68, 0xcd, 0xfd, 0x1a, 0x5a, 0x73, 0x1f, 0xeb, 0xff, 0xfa, 0xc3, 0xfa, + 0x7a, 0x31, 0xfe, 0xf7, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x4d, 0xcd, 0x76, 0x8b, + 0x0b, 0x00, 0x00, } func (m *CreateSpaceRequest) Marshal() (dAtA []byte, err error) { @@ -1571,7 +1574,7 @@ func (m *CreateSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Id) > 0 { i -= len(m.Id) copy(dAtA[i:], m.Id) - i = encodeVarintApi(dAtA, i, uint64(len(m.Id))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Id))) i-- dAtA[i] = 0xa } @@ -1624,7 +1627,7 @@ func (m *DeriveSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Id) > 0 { i -= len(m.Id) copy(dAtA[i:], m.Id) - i = encodeVarintApi(dAtA, i, uint64(len(m.Id))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Id))) i-- dAtA[i] = 0xa } @@ -1654,7 +1657,7 @@ func (m *CreateDocumentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -1684,7 +1687,7 @@ func (m *CreateDocumentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) if len(m.Id) > 0 { i -= len(m.Id) copy(dAtA[i:], m.Id) - i = encodeVarintApi(dAtA, i, uint64(len(m.Id))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Id))) i-- dAtA[i] = 0xa } @@ -1714,14 +1717,14 @@ func (m *DeleteDocumentRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -1784,21 +1787,21 @@ func (m *AddTextRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Text) > 0 { i -= len(m.Text) copy(dAtA[i:], m.Text) - i = encodeVarintApi(dAtA, i, uint64(len(m.Text))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Text))) i-- dAtA[i] = 0x1a } if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -1828,21 +1831,21 @@ func (m *AddTextResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.RootId) > 0 { i -= len(m.RootId) copy(dAtA[i:], m.RootId) - i = encodeVarintApi(dAtA, i, uint64(len(m.RootId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.RootId))) i-- dAtA[i] = 0x1a } if len(m.HeadId) > 0 { i -= len(m.HeadId) copy(dAtA[i:], m.HeadId) - i = encodeVarintApi(dAtA, i, uint64(len(m.HeadId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.HeadId))) i-- dAtA[i] = 0x12 } if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0xa } @@ -1872,14 +1875,14 @@ func (m *DumpTreeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -1909,7 +1912,7 @@ func (m *DumpTreeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Dump) > 0 { i -= len(m.Dump) copy(dAtA[i:], m.Dump) - i = encodeVarintApi(dAtA, i, uint64(len(m.Dump))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Dump))) i-- dAtA[i] = 0xa } @@ -1939,7 +1942,7 @@ func (m *AllTreesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -1970,7 +1973,7 @@ func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.Heads) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Heads[iNdEx]) copy(dAtA[i:], m.Heads[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.Heads[iNdEx]))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Heads[iNdEx]))) i-- dAtA[i] = 0x12 } @@ -1978,7 +1981,7 @@ func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Id) > 0 { i -= len(m.Id) copy(dAtA[i:], m.Id) - i = encodeVarintApi(dAtA, i, uint64(len(m.Id))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Id))) i-- dAtA[i] = 0xa } @@ -2013,7 +2016,7 @@ func (m *AllTreesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintApi(dAtA, i, uint64(size)) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -2069,7 +2072,7 @@ func (m *AllSpacesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.SpaceIds) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.SpaceIds[iNdEx]) copy(dAtA[i:], m.SpaceIds[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceIds[iNdEx]))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceIds[iNdEx]))) i-- dAtA[i] = 0xa } @@ -2100,7 +2103,7 @@ func (m *LoadSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -2153,14 +2156,14 @@ func (m *TreeParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -2191,7 +2194,7 @@ func (m *TreeParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.HeadIds) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.HeadIds[iNdEx]) copy(dAtA[i:], m.HeadIds[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.HeadIds[iNdEx]))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.HeadIds[iNdEx]))) i-- dAtA[i] = 0x12 } @@ -2199,7 +2202,7 @@ func (m *TreeParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.RootId) > 0 { i -= len(m.RootId) copy(dAtA[i:], m.RootId) - i = encodeVarintApi(dAtA, i, uint64(len(m.RootId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.RootId))) i-- dAtA[i] = 0xa } @@ -2229,14 +2232,14 @@ func (m *WatchRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.TreeId) > 0 { i -= len(m.TreeId) copy(dAtA[i:], m.TreeId) - i = encodeVarintApi(dAtA, i, uint64(len(m.TreeId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.TreeId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -2289,14 +2292,14 @@ func (m *UnwatchRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.TreeId) > 0 { i -= len(m.TreeId) copy(dAtA[i:], m.TreeId) - i = encodeVarintApi(dAtA, i, uint64(len(m.TreeId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.TreeId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -2349,14 +2352,14 @@ func (m *PutFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0x12 } if len(m.Path) > 0 { i -= len(m.Path) copy(dAtA[i:], m.Path) - i = encodeVarintApi(dAtA, i, uint64(len(m.Path))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Path))) i-- dAtA[i] = 0xa } @@ -2386,7 +2389,7 @@ func (m *PutFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Hash) > 0 { i -= len(m.Hash) copy(dAtA[i:], m.Hash) - i = encodeVarintApi(dAtA, i, uint64(len(m.Hash))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Hash))) i-- dAtA[i] = 0xa } @@ -2416,14 +2419,14 @@ func (m *GetFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Path) > 0 { i -= len(m.Path) copy(dAtA[i:], m.Path) - i = encodeVarintApi(dAtA, i, uint64(len(m.Path))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Path))) i-- dAtA[i] = 0x12 } if len(m.Hash) > 0 { i -= len(m.Hash) copy(dAtA[i:], m.Hash) - i = encodeVarintApi(dAtA, i, uint64(len(m.Hash))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Hash))) i-- dAtA[i] = 0xa } @@ -2453,7 +2456,7 @@ func (m *GetFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Path) > 0 { i -= len(m.Path) copy(dAtA[i:], m.Path) - i = encodeVarintApi(dAtA, i, uint64(len(m.Path))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Path))) i-- dAtA[i] = 0xa } @@ -2483,7 +2486,7 @@ func (m *DeleteFileRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Hash) > 0 { i -= len(m.Hash) copy(dAtA[i:], m.Hash) - i = encodeVarintApi(dAtA, i, uint64(len(m.Hash))) + i = encodeVarintClientdebugrpc(dAtA, i, uint64(len(m.Hash))) i-- dAtA[i] = 0xa } @@ -2513,8 +2516,8 @@ func (m *DeleteFileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintApi(dAtA []byte, offset int, v uint64) int { - offset -= sovApi(v) +func encodeVarintClientdebugrpc(dAtA []byte, offset int, v uint64) int { + offset -= sovClientdebugrpc(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -2541,7 +2544,7 @@ func (m *CreateSpaceResponse) Size() (n int) { _ = l l = len(m.Id) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2563,7 +2566,7 @@ func (m *DeriveSpaceResponse) Size() (n int) { _ = l l = len(m.Id) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2576,7 +2579,7 @@ func (m *CreateDocumentRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2589,7 +2592,7 @@ func (m *CreateDocumentResponse) Size() (n int) { _ = l l = len(m.Id) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2602,11 +2605,11 @@ func (m *DeleteDocumentRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2628,15 +2631,15 @@ func (m *AddTextRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.Text) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } if m.IsSnapshot { n += 2 @@ -2652,15 +2655,15 @@ func (m *AddTextResponse) Size() (n int) { _ = l l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.HeadId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.RootId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2673,11 +2676,11 @@ func (m *DumpTreeRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2690,7 +2693,7 @@ func (m *DumpTreeResponse) Size() (n int) { _ = l l = len(m.Dump) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2703,7 +2706,7 @@ func (m *AllTreesRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2716,12 +2719,12 @@ func (m *Tree) Size() (n int) { _ = l l = len(m.Id) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } if len(m.Heads) > 0 { for _, s := range m.Heads { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } } return n @@ -2736,7 +2739,7 @@ func (m *AllTreesResponse) Size() (n int) { if len(m.Trees) > 0 { for _, e := range m.Trees { l = e.Size() - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } } return n @@ -2760,7 +2763,7 @@ func (m *AllSpacesResponse) Size() (n int) { if len(m.SpaceIds) > 0 { for _, s := range m.SpaceIds { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } } return n @@ -2774,7 +2777,7 @@ func (m *LoadSpaceRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2796,11 +2799,11 @@ func (m *TreeParamsRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2813,12 +2816,12 @@ func (m *TreeParamsResponse) Size() (n int) { _ = l l = len(m.RootId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } if len(m.HeadIds) > 0 { for _, s := range m.HeadIds { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } } return n @@ -2832,11 +2835,11 @@ func (m *WatchRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.TreeId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2858,11 +2861,11 @@ func (m *UnwatchRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.TreeId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2884,11 +2887,11 @@ func (m *PutFileRequest) Size() (n int) { _ = l l = len(m.Path) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2901,7 +2904,7 @@ func (m *PutFileResponse) Size() (n int) { _ = l l = len(m.Hash) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2914,11 +2917,11 @@ func (m *GetFileRequest) Size() (n int) { _ = l l = len(m.Hash) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } l = len(m.Path) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2931,7 +2934,7 @@ func (m *GetFileResponse) Size() (n int) { _ = l l = len(m.Path) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2944,7 +2947,7 @@ func (m *DeleteFileRequest) Size() (n int) { _ = l l = len(m.Hash) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovClientdebugrpc(uint64(l)) } return n } @@ -2958,11 +2961,11 @@ func (m *DeleteFileResponse) Size() (n int) { return n } -func sovApi(x uint64) (n int) { +func sovClientdebugrpc(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozApi(x uint64) (n int) { - return sovApi(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozClientdebugrpc(x uint64) (n int) { + return sovClientdebugrpc(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *CreateSpaceRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -2972,7 +2975,7 @@ func (m *CreateSpaceRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2995,12 +2998,12 @@ func (m *CreateSpaceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3022,7 +3025,7 @@ func (m *CreateSpaceResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3050,7 +3053,7 @@ func (m *CreateSpaceResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3064,11 +3067,11 @@ func (m *CreateSpaceResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3077,12 +3080,12 @@ func (m *CreateSpaceResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3104,7 +3107,7 @@ func (m *DeriveSpaceRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3127,12 +3130,12 @@ func (m *DeriveSpaceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3154,7 +3157,7 @@ func (m *DeriveSpaceResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3182,7 +3185,7 @@ func (m *DeriveSpaceResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3196,11 +3199,11 @@ func (m *DeriveSpaceResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3209,12 +3212,12 @@ func (m *DeriveSpaceResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3236,7 +3239,7 @@ func (m *CreateDocumentRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3264,7 +3267,7 @@ func (m *CreateDocumentRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3278,11 +3281,11 @@ func (m *CreateDocumentRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3291,12 +3294,12 @@ func (m *CreateDocumentRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3318,7 +3321,7 @@ func (m *CreateDocumentResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3346,7 +3349,7 @@ func (m *CreateDocumentResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3360,11 +3363,11 @@ func (m *CreateDocumentResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3373,12 +3376,12 @@ func (m *CreateDocumentResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3400,7 +3403,7 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3428,7 +3431,7 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3442,11 +3445,11 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3460,7 +3463,7 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3474,11 +3477,11 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3487,12 +3490,12 @@ func (m *DeleteDocumentRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3514,7 +3517,7 @@ func (m *DeleteDocumentResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3537,12 +3540,12 @@ func (m *DeleteDocumentResponse) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3564,7 +3567,7 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3592,7 +3595,7 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3606,11 +3609,11 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3624,7 +3627,7 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3638,11 +3641,11 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3656,7 +3659,7 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3670,11 +3673,11 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3688,7 +3691,7 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3703,12 +3706,12 @@ func (m *AddTextRequest) Unmarshal(dAtA []byte) error { m.IsSnapshot = bool(v != 0) default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3730,7 +3733,7 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3758,7 +3761,7 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3772,11 +3775,11 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3790,7 +3793,7 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3804,11 +3807,11 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3822,7 +3825,7 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3836,11 +3839,11 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3849,12 +3852,12 @@ func (m *AddTextResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3876,7 +3879,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3904,7 +3907,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3918,11 +3921,11 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3936,7 +3939,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3950,11 +3953,11 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -3963,12 +3966,12 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3990,7 +3993,7 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4018,7 +4021,7 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4032,11 +4035,11 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4045,12 +4048,12 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4072,7 +4075,7 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4100,7 +4103,7 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4114,11 +4117,11 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4127,12 +4130,12 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4154,7 +4157,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4182,7 +4185,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4196,11 +4199,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4214,7 +4217,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4228,11 +4231,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4241,12 +4244,12 @@ func (m *Tree) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4268,7 +4271,7 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4296,7 +4299,7 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4309,11 +4312,11 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4325,12 +4328,12 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4352,7 +4355,7 @@ func (m *AllSpacesRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4375,12 +4378,12 @@ func (m *AllSpacesRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4402,7 +4405,7 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4430,7 +4433,7 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4444,11 +4447,11 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4457,12 +4460,12 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4484,7 +4487,7 @@ func (m *LoadSpaceRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4512,7 +4515,7 @@ func (m *LoadSpaceRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4526,11 +4529,11 @@ func (m *LoadSpaceRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4539,12 +4542,12 @@ func (m *LoadSpaceRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4566,7 +4569,7 @@ func (m *LoadSpaceResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4589,12 +4592,12 @@ func (m *LoadSpaceResponse) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4616,7 +4619,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4644,7 +4647,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4658,11 +4661,11 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4676,7 +4679,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4690,11 +4693,11 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4703,12 +4706,12 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4730,7 +4733,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4758,7 +4761,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4772,11 +4775,11 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4790,7 +4793,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4804,11 +4807,11 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4817,12 +4820,12 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4844,7 +4847,7 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4872,7 +4875,7 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4886,11 +4889,11 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4904,7 +4907,7 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4918,11 +4921,11 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -4931,12 +4934,12 @@ func (m *WatchRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4958,7 +4961,7 @@ func (m *WatchResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4981,12 +4984,12 @@ func (m *WatchResponse) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5008,7 +5011,7 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5036,7 +5039,7 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5050,11 +5053,11 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5068,7 +5071,7 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5082,11 +5085,11 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5095,12 +5098,12 @@ func (m *UnwatchRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5122,7 +5125,7 @@ func (m *UnwatchResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5145,12 +5148,12 @@ func (m *UnwatchResponse) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5172,7 +5175,7 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5200,7 +5203,7 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5214,11 +5217,11 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5232,7 +5235,7 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5246,11 +5249,11 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5259,12 +5262,12 @@ func (m *PutFileRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5286,7 +5289,7 @@ func (m *PutFileResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5314,7 +5317,7 @@ func (m *PutFileResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5328,11 +5331,11 @@ func (m *PutFileResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5341,12 +5344,12 @@ func (m *PutFileResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5368,7 +5371,7 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5396,7 +5399,7 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5410,11 +5413,11 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5428,7 +5431,7 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5442,11 +5445,11 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5455,12 +5458,12 @@ func (m *GetFileRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5482,7 +5485,7 @@ func (m *GetFileResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5510,7 +5513,7 @@ func (m *GetFileResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5524,11 +5527,11 @@ func (m *GetFileResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5537,12 +5540,12 @@ func (m *GetFileResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5564,7 +5567,7 @@ func (m *DeleteFileRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5592,7 +5595,7 @@ func (m *DeleteFileRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5606,11 +5609,11 @@ func (m *DeleteFileRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -5619,12 +5622,12 @@ func (m *DeleteFileRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5646,7 +5649,7 @@ func (m *DeleteFileResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowClientdebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -5669,12 +5672,12 @@ func (m *DeleteFileResponse) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipClientdebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthClientdebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -5688,7 +5691,7 @@ func (m *DeleteFileResponse) Unmarshal(dAtA []byte) error { } return nil } -func skipApi(dAtA []byte) (n int, err error) { +func skipClientdebugrpc(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -5696,7 +5699,7 @@ func skipApi(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowClientdebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -5713,7 +5716,7 @@ func skipApi(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowClientdebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -5729,7 +5732,7 @@ func skipApi(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowClientdebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -5742,14 +5745,14 @@ func skipApi(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthApi + return 0, ErrInvalidLengthClientdebugrpc } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupApi + return 0, ErrUnexpectedEndOfGroupClientdebugrpc } depth-- case 5: @@ -5758,7 +5761,7 @@ func skipApi(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthApi + return 0, ErrInvalidLengthClientdebugrpc } if depth == 0 { return iNdEx, nil @@ -5768,7 +5771,7 @@ func skipApi(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupApi = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthClientdebugrpc = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowClientdebugrpc = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupClientdebugrpc = fmt.Errorf("proto: unexpected end of group") ) diff --git a/client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go b/client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc_drpc.pb.go similarity index 71% rename from client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go rename to client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc_drpc.pb.go index e5219e34..7705177d 100644 --- a/client/debug/clientdebugrpc/clientdebugrpcproto/api_drpc.pb.go +++ b/client/debug/clientdebugrpc/clientdebugrpcproto/clientdebugrpc_drpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-drpc. DO NOT EDIT. // protoc-gen-go-drpc version: v0.0.32 -// source: api/apiproto/protos/api.proto +// source: debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto package clientdebugrpcproto @@ -14,17 +14,17 @@ import ( drpcerr "storj.io/drpc/drpcerr" ) -type drpcEncoding_File_api_apiproto_protos_api_proto struct{} +type drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto struct{} -func (drpcEncoding_File_api_apiproto_protos_api_proto) Marshal(msg drpc.Message) ([]byte, error) { +func (drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto) Marshal(msg drpc.Message) ([]byte, error) { return proto.Marshal(msg.(proto.Message)) } -func (drpcEncoding_File_api_apiproto_protos_api_proto) Unmarshal(buf []byte, msg drpc.Message) error { +func (drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto) Unmarshal(buf []byte, msg drpc.Message) error { return proto.Unmarshal(buf, msg.(proto.Message)) } -func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONMarshal(msg drpc.Message) ([]byte, error) { +func (drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto) JSONMarshal(msg drpc.Message) ([]byte, error) { var buf bytes.Buffer err := new(jsonpb.Marshaler).Marshal(&buf, msg.(proto.Message)) if err != nil { @@ -33,7 +33,7 @@ func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONMarshal(msg drpc.Mess return buf.Bytes(), nil } -func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONUnmarshal(buf []byte, msg drpc.Message) error { +func (drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto) JSONUnmarshal(buf []byte, msg drpc.Message) error { return jsonpb.Unmarshal(bytes.NewReader(buf), msg.(proto.Message)) } @@ -69,7 +69,7 @@ func (c *drpcClientApiClient) DRPCConn() drpc.Conn { return c.cc } func (c *drpcClientApiClient) CreateSpace(ctx context.Context, in *CreateSpaceRequest) (*CreateSpaceResponse, error) { out := new(CreateSpaceResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/CreateSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/CreateSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -78,7 +78,7 @@ func (c *drpcClientApiClient) CreateSpace(ctx context.Context, in *CreateSpaceRe func (c *drpcClientApiClient) DeriveSpace(ctx context.Context, in *DeriveSpaceRequest) (*DeriveSpaceResponse, error) { out := new(DeriveSpaceResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/DeriveSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/DeriveSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func (c *drpcClientApiClient) DeriveSpace(ctx context.Context, in *DeriveSpaceRe func (c *drpcClientApiClient) CreateDocument(ctx context.Context, in *CreateDocumentRequest) (*CreateDocumentResponse, error) { out := new(CreateDocumentResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/CreateDocument", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/CreateDocument", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -96,7 +96,7 @@ func (c *drpcClientApiClient) CreateDocument(ctx context.Context, in *CreateDocu func (c *drpcClientApiClient) DeleteDocument(ctx context.Context, in *DeleteDocumentRequest) (*DeleteDocumentResponse, error) { out := new(DeleteDocumentResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/DeleteDocument", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/DeleteDocument", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func (c *drpcClientApiClient) DeleteDocument(ctx context.Context, in *DeleteDocu func (c *drpcClientApiClient) AddText(ctx context.Context, in *AddTextRequest) (*AddTextResponse, error) { out := new(AddTextResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/AddText", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/AddText", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -114,7 +114,7 @@ func (c *drpcClientApiClient) AddText(ctx context.Context, in *AddTextRequest) ( func (c *drpcClientApiClient) DumpTree(ctx context.Context, in *DumpTreeRequest) (*DumpTreeResponse, error) { out := new(DumpTreeResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/DumpTree", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/DumpTree", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (c *drpcClientApiClient) DumpTree(ctx context.Context, in *DumpTreeRequest) func (c *drpcClientApiClient) TreeParams(ctx context.Context, in *TreeParamsRequest) (*TreeParamsResponse, error) { out := new(TreeParamsResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/TreeParams", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/TreeParams", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -132,7 +132,7 @@ func (c *drpcClientApiClient) TreeParams(ctx context.Context, in *TreeParamsRequ func (c *drpcClientApiClient) AllTrees(ctx context.Context, in *AllTreesRequest) (*AllTreesResponse, error) { out := new(AllTreesResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/AllTrees", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/AllTrees", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -141,7 +141,7 @@ func (c *drpcClientApiClient) AllTrees(ctx context.Context, in *AllTreesRequest) func (c *drpcClientApiClient) AllSpaces(ctx context.Context, in *AllSpacesRequest) (*AllSpacesResponse, error) { out := new(AllSpacesResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/AllSpaces", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/AllSpaces", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -150,7 +150,7 @@ func (c *drpcClientApiClient) AllSpaces(ctx context.Context, in *AllSpacesReques func (c *drpcClientApiClient) LoadSpace(ctx context.Context, in *LoadSpaceRequest) (*LoadSpaceResponse, error) { out := new(LoadSpaceResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/LoadSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/LoadSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -159,7 +159,7 @@ func (c *drpcClientApiClient) LoadSpace(ctx context.Context, in *LoadSpaceReques func (c *drpcClientApiClient) Watch(ctx context.Context, in *WatchRequest) (*WatchResponse, error) { out := new(WatchResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/Watch", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/Watch", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -168,7 +168,7 @@ func (c *drpcClientApiClient) Watch(ctx context.Context, in *WatchRequest) (*Wat func (c *drpcClientApiClient) Unwatch(ctx context.Context, in *UnwatchRequest) (*UnwatchResponse, error) { out := new(UnwatchResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/Unwatch", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/Unwatch", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -177,7 +177,7 @@ func (c *drpcClientApiClient) Unwatch(ctx context.Context, in *UnwatchRequest) ( func (c *drpcClientApiClient) PutFile(ctx context.Context, in *PutFileRequest) (*PutFileResponse, error) { out := new(PutFileResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/PutFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/PutFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -186,7 +186,7 @@ func (c *drpcClientApiClient) PutFile(ctx context.Context, in *PutFileRequest) ( func (c *drpcClientApiClient) GetFile(ctx context.Context, in *GetFileRequest) (*GetFileResponse, error) { out := new(GetFileResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/GetFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/GetFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -195,7 +195,7 @@ func (c *drpcClientApiClient) GetFile(ctx context.Context, in *GetFileRequest) ( func (c *drpcClientApiClient) DeleteFile(ctx context.Context, in *DeleteFileRequest) (*DeleteFileResponse, error) { out := new(DeleteFileResponse) - err := c.cc.Invoke(ctx, "/clientapi.ClientApi/DeleteFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/clientdebugrpc.ClientApi/DeleteFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -289,7 +289,7 @@ func (DRPCClientApiDescription) NumMethods() int { return 15 } func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { case 0: - return "/clientapi.ClientApi/CreateSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/CreateSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). CreateSpace( @@ -298,7 +298,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.CreateSpace, true case 1: - return "/clientapi.ClientApi/DeriveSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/DeriveSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). DeriveSpace( @@ -307,7 +307,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.DeriveSpace, true case 2: - return "/clientapi.ClientApi/CreateDocument", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/CreateDocument", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). CreateDocument( @@ -316,7 +316,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.CreateDocument, true case 3: - return "/clientapi.ClientApi/DeleteDocument", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/DeleteDocument", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). DeleteDocument( @@ -325,7 +325,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.DeleteDocument, true case 4: - return "/clientapi.ClientApi/AddText", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/AddText", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). AddText( @@ -334,7 +334,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.AddText, true case 5: - return "/clientapi.ClientApi/DumpTree", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/DumpTree", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). DumpTree( @@ -343,7 +343,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.DumpTree, true case 6: - return "/clientapi.ClientApi/TreeParams", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/TreeParams", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). TreeParams( @@ -352,7 +352,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.TreeParams, true case 7: - return "/clientapi.ClientApi/AllTrees", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/AllTrees", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). AllTrees( @@ -361,7 +361,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.AllTrees, true case 8: - return "/clientapi.ClientApi/AllSpaces", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/AllSpaces", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). AllSpaces( @@ -370,7 +370,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.AllSpaces, true case 9: - return "/clientapi.ClientApi/LoadSpace", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/LoadSpace", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). LoadSpace( @@ -379,7 +379,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.LoadSpace, true case 10: - return "/clientapi.ClientApi/Watch", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/Watch", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). Watch( @@ -388,7 +388,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.Watch, true case 11: - return "/clientapi.ClientApi/Unwatch", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/Unwatch", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). Unwatch( @@ -397,7 +397,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.Unwatch, true case 12: - return "/clientapi.ClientApi/PutFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/PutFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). PutFile( @@ -406,7 +406,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.PutFile, true case 13: - return "/clientapi.ClientApi/GetFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/GetFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). GetFile( @@ -415,7 +415,7 @@ func (DRPCClientApiDescription) Method(n int) (string, drpc.Encoding, drpc.Recei ) }, DRPCClientApiServer.GetFile, true case 14: - return "/clientapi.ClientApi/DeleteFile", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/clientdebugrpc.ClientApi/DeleteFile", drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCClientApiServer). DeleteFile( @@ -442,7 +442,7 @@ type drpcClientApi_CreateSpaceStream struct { } func (x *drpcClientApi_CreateSpaceStream) SendAndClose(m *CreateSpaceResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -458,7 +458,7 @@ type drpcClientApi_DeriveSpaceStream struct { } func (x *drpcClientApi_DeriveSpaceStream) SendAndClose(m *DeriveSpaceResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -474,7 +474,7 @@ type drpcClientApi_CreateDocumentStream struct { } func (x *drpcClientApi_CreateDocumentStream) SendAndClose(m *CreateDocumentResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -490,7 +490,7 @@ type drpcClientApi_DeleteDocumentStream struct { } func (x *drpcClientApi_DeleteDocumentStream) SendAndClose(m *DeleteDocumentResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -506,7 +506,7 @@ type drpcClientApi_AddTextStream struct { } func (x *drpcClientApi_AddTextStream) SendAndClose(m *AddTextResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -522,7 +522,7 @@ type drpcClientApi_DumpTreeStream struct { } func (x *drpcClientApi_DumpTreeStream) SendAndClose(m *DumpTreeResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -538,7 +538,7 @@ type drpcClientApi_TreeParamsStream struct { } func (x *drpcClientApi_TreeParamsStream) SendAndClose(m *TreeParamsResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -554,7 +554,7 @@ type drpcClientApi_AllTreesStream struct { } func (x *drpcClientApi_AllTreesStream) SendAndClose(m *AllTreesResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -570,7 +570,7 @@ type drpcClientApi_AllSpacesStream struct { } func (x *drpcClientApi_AllSpacesStream) SendAndClose(m *AllSpacesResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -586,7 +586,7 @@ type drpcClientApi_LoadSpaceStream struct { } func (x *drpcClientApi_LoadSpaceStream) SendAndClose(m *LoadSpaceResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -602,7 +602,7 @@ type drpcClientApi_WatchStream struct { } func (x *drpcClientApi_WatchStream) SendAndClose(m *WatchResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -618,7 +618,7 @@ type drpcClientApi_UnwatchStream struct { } func (x *drpcClientApi_UnwatchStream) SendAndClose(m *UnwatchResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -634,7 +634,7 @@ type drpcClientApi_PutFileStream struct { } func (x *drpcClientApi_PutFileStream) SendAndClose(m *PutFileResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -650,7 +650,7 @@ type drpcClientApi_GetFileStream struct { } func (x *drpcClientApi_GetFileStream) SendAndClose(m *GetFileResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -666,7 +666,7 @@ type drpcClientApi_DeleteFileStream struct { } func (x *drpcClientApi_DeleteFileStream) SendAndClose(m *DeleteFileResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_clientdebugrpc_clientdebugrpcproto_protos_clientdebugrpc_proto{}); err != nil { return err } return x.CloseSend() diff --git a/client/debug/clientdebugrpc/clientdebugrpcproto/protos/api.proto b/client/debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto similarity index 96% rename from client/debug/clientdebugrpc/clientdebugrpcproto/protos/api.proto rename to client/debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto index 9d8755c1..8e12a942 100644 --- a/client/debug/clientdebugrpc/clientdebugrpcproto/protos/api.proto +++ b/client/debug/clientdebugrpc/clientdebugrpcproto/protos/clientdebugrpc.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package clientapi; +package clientdebugrpc; -option go_package = "api/apiproto"; +option go_package = "debug/clientdebugrpc/clientdebugrpcproto"; service ClientApi { rpc CreateSpace(CreateSpaceRequest) returns(CreateSpaceResponse); diff --git a/client/document/textchangeproto/protos/test.proto b/client/document/textchangeproto/protos/textchange.proto similarity index 85% rename from client/document/textchangeproto/protos/test.proto rename to client/document/textchangeproto/protos/textchange.proto index 5a9b89e8..0b583a39 100644 --- a/client/document/textchangeproto/protos/test.proto +++ b/client/document/textchangeproto/protos/textchange.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package textchange; -option go_package = "textchange"; +option go_package = "document/textchangeproto"; message TextContent { oneof value { diff --git a/client/document/textchangeproto/test.pb.go b/client/document/textchangeproto/textchange.pb.go similarity index 80% rename from client/document/textchangeproto/test.pb.go rename to client/document/textchangeproto/textchange.pb.go index 28ab3d4e..5600d811 100644 --- a/client/document/textchangeproto/test.pb.go +++ b/client/document/textchangeproto/textchange.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/acl/testutils/testchanges/proto/test.proto +// source: document/textchangeproto/protos/textchange.proto package textchangeproto @@ -33,7 +33,7 @@ func (m *TextContent) Reset() { *m = TextContent{} } func (m *TextContent) String() string { return proto.CompactTextString(m) } func (*TextContent) ProtoMessage() {} func (*TextContent) Descriptor() ([]byte, []int) { - return fileDescriptor_37f33c266ada4318, []int{0} + return fileDescriptor_44a0c2b66e6c4b48, []int{0} } func (m *TextContent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -103,7 +103,7 @@ func (m *TextAppend) Reset() { *m = TextAppend{} } func (m *TextAppend) String() string { return proto.CompactTextString(m) } func (*TextAppend) ProtoMessage() {} func (*TextAppend) Descriptor() ([]byte, []int) { - return fileDescriptor_37f33c266ada4318, []int{1} + return fileDescriptor_44a0c2b66e6c4b48, []int{1} } func (m *TextAppend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -147,7 +147,7 @@ func (m *TextSnapshot) Reset() { *m = TextSnapshot{} } func (m *TextSnapshot) String() string { return proto.CompactTextString(m) } func (*TextSnapshot) ProtoMessage() {} func (*TextSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_37f33c266ada4318, []int{2} + return fileDescriptor_44a0c2b66e6c4b48, []int{2} } func (m *TextSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -192,7 +192,7 @@ func (m *TextData) Reset() { *m = TextData{} } func (m *TextData) String() string { return proto.CompactTextString(m) } func (*TextData) ProtoMessage() {} func (*TextData) Descriptor() ([]byte, []int) { - return fileDescriptor_37f33c266ada4318, []int{3} + return fileDescriptor_44a0c2b66e6c4b48, []int{3} } func (m *TextData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -236,34 +236,33 @@ func (m *TextData) GetSnapshot() *TextSnapshot { } func init() { - proto.RegisterType((*TextContent)(nil), "anytype.TextContent") - proto.RegisterType((*TextAppend)(nil), "anytype.TextAppend") - proto.RegisterType((*TextSnapshot)(nil), "anytype.TextSnapshot") - proto.RegisterType((*TextData)(nil), "anytype.TextData") + proto.RegisterType((*TextContent)(nil), "textchange.TextContent") + proto.RegisterType((*TextAppend)(nil), "textchange.TextAppend") + proto.RegisterType((*TextSnapshot)(nil), "textchange.TextSnapshot") + proto.RegisterType((*TextData)(nil), "textchange.TextData") } func init() { - proto.RegisterFile("pkg/acl/testutils/testchanges/proto/test.proto", fileDescriptor_37f33c266ada4318) + proto.RegisterFile("document/textchangeproto/protos/textchange.proto", fileDescriptor_44a0c2b66e6c4b48) } -var fileDescriptor_37f33c266ada4318 = []byte{ - // 252 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2b, 0xc8, 0x4e, 0xd7, - 0x4f, 0x4c, 0xce, 0xd1, 0x2f, 0x49, 0x2d, 0x2e, 0x29, 0x2d, 0xc9, 0xcc, 0x29, 0x06, 0xb3, 0x92, - 0x33, 0x12, 0xf3, 0xd2, 0x53, 0x8b, 0xf5, 0x0b, 0x8a, 0xf2, 0x4b, 0xf2, 0xc1, 0x22, 0x7a, 0x60, - 0xa6, 0x10, 0x7b, 0x62, 0x5e, 0x65, 0x49, 0x65, 0x41, 0xaa, 0x92, 0x2f, 0x17, 0x77, 0x48, 0x6a, - 0x45, 0x89, 0x73, 0x7e, 0x5e, 0x49, 0x6a, 0x5e, 0x89, 0x90, 0x29, 0x17, 0x57, 0x49, 0x6a, 0x45, - 0x89, 0x63, 0x41, 0x41, 0x6a, 0x5e, 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0xb0, 0x1e, - 0x54, 0xb1, 0x5e, 0x08, 0x5c, 0xca, 0x83, 0x21, 0x08, 0x49, 0xa1, 0x13, 0x3b, 0x17, 0x6b, 0x59, - 0x62, 0x4e, 0x69, 0xaa, 0x92, 0x02, 0x17, 0x17, 0x42, 0x91, 0x90, 0x10, 0x17, 0x0b, 0x48, 0x11, - 0xd8, 0x1c, 0xce, 0x20, 0x30, 0x5b, 0x49, 0x89, 0x8b, 0x07, 0xa4, 0x22, 0x38, 0x2f, 0xb1, 0xa0, - 0x38, 0x23, 0xbf, 0x04, 0xab, 0x9a, 0x5c, 0x2e, 0x0e, 0x90, 0x1a, 0x97, 0xc4, 0x92, 0x44, 0x21, - 0x3d, 0x2e, 0xf6, 0x64, 0x88, 0xe3, 0x24, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x44, 0x50, 0x9c, - 0x03, 0x75, 0x78, 0x10, 0x4c, 0x91, 0x90, 0x21, 0x17, 0x47, 0x31, 0xd4, 0x6c, 0x09, 0x26, 0xb0, - 0xfb, 0x45, 0x51, 0x34, 0xc0, 0x2c, 0x0e, 0x82, 0x2b, 0x73, 0x52, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, - 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, - 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x6e, 0xa4, 0x40, 0x4c, 0x62, 0x03, 0x07, 0x9d, 0x31, 0x20, - 0x00, 0x00, 0xff, 0xff, 0xdc, 0xbf, 0x78, 0xe5, 0x6c, 0x01, 0x00, 0x00, +var fileDescriptor_44a0c2b66e6c4b48 = []byte{ + // 239 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x48, 0xc9, 0x4f, 0x2e, + 0xcd, 0x4d, 0xcd, 0x2b, 0xd1, 0x2f, 0x49, 0xad, 0x28, 0x49, 0xce, 0x48, 0xcc, 0x4b, 0x4f, 0x2d, + 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x07, 0x93, 0xc5, 0x48, 0xc2, 0x7a, 0x60, 0x11, 0x21, 0x2e, 0x84, + 0x88, 0x52, 0x00, 0x17, 0x77, 0x48, 0x6a, 0x45, 0x89, 0x73, 0x7e, 0x5e, 0x49, 0x6a, 0x5e, 0x89, + 0x90, 0x05, 0x17, 0x58, 0xd2, 0xb1, 0xa0, 0x20, 0x35, 0x2f, 0x45, 0x82, 0x51, 0x81, 0x51, 0x83, + 0xdb, 0x48, 0x4c, 0x0f, 0xc9, 0x84, 0x10, 0xb8, 0xac, 0x07, 0x43, 0x10, 0x92, 0x5a, 0x27, 0x76, + 0x2e, 0xd6, 0xb2, 0xc4, 0x9c, 0xd2, 0x54, 0x25, 0x05, 0x2e, 0x2e, 0x84, 0x22, 0x21, 0x21, 0x2e, + 0x16, 0x90, 0x22, 0xb0, 0x51, 0x9c, 0x41, 0x60, 0xb6, 0x92, 0x12, 0x17, 0x0f, 0x48, 0x45, 0x70, + 0x5e, 0x62, 0x41, 0x71, 0x46, 0x7e, 0x09, 0x56, 0x35, 0xc5, 0x5c, 0x1c, 0x20, 0x35, 0x2e, 0x89, + 0x25, 0x89, 0x42, 0x86, 0x5c, 0xec, 0xc9, 0x10, 0xf7, 0x49, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x1b, + 0x89, 0xa3, 0xbb, 0x08, 0xea, 0xfc, 0x20, 0x98, 0x3a, 0x21, 0x13, 0x2e, 0x8e, 0x62, 0xa8, 0xf1, + 0x12, 0x4c, 0x60, 0x5f, 0x48, 0xa0, 0xeb, 0x81, 0x59, 0x1f, 0x04, 0x57, 0xe9, 0x64, 0x74, 0xe2, + 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, + 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x12, 0xb8, 0x02, 0x39, 0x89, 0x0d, 0x4c, + 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x87, 0x3d, 0x8c, 0x61, 0x87, 0x01, 0x00, 0x00, } func (m *TextContent) Marshal() (dAtA []byte, err error) { @@ -312,7 +311,7 @@ func (m *TextContent_TextAppend) MarshalToSizedBuffer(dAtA []byte) (int, error) return 0, err } i -= size - i = encodeVarintTest(dAtA, i, uint64(size)) + i = encodeVarintTextchange(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -342,7 +341,7 @@ func (m *TextAppend) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Text) > 0 { i -= len(m.Text) copy(dAtA[i:], m.Text) - i = encodeVarintTest(dAtA, i, uint64(len(m.Text))) + i = encodeVarintTextchange(dAtA, i, uint64(len(m.Text))) i-- dAtA[i] = 0xa } @@ -372,7 +371,7 @@ func (m *TextSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Text) > 0 { i -= len(m.Text) copy(dAtA[i:], m.Text) - i = encodeVarintTest(dAtA, i, uint64(len(m.Text))) + i = encodeVarintTextchange(dAtA, i, uint64(len(m.Text))) i-- dAtA[i] = 0xa } @@ -406,7 +405,7 @@ func (m *TextData) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTest(dAtA, i, uint64(size)) + i = encodeVarintTextchange(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 @@ -419,7 +418,7 @@ func (m *TextData) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintTest(dAtA, i, uint64(size)) + i = encodeVarintTextchange(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -428,8 +427,8 @@ func (m *TextData) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintTest(dAtA []byte, offset int, v uint64) int { - offset -= sovTest(v) +func encodeVarintTextchange(dAtA []byte, offset int, v uint64) int { + offset -= sovTextchange(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -459,7 +458,7 @@ func (m *TextContent_TextAppend) Size() (n int) { _ = l if m.TextAppend != nil { l = m.TextAppend.Size() - n += 1 + l + sovTest(uint64(l)) + n += 1 + l + sovTextchange(uint64(l)) } return n } @@ -471,7 +470,7 @@ func (m *TextAppend) Size() (n int) { _ = l l = len(m.Text) if l > 0 { - n += 1 + l + sovTest(uint64(l)) + n += 1 + l + sovTextchange(uint64(l)) } return n } @@ -484,7 +483,7 @@ func (m *TextSnapshot) Size() (n int) { _ = l l = len(m.Text) if l > 0 { - n += 1 + l + sovTest(uint64(l)) + n += 1 + l + sovTextchange(uint64(l)) } return n } @@ -498,21 +497,21 @@ func (m *TextData) Size() (n int) { if len(m.Content) > 0 { for _, e := range m.Content { l = e.Size() - n += 1 + l + sovTest(uint64(l)) + n += 1 + l + sovTextchange(uint64(l)) } } if m.Snapshot != nil { l = m.Snapshot.Size() - n += 1 + l + sovTest(uint64(l)) + n += 1 + l + sovTextchange(uint64(l)) } return n } -func sovTest(x uint64) (n int) { +func sovTextchange(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozTest(x uint64) (n int) { - return sovTest(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozTextchange(x uint64) (n int) { + return sovTextchange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *TextContent) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -522,7 +521,7 @@ func (m *TextContent) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -550,7 +549,7 @@ func (m *TextContent) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -563,11 +562,11 @@ func (m *TextContent) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if postIndex > l { return io.ErrUnexpectedEOF @@ -580,12 +579,12 @@ func (m *TextContent) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTest(dAtA[iNdEx:]) + skippy, err := skipTextchange(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -607,7 +606,7 @@ func (m *TextAppend) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -635,7 +634,7 @@ func (m *TextAppend) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -649,11 +648,11 @@ func (m *TextAppend) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if postIndex > l { return io.ErrUnexpectedEOF @@ -662,12 +661,12 @@ func (m *TextAppend) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTest(dAtA[iNdEx:]) + skippy, err := skipTextchange(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -689,7 +688,7 @@ func (m *TextSnapshot) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -717,7 +716,7 @@ func (m *TextSnapshot) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -731,11 +730,11 @@ func (m *TextSnapshot) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if postIndex > l { return io.ErrUnexpectedEOF @@ -744,12 +743,12 @@ func (m *TextSnapshot) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTest(dAtA[iNdEx:]) + skippy, err := skipTextchange(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -771,7 +770,7 @@ func (m *TextData) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -799,7 +798,7 @@ func (m *TextData) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -812,11 +811,11 @@ func (m *TextData) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if postIndex > l { return io.ErrUnexpectedEOF @@ -833,7 +832,7 @@ func (m *TextData) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowTest + return ErrIntOverflowTextchange } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -846,11 +845,11 @@ func (m *TextData) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if postIndex > l { return io.ErrUnexpectedEOF @@ -864,12 +863,12 @@ func (m *TextData) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipTest(dAtA[iNdEx:]) + skippy, err := skipTextchange(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTest + return ErrInvalidLengthTextchange } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -883,7 +882,7 @@ func (m *TextData) Unmarshal(dAtA []byte) error { } return nil } -func skipTest(dAtA []byte) (n int, err error) { +func skipTextchange(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -891,7 +890,7 @@ func skipTest(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowTest + return 0, ErrIntOverflowTextchange } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -908,7 +907,7 @@ func skipTest(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowTest + return 0, ErrIntOverflowTextchange } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -924,7 +923,7 @@ func skipTest(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowTest + return 0, ErrIntOverflowTextchange } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -937,14 +936,14 @@ func skipTest(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthTest + return 0, ErrInvalidLengthTextchange } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupTest + return 0, ErrUnexpectedEndOfGroupTextchange } depth-- case 5: @@ -953,7 +952,7 @@ func skipTest(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthTest + return 0, ErrInvalidLengthTextchange } if depth == 0 { return iNdEx, nil @@ -963,7 +962,7 @@ func skipTest(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthTest = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTest = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupTest = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthTextchange = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTextchange = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTextchange = fmt.Errorf("proto: unexpected end of group") ) diff --git a/common/Makefile b/common/Makefile index 699dde33..6383b63a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -7,7 +7,6 @@ proto: @$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1) @$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto) @$(eval P_TREE_CHANGES_PATH_PB := commonspace/object/tree/treechangeproto) - @$(eval P_SYNC_CHANGES_PATH_PB := syncproto) @$(eval P_ACL_RECORDS := M$(P_ACL_RECORDS_PATH_PB)/protos/aclrecord.proto=github.com/anytypeio/go-anytype-infrastructure-experiments/common/$(P_ACL_RECORDS_PATH_PB)) @$(eval P_TREE_CHANGES := M$(P_TREE_CHANGES_PATH_PB)/protos/treechange.proto=github.com/anytypeio/go-anytype-infrastructure-experiments/common/$(P_TREE_CHANGES_PATH_PB)) From d35d5c94379e689b95bd761788d4dc2a870b59a8 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 26 Dec 2022 17:36:42 +0100 Subject: [PATCH 05/17] Add comments and change cnames --- client/clientspace/service.go | 2 +- client/clientspace/statusreceiver.go | 2 +- client/debug/clientdebugrpc/clientdebugrpc.go | 2 +- client/debug/clientdebugrpc/rpchandler.go | 4 +- common/accountservice/accountservice.go | 2 +- .../fileblockstore/fileblockstore.go | 2 +- common/commonspace/headsync/diffsyncer.go | 4 +- common/commonspace/headsync/headsync.go | 2 +- .../object/tree/synctree/synctree.go | 6 +- .../object/tree/synctree/synctreehandler.go | 4 +- .../object/treegetter/treegetter.go | 2 +- common/commonspace/settings/settings.go | 2 +- common/commonspace/space.go | 6 +- common/commonspace/spaceservice.go | 2 +- .../spacestorage/mock_storage/mock_storage.go | 266 ---------------- common/commonspace/spacestorage/storage.go | 3 +- .../spacesyncproto/protos/spacesync.proto | 21 +- .../spacesyncproto/spacesync.pb.go | 15 +- common/commonspace/syncstatus/noop.go | 2 +- common/commonspace/syncstatus/syncstatus.go | 28 +- node/Makefile | 2 +- node/debug/nodedebugrpc/nodedebugrpc.go | 2 +- .../{api.pb.go => nodedebugrpc.pb.go} | 283 +++++++++--------- ...api_drpc.pb.go => nodedebugrpc_drpc.pb.go} | 36 +-- .../protos/{api.proto => nodedebugrpc.proto} | 2 +- node/nodespace/rpchandler.go | 6 +- node/nodespace/service.go | 2 +- util/cmd/debug/commands/client/service.go | 2 +- util/cmd/debug/commands/node/service.go | 2 +- 29 files changed, 233 insertions(+), 481 deletions(-) delete mode 100644 common/commonspace/spacestorage/mock_storage/mock_storage.go rename node/debug/nodedebugrpc/nodedebugrpcproto/{api.pb.go => nodedebugrpc.pb.go} (82%) rename node/debug/nodedebugrpc/nodedebugrpcproto/{api_drpc.pb.go => nodedebugrpc_drpc.pb.go} (74%) rename node/debug/nodedebugrpc/nodedebugrpcproto/protos/{api.proto => nodedebugrpc.proto} (93%) diff --git a/client/clientspace/service.go b/client/clientspace/service.go index 98a34b16..046242cc 100644 --- a/client/clientspace/service.go +++ b/client/clientspace/service.go @@ -100,7 +100,7 @@ func (s *service) loadSpace(ctx context.Context, id string) (value ocache.Object if err != nil { return } - ns.SyncStatus().(syncstatus.SyncStatusWatcher).SetUpdateReceiver(&statusReceiver{}) + ns.SyncStatus().(syncstatus.StatusWatcher).SetUpdateReceiver(&statusReceiver{}) if err = ns.Init(ctx); err != nil { return } diff --git a/client/clientspace/statusreceiver.go b/client/clientspace/statusreceiver.go index c43ef434..50cf27bf 100644 --- a/client/clientspace/statusreceiver.go +++ b/client/clientspace/statusreceiver.go @@ -10,7 +10,7 @@ type statusReceiver struct { } func (s *statusReceiver) UpdateTree(ctx context.Context, treeId string, status syncstatus.SyncStatus) (err error) { - log.With(zap.String("treeId", treeId), zap.Bool("synced", status == syncstatus.SyncStatusSynced)). + log.With(zap.String("treeId", treeId), zap.Bool("synced", status == syncstatus.StatusSynced)). Debug("updating sync status") return nil } diff --git a/client/debug/clientdebugrpc/clientdebugrpc.go b/client/debug/clientdebugrpc/clientdebugrpc.go index 0317a81c..4507885f 100644 --- a/client/debug/clientdebugrpc/clientdebugrpc.go +++ b/client/debug/clientdebugrpc/clientdebugrpc.go @@ -17,7 +17,7 @@ import ( "storj.io/drpc" ) -const CName = "debug.clientdebugrpc" +const CName = "common.debug.clientdebugrpc" var log = logger.NewNamed(CName) diff --git a/client/debug/clientdebugrpc/rpchandler.go b/client/debug/clientdebugrpc/rpchandler.go index db3f936f..b1ea97cb 100644 --- a/client/debug/clientdebugrpc/rpchandler.go +++ b/client/debug/clientdebugrpc/rpchandler.go @@ -31,7 +31,7 @@ func (r *rpcHandler) Watch(ctx context.Context, request *clientdebugrpcproto.Wat if err != nil { return } - watcher := space.SyncStatus().(syncstatus.SyncStatusWatcher) + watcher := space.SyncStatus().(syncstatus.StatusWatcher) watcher.Watch(request.TreeId) resp = &clientdebugrpcproto.WatchResponse{} return @@ -42,7 +42,7 @@ func (r *rpcHandler) Unwatch(ctx context.Context, request *clientdebugrpcproto.U if err != nil { return } - watcher := space.SyncStatus().(syncstatus.SyncStatusWatcher) + watcher := space.SyncStatus().(syncstatus.StatusWatcher) watcher.Unwatch(request.TreeId) resp = &clientdebugrpcproto.UnwatchResponse{} return diff --git a/common/accountservice/accountservice.go b/common/accountservice/accountservice.go index e7ff7341..971de9bc 100644 --- a/common/accountservice/accountservice.go +++ b/common/accountservice/accountservice.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" ) -const CName = "common.account" +const CName = "common.accountservice" type Service interface { app.Component diff --git a/common/commonfile/fileblockstore/fileblockstore.go b/common/commonfile/fileblockstore/fileblockstore.go index 9cfa522e..fc974f0a 100644 --- a/common/commonfile/fileblockstore/fileblockstore.go +++ b/common/commonfile/fileblockstore/fileblockstore.go @@ -8,7 +8,7 @@ import ( "github.com/ipfs/go-cid" ) -var log = logger.NewNamed("filenode.fileblockstore") +var log = logger.NewNamed(CName) var ( ErrCIDNotFound = fileprotoerr.ErrCIDNotFound diff --git a/common/commonspace/headsync/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go index ef855bf8..baec9b22 100644 --- a/common/commonspace/headsync/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -30,7 +30,7 @@ func newDiffSyncer( cache treegetter.TreeGetter, storage spacestorage.SpaceStorage, clientFactory spacesyncproto.ClientFactory, - syncStatus syncstatus.SyncStatusUpdater, + syncStatus syncstatus.StatusUpdater, log *zap.Logger) DiffSyncer { return &diffSyncer{ diff: diff, @@ -53,7 +53,7 @@ type diffSyncer struct { clientFactory spacesyncproto.ClientFactory log *zap.Logger deletionState deletionstate.DeletionState - syncStatus syncstatus.SyncStatusUpdater + syncStatus syncstatus.StatusUpdater } func (d *diffSyncer) Init(deletionState deletionstate.DeletionState) { diff --git a/common/commonspace/headsync/headsync.go b/common/commonspace/headsync/headsync.go index 6f07bca4..cc050bee 100644 --- a/common/commonspace/headsync/headsync.go +++ b/common/commonspace/headsync/headsync.go @@ -49,7 +49,7 @@ func NewHeadSync( storage spacestorage.SpaceStorage, confConnector nodeconf.ConfConnector, cache treegetter.TreeGetter, - syncStatus syncstatus.SyncStatusUpdater, + syncStatus syncstatus.StatusUpdater, log *zap.Logger) HeadSync { diff := ldiff.New(16, 16) diff --git a/common/commonspace/object/tree/synctree/synctree.go b/common/commonspace/object/tree/synctree/synctree.go index 5c949351..3c9e57a5 100644 --- a/common/commonspace/object/tree/synctree/synctree.go +++ b/common/commonspace/object/tree/synctree/synctree.go @@ -41,7 +41,7 @@ type syncTree struct { objecttree.ObjectTree synchandler.SyncHandler syncClient SyncClient - syncStatus syncstatus.SyncStatusUpdater + syncStatus syncstatus.StatusUpdater notifiable HeadNotifiable listener updatelistener.UpdateListener treeUsage *atomic.Int32 @@ -63,7 +63,7 @@ type CreateDeps struct { ObjectSync objectsync.ObjectSync AclList list.ACLList SpaceStorage spacestorage.SpaceStorage - SyncStatus syncstatus.SyncStatusUpdater + SyncStatus syncstatus.StatusUpdater HeadNotifiable HeadNotifiable } @@ -77,7 +77,7 @@ type BuildDeps struct { SpaceStorage spacestorage.SpaceStorage TreeStorage treestorage.TreeStorage TreeUsage *atomic.Int32 - SyncStatus syncstatus.SyncStatusUpdater + SyncStatus syncstatus.StatusUpdater } func newWrappedSyncClient( diff --git a/common/commonspace/object/tree/synctree/synctreehandler.go b/common/commonspace/object/tree/synctree/synctreehandler.go index 399ce4cb..501ef5a7 100644 --- a/common/commonspace/object/tree/synctree/synctreehandler.go +++ b/common/commonspace/object/tree/synctree/synctreehandler.go @@ -16,14 +16,14 @@ import ( type syncTreeHandler struct { objTree objecttree.ObjectTree syncClient SyncClient - syncStatus syncstatus.SyncStatusUpdater + syncStatus syncstatus.StatusUpdater handlerLock sync.Mutex queue ReceiveQueue } const maxQueueSize = 5 -func newSyncTreeHandler(objTree objecttree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.SyncStatusUpdater) synchandler.SyncHandler { +func newSyncTreeHandler(objTree objecttree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.StatusUpdater) synchandler.SyncHandler { return &syncTreeHandler{ objTree: objTree, syncClient: syncClient, diff --git a/common/commonspace/object/treegetter/treegetter.go b/common/commonspace/object/treegetter/treegetter.go index 2f020e86..8b3ba472 100644 --- a/common/commonspace/object/treegetter/treegetter.go +++ b/common/commonspace/object/treegetter/treegetter.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" ) -const CName = "object.treegetter" +const CName = "common.object.treegetter" type TreeGetter interface { app.ComponentRunnable diff --git a/common/commonspace/settings/settings.go b/common/commonspace/settings/settings.go index c6396192..ac35cafa 100644 --- a/common/commonspace/settings/settings.go +++ b/common/commonspace/settings/settings.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" ) -var log = logger.NewNamed("commonspace.settings") +var log = logger.NewNamed("common.commonspace.settings") type SettingsObject interface { synctree.SyncTree diff --git a/common/commonspace/space.go b/common/commonspace/space.go index 43f99cea..f9ece8d6 100644 --- a/common/commonspace/space.go +++ b/common/commonspace/space.go @@ -81,7 +81,7 @@ type Space interface { BuildTree(ctx context.Context, id string, listener updatelistener.UpdateListener) (objecttree.ObjectTree, error) DeleteTree(ctx context.Context, id string) (err error) - SyncStatus() syncstatus.SyncStatusUpdater + SyncStatus() syncstatus.StatusUpdater Close() error } @@ -95,7 +95,7 @@ type space struct { objectSync objectsync.ObjectSync headSync headsync.HeadSync - syncStatus syncstatus.SyncStatusUpdater + syncStatus syncstatus.StatusUpdater storage spacestorage.SpaceStorage cache treegetter.TreeGetter account accountservice.Service @@ -207,7 +207,7 @@ func (s *space) HeadSync() headsync.HeadSync { return s.headSync } -func (s *space) SyncStatus() syncstatus.SyncStatusUpdater { +func (s *space) SyncStatus() syncstatus.StatusUpdater { return s.syncStatus } diff --git a/common/commonspace/spaceservice.go b/common/commonspace/spaceservice.go index 69e992b2..6a066a98 100644 --- a/common/commonspace/spaceservice.go +++ b/common/commonspace/spaceservice.go @@ -113,7 +113,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { syncStatus := syncstatus.NewNoOpSyncStatus() // this will work only for clients, not the best solution, but... if !lastConfiguration.IsResponsible(st.Id()) { - // TODO: move it to the client package and add possibility to inject SyncStatusProvider from the client + // TODO: move it to the client package and add possibility to inject StatusProvider from the client syncStatus = syncstatus.NewSyncStatusProvider(st.Id(), syncstatus.DefaultDeps(lastConfiguration, st)) } diff --git a/common/commonspace/spacestorage/mock_storage/mock_storage.go b/common/commonspace/spacestorage/mock_storage/mock_storage.go deleted file mode 100644 index b9b71ae5..00000000 --- a/common/commonspace/spacestorage/mock_storage/mock_storage.go +++ /dev/null @@ -1,266 +0,0 @@ -// Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage (interfaces: SpaceStorageProvider,SpaceStorage) - -// Package mock_spacestorage is a generated GoMock package. -package mock_spacestorage - -import ( - reflect "reflect" - - app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - liststorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" - treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - spacesyncproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - gomock "github.com/golang/mock/gomock" -) - -// MockSpaceStorageProvider is a mock of SpaceStorageProvider interface. -type MockSpaceStorageProvider struct { - ctrl *gomock.Controller - recorder *MockSpaceStorageProviderMockRecorder -} - -// MockSpaceStorageProviderMockRecorder is the mock recorder for MockSpaceStorageProvider. -type MockSpaceStorageProviderMockRecorder struct { - mock *MockSpaceStorageProvider -} - -// NewMockSpaceStorageProvider creates a new mock instance. -func NewMockSpaceStorageProvider(ctrl *gomock.Controller) *MockSpaceStorageProvider { - mock := &MockSpaceStorageProvider{ctrl: ctrl} - mock.recorder = &MockSpaceStorageProviderMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockSpaceStorageProvider) EXPECT() *MockSpaceStorageProviderMockRecorder { - return m.recorder -} - -// CreateSpaceStorage mocks base method. -func (m *MockSpaceStorageProvider) CreateSpaceStorage(arg0 spacestorage.SpaceStorageCreatePayload) (spacestorage.SpaceStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateSpaceStorage", arg0) - ret0, _ := ret[0].(spacestorage.SpaceStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateSpaceStorage indicates an expected call of CreateSpaceStorage. -func (mr *MockSpaceStorageProviderMockRecorder) CreateSpaceStorage(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).CreateSpaceStorage), arg0) -} - -// Init mocks base method. -func (m *MockSpaceStorageProvider) Init(arg0 *app.App) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Init", arg0) - ret0, _ := ret[0].(error) - return ret0 -} - -// Init indicates an expected call of Init. -func (mr *MockSpaceStorageProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Init), arg0) -} - -// Name mocks base method. -func (m *MockSpaceStorageProvider) Name() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Name") - ret0, _ := ret[0].(string) - return ret0 -} - -// Name indicates an expected call of Name. -func (mr *MockSpaceStorageProviderMockRecorder) Name() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Name)) -} - -// SpaceStorage mocks base method. -func (m *MockSpaceStorageProvider) SpaceStorage(arg0 string) (spacestorage.SpaceStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SpaceStorage", arg0) - ret0, _ := ret[0].(spacestorage.SpaceStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SpaceStorage indicates an expected call of SpaceStorage. -func (mr *MockSpaceStorageProviderMockRecorder) SpaceStorage(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).SpaceStorage), arg0) -} - -// MockSpaceStorage is a mock of SpaceStorage interface. -type MockSpaceStorage struct { - ctrl *gomock.Controller - recorder *MockSpaceStorageMockRecorder -} - -// MockSpaceStorageMockRecorder is the mock recorder for MockSpaceStorage. -type MockSpaceStorageMockRecorder struct { - mock *MockSpaceStorage -} - -// NewMockSpaceStorage creates a new mock instance. -func NewMockSpaceStorage(ctrl *gomock.Controller) *MockSpaceStorage { - mock := &MockSpaceStorage{ctrl: ctrl} - mock.recorder = &MockSpaceStorageMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockSpaceStorage) EXPECT() *MockSpaceStorageMockRecorder { - return m.recorder -} - -// ACLStorage mocks base method. -func (m *MockSpaceStorage) ACLStorage() (liststorage.ListStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ACLStorage") - ret0, _ := ret[0].(liststorage.ListStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// ACLStorage indicates an expected call of ACLStorage. -func (mr *MockSpaceStorageMockRecorder) ACLStorage() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ACLStorage", reflect.TypeOf((*MockSpaceStorage)(nil).ACLStorage)) -} - -// Close mocks base method. -func (m *MockSpaceStorage) Close() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Close") - ret0, _ := ret[0].(error) - return ret0 -} - -// Close indicates an expected call of Close. -func (mr *MockSpaceStorageMockRecorder) Close() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSpaceStorage)(nil).Close)) -} - -// CreateTreeStorage mocks base method. -func (m *MockSpaceStorage) CreateTreeStorage(arg0 treestorage.TreeStorageCreatePayload) (treestorage.TreeStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateTreeStorage", arg0) - ret0, _ := ret[0].(treestorage.TreeStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateTreeStorage indicates an expected call of CreateTreeStorage. -func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).CreateTreeStorage), arg0) -} - -// Id mocks base method. -func (m *MockSpaceStorage) Id() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Id") - ret0, _ := ret[0].(string) - return ret0 -} - -// Id indicates an expected call of Id. -func (mr *MockSpaceStorageMockRecorder) Id() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSpaceStorage)(nil).Id)) -} - -// SetTreeDeletedStatus mocks base method. -func (m *MockSpaceStorage) SetTreeDeletedStatus(arg0, arg1 string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetTreeDeletedStatus", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 -} - -// SetTreeDeletedStatus indicates an expected call of SetTreeDeletedStatus. -func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).SetTreeDeletedStatus), arg0, arg1) -} - -// SpaceHeader mocks base method. -func (m *MockSpaceStorage) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SpaceHeader") - ret0, _ := ret[0].(*spacesyncproto.RawSpaceHeaderWithId) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// SpaceHeader indicates an expected call of SpaceHeader. -func (mr *MockSpaceStorageMockRecorder) SpaceHeader() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceHeader", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceHeader)) -} - -// SpaceSettingsId mocks base method. -func (m *MockSpaceStorage) SpaceSettingsId() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SpaceSettingsId") - ret0, _ := ret[0].(string) - return ret0 -} - -// SpaceSettingsId indicates an expected call of SpaceSettingsId. -func (mr *MockSpaceStorageMockRecorder) SpaceSettingsId() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSettingsId", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceSettingsId)) -} - -// StoredIds mocks base method. -func (m *MockSpaceStorage) StoredIds() ([]string, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoredIds") - ret0, _ := ret[0].([]string) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// StoredIds indicates an expected call of StoredIds. -func (mr *MockSpaceStorageMockRecorder) StoredIds() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoredIds", reflect.TypeOf((*MockSpaceStorage)(nil).StoredIds)) -} - -// TreeDeletedStatus mocks base method. -func (m *MockSpaceStorage) TreeDeletedStatus(arg0 string) (string, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TreeDeletedStatus", arg0) - ret0, _ := ret[0].(string) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// TreeDeletedStatus indicates an expected call of TreeDeletedStatus. -func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).TreeDeletedStatus), arg0) -} - -// TreeStorage mocks base method. -func (m *MockSpaceStorage) TreeStorage(arg0 string) (treestorage.TreeStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TreeStorage", arg0) - ret0, _ := ret[0].(treestorage.TreeStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// TreeStorage indicates an expected call of TreeStorage. -func (mr *MockSpaceStorageMockRecorder) TreeStorage(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).TreeStorage), arg0) -} diff --git a/common/commonspace/spacestorage/storage.go b/common/commonspace/spacestorage/storage.go index 21716aaa..843aa009 100644 --- a/common/commonspace/spacestorage/storage.go +++ b/common/commonspace/spacestorage/storage.go @@ -11,7 +11,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" ) -const CName = "commonspace.spacestorage" +const CName = "common.commonspace.spacestorage" var ( ErrSpaceStorageExists = errors.New("space storage exists") @@ -25,6 +25,7 @@ const ( TreeDeletedStatusDeleted = "deleted" ) +// TODO: consider moving to some file with all common interfaces etc type SpaceStorage interface { treestorage.Provider Id() string diff --git a/common/commonspace/spacesyncproto/protos/spacesync.proto b/common/commonspace/spacesyncproto/protos/spacesync.proto index a9b911db..6e9bd3eb 100644 --- a/common/commonspace/spacesyncproto/protos/spacesync.proto +++ b/common/commonspace/spacesyncproto/protos/spacesync.proto @@ -13,11 +13,11 @@ enum ErrCodes { service SpaceSync { // HeadSync compares all objects and their hashes in a space rpc HeadSync(HeadSyncRequest) returns (HeadSyncResponse); - // PushSpace sends new space to the node + // SpacePush sends new space to the node rpc SpacePush(SpacePushRequest) returns (SpacePushResponse); - // PullSpace gets space from the remote peer + // SpacePull gets space from the remote peer rpc SpacePull(SpacePullRequest) returns (SpacePullResponse); - // Stream opens object sync stream with node or client + // ObjectSyncStream opens object sync stream with node or client rpc ObjectSyncStream(stream ObjectSyncMessage) returns (stream ObjectSyncMessage); } @@ -62,24 +62,25 @@ message ObjectSyncMessage { // string peerSignature = 6; } -// PushSpaceRequest is a request to add space on a node containing only one acl record +// SpacePushRequest is a request to add space on a node containing only one acl record message SpacePushRequest { SpacePayload payload = 1; } -// PushSpaceResponse is an empty response +// SpacePushResponse is an empty response message SpacePushResponse {} -// PullSpaceRequest is a request to request a space on a node that doesn't have it +// SpacePullRequest is a request to request a space on a node that doesn't have it message SpacePullRequest { string id = 1; } -// PullSpaceResponse is a response with header and acl root +// SpacePullResponse is a response with header and acl root message SpacePullResponse { SpacePayload payload = 1; } +// SpacePayload is a payload for pushing a space message SpacePayload { RawSpaceHeaderWithId spaceHeader = 1; bytes aclPayload = 2; @@ -97,30 +98,36 @@ message SpaceHeader { bytes seed = 5; } +// RawSpaceHeader is raw header for SpaceHeader message RawSpaceHeader { bytes spaceHeader = 1; bytes signature = 2; } +// RawSpaceHeaderWithId is a marshalled RawSpaceHeader with its content id message RawSpaceHeaderWithId { bytes rawHeader = 1; string id = 2; } +// SpaceSettingsContent is a payload for a space settings object message SpaceSettingsContent { oneof value { ObjectDelete objectDelete = 1; } } +// ObjectDelete is a message containing an object id which should be deleted message ObjectDelete { string id = 1; } +// SpaceSettingsSnapshot contains all the deleted ids in a snapshot message SpaceSettingsSnapshot { repeated string deletedIds = 1; } +// SettingsData contains ObjectTree change payload message SettingsData { repeated SpaceSettingsContent content = 1; SpaceSettingsSnapshot snapshot = 2; diff --git a/common/commonspace/spacesyncproto/spacesync.pb.go b/common/commonspace/spacesyncproto/spacesync.pb.go index c38245ae..4491e775 100644 --- a/common/commonspace/spacesyncproto/spacesync.pb.go +++ b/common/commonspace/spacesyncproto/spacesync.pb.go @@ -395,7 +395,7 @@ func (m *ObjectSyncMessage) GetObjectId() string { return "" } -// PushSpaceRequest is a request to add space on a node containing only one acl record +// SpacePushRequest is a request to add space on a node containing only one acl record type SpacePushRequest struct { Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } @@ -440,7 +440,7 @@ func (m *SpacePushRequest) GetPayload() *SpacePayload { return nil } -// PushSpaceResponse is an empty response +// SpacePushResponse is an empty response type SpacePushResponse struct { } @@ -477,7 +477,7 @@ func (m *SpacePushResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SpacePushResponse proto.InternalMessageInfo -// PullSpaceRequest is a request to request a space on a node that doesn't have it +// SpacePullRequest is a request to request a space on a node that doesn't have it type SpacePullRequest struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } @@ -522,7 +522,7 @@ func (m *SpacePullRequest) GetId() string { return "" } -// PullSpaceResponse is a response with header and acl root +// SpacePullResponse is a response with header and acl root type SpacePullResponse struct { Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } @@ -567,6 +567,7 @@ func (m *SpacePullResponse) GetPayload() *SpacePayload { return nil } +// SpacePayload is a payload for pushing a space type SpacePayload struct { SpaceHeader *RawSpaceHeaderWithId `protobuf:"bytes,1,opt,name=spaceHeader,proto3" json:"spaceHeader,omitempty"` AclPayload []byte `protobuf:"bytes,2,opt,name=aclPayload,proto3" json:"aclPayload,omitempty"` @@ -720,6 +721,7 @@ func (m *SpaceHeader) GetSeed() []byte { return nil } +// RawSpaceHeader is raw header for SpaceHeader type RawSpaceHeader struct { SpaceHeader []byte `protobuf:"bytes,1,opt,name=spaceHeader,proto3" json:"spaceHeader,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` @@ -772,6 +774,7 @@ func (m *RawSpaceHeader) GetSignature() []byte { return nil } +// RawSpaceHeaderWithId is a marshalled RawSpaceHeader with its content id type RawSpaceHeaderWithId struct { RawHeader []byte `protobuf:"bytes,1,opt,name=rawHeader,proto3" json:"rawHeader,omitempty"` Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` @@ -824,6 +827,7 @@ func (m *RawSpaceHeaderWithId) GetId() string { return "" } +// SpaceSettingsContent is a payload for a space settings object type SpaceSettingsContent struct { // Types that are valid to be assigned to Value: // @@ -897,6 +901,7 @@ func (*SpaceSettingsContent) XXX_OneofWrappers() []interface{} { } } +// ObjectDelete is a message containing an object id which should be deleted type ObjectDelete struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` } @@ -941,6 +946,7 @@ func (m *ObjectDelete) GetId() string { return "" } +// SpaceSettingsSnapshot contains all the deleted ids in a snapshot type SpaceSettingsSnapshot struct { DeletedIds []string `protobuf:"bytes,1,rep,name=deletedIds,proto3" json:"deletedIds,omitempty"` } @@ -985,6 +991,7 @@ func (m *SpaceSettingsSnapshot) GetDeletedIds() []string { return nil } +// SettingsData contains ObjectTree change payload type SettingsData struct { Content []*SpaceSettingsContent `protobuf:"bytes,1,rep,name=content,proto3" json:"content,omitempty"` Snapshot *SpaceSettingsSnapshot `protobuf:"bytes,2,opt,name=snapshot,proto3" json:"snapshot,omitempty"` diff --git a/common/commonspace/syncstatus/noop.go b/common/commonspace/syncstatus/noop.go index ac978e54..586b90d2 100644 --- a/common/commonspace/syncstatus/noop.go +++ b/common/commonspace/syncstatus/noop.go @@ -2,7 +2,7 @@ package syncstatus type noOpSyncStatus struct{} -func NewNoOpSyncStatus() SyncStatusUpdater { +func NewNoOpSyncStatus() StatusUpdater { return &noOpSyncStatus{} } diff --git a/common/commonspace/syncstatus/syncstatus.go b/common/commonspace/syncstatus/syncstatus.go index 5de90f1a..6a1ed555 100644 --- a/common/commonspace/syncstatus/syncstatus.go +++ b/common/commonspace/syncstatus/syncstatus.go @@ -26,7 +26,7 @@ type UpdateReceiver interface { UpdateNodeConnection(online bool) } -type SyncStatusUpdater interface { +type StatusUpdater interface { HeadsChange(treeId string, heads []string) HeadsReceive(senderId, treeId string, heads []string) @@ -38,23 +38,23 @@ type SyncStatusUpdater interface { Close() error } -type SyncStatusWatcher interface { +type StatusWatcher interface { Watch(treeId string) (err error) Unwatch(treeId string) SetUpdateReceiver(updater UpdateReceiver) } -type SyncStatusProvider interface { - SyncStatusUpdater - SyncStatusWatcher +type StatusProvider interface { + StatusUpdater + StatusWatcher } type SyncStatus int const ( - SyncStatusUnknown SyncStatus = iota - SyncStatusSynced - SyncStatusNotSynced + StatusUnknown SyncStatus = iota + StatusSynced + StatusNotSynced ) type treeHeadsEntry struct { @@ -104,7 +104,7 @@ func DefaultDeps(configuration nodeconf.Configuration, store spacestorage.SpaceS } } -func NewSyncStatusProvider(spaceId string, deps SyncStatusDeps) SyncStatusProvider { +func NewSyncStatusProvider(spaceId string, deps SyncStatusDeps) StatusProvider { return &syncStatusProvider{ spaceId: spaceId, treeHeads: map[string]treeHeadsEntry{}, @@ -143,7 +143,7 @@ func (s *syncStatusProvider) HeadsChange(treeId string, heads []string) { s.treeHeads[treeId] = treeHeadsEntry{ heads: headsCopy, stateCounter: s.stateCounter, - syncStatus: SyncStatusNotSynced, + syncStatus: StatusNotSynced, } s.stateCounter++ } @@ -193,7 +193,7 @@ func (s *syncStatusProvider) HeadsReceive(senderId, treeId string, heads []strin defer s.Unlock() curTreeHeads, ok := s.treeHeads[treeId] - if !ok || curTreeHeads.syncStatus == SyncStatusSynced { + if !ok || curTreeHeads.syncStatus == StatusSynced { return } @@ -212,7 +212,7 @@ func (s *syncStatusProvider) HeadsReceive(senderId, treeId string, heads []strin return h == "" }) if len(curTreeHeads.heads) == 0 { - curTreeHeads.syncStatus = SyncStatusSynced + curTreeHeads.syncStatus = StatusSynced } s.treeHeads[treeId] = curTreeHeads } @@ -239,7 +239,7 @@ func (s *syncStatusProvider) Watch(treeId string) (err error) { s.treeHeads[treeId] = treeHeadsEntry{ heads: heads, stateCounter: s.stateCounter, - syncStatus: SyncStatusUnknown, + syncStatus: StatusUnknown, } } @@ -285,7 +285,7 @@ func (s *syncStatusProvider) RemoveAllExcept(senderId string, differentRemoteIds } // if we didn't find our treeId in heads ids which are different from us and node if _, found := slices.BinarySearch(differentRemoteIds, treeId); !found { - entry.syncStatus = SyncStatusSynced + entry.syncStatus = StatusSynced s.treeHeads[treeId] = entry } } diff --git a/node/Makefile b/node/Makefile index c6194e7c..167abd00 100644 --- a/node/Makefile +++ b/node/Makefile @@ -10,4 +10,4 @@ test: proto: @$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1) - $(GOGO_START) protoc --gogofaster_out=:. --go-drpc_out=protolib=github.com/gogo/protobuf:. api/apiproto/protos/*.proto \ No newline at end of file + $(GOGO_START) protoc --gogofaster_out=:. --go-drpc_out=protolib=github.com/gogo/protobuf:. debug/nodedebugrpc/nodedebugrpcproto/protos/*.proto \ No newline at end of file diff --git a/node/debug/nodedebugrpc/nodedebugrpc.go b/node/debug/nodedebugrpc/nodedebugrpc.go index 17f1a6b1..a55815bb 100644 --- a/node/debug/nodedebugrpc/nodedebugrpc.go +++ b/node/debug/nodedebugrpc/nodedebugrpc.go @@ -15,7 +15,7 @@ import ( "storj.io/drpc" ) -const CName = "debug.nodedebugrpc" +const CName = "node.debug.nodedebugrpc" var log = logger.NewNamed(CName) diff --git a/node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go b/node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc.pb.go similarity index 82% rename from node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go rename to node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc.pb.go index 718de42a..b7895afd 100644 --- a/node/debug/nodedebugrpc/nodedebugrpcproto/api.pb.go +++ b/node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: api/apiproto/protos/api.proto +// source: debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto package nodedebugrpcproto @@ -31,7 +31,7 @@ func (m *DumpTreeRequest) Reset() { *m = DumpTreeRequest{} } func (m *DumpTreeRequest) String() string { return proto.CompactTextString(m) } func (*DumpTreeRequest) ProtoMessage() {} func (*DumpTreeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{0} + return fileDescriptor_783a24b01ebd5381, []int{0} } func (m *DumpTreeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -82,7 +82,7 @@ func (m *DumpTreeResponse) Reset() { *m = DumpTreeResponse{} } func (m *DumpTreeResponse) String() string { return proto.CompactTextString(m) } func (*DumpTreeResponse) ProtoMessage() {} func (*DumpTreeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{1} + return fileDescriptor_783a24b01ebd5381, []int{1} } func (m *DumpTreeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -126,7 +126,7 @@ func (m *AllTreesRequest) Reset() { *m = AllTreesRequest{} } func (m *AllTreesRequest) String() string { return proto.CompactTextString(m) } func (*AllTreesRequest) ProtoMessage() {} func (*AllTreesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{2} + return fileDescriptor_783a24b01ebd5381, []int{2} } func (m *AllTreesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +171,7 @@ func (m *Tree) Reset() { *m = Tree{} } func (m *Tree) String() string { return proto.CompactTextString(m) } func (*Tree) ProtoMessage() {} func (*Tree) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{3} + return fileDescriptor_783a24b01ebd5381, []int{3} } func (m *Tree) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -222,7 +222,7 @@ func (m *AllTreesResponse) Reset() { *m = AllTreesResponse{} } func (m *AllTreesResponse) String() string { return proto.CompactTextString(m) } func (*AllTreesResponse) ProtoMessage() {} func (*AllTreesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{4} + return fileDescriptor_783a24b01ebd5381, []int{4} } func (m *AllTreesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -265,7 +265,7 @@ func (m *AllSpacesRequest) Reset() { *m = AllSpacesRequest{} } func (m *AllSpacesRequest) String() string { return proto.CompactTextString(m) } func (*AllSpacesRequest) ProtoMessage() {} func (*AllSpacesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{5} + return fileDescriptor_783a24b01ebd5381, []int{5} } func (m *AllSpacesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -302,7 +302,7 @@ func (m *AllSpacesResponse) Reset() { *m = AllSpacesResponse{} } func (m *AllSpacesResponse) String() string { return proto.CompactTextString(m) } func (*AllSpacesResponse) ProtoMessage() {} func (*AllSpacesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{6} + return fileDescriptor_783a24b01ebd5381, []int{6} } func (m *AllSpacesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -347,7 +347,7 @@ func (m *TreeParamsRequest) Reset() { *m = TreeParamsRequest{} } func (m *TreeParamsRequest) String() string { return proto.CompactTextString(m) } func (*TreeParamsRequest) ProtoMessage() {} func (*TreeParamsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{7} + return fileDescriptor_783a24b01ebd5381, []int{7} } func (m *TreeParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -399,7 +399,7 @@ func (m *TreeParamsResponse) Reset() { *m = TreeParamsResponse{} } func (m *TreeParamsResponse) String() string { return proto.CompactTextString(m) } func (*TreeParamsResponse) ProtoMessage() {} func (*TreeParamsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_fc31080c27db9707, []int{8} + return fileDescriptor_783a24b01ebd5381, []int{8} } func (m *TreeParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -454,35 +454,38 @@ func init() { proto.RegisterType((*TreeParamsResponse)(nil), "nodeapi.TreeParamsResponse") } -func init() { proto.RegisterFile("api/apiproto/protos/api.proto", fileDescriptor_fc31080c27db9707) } +func init() { + proto.RegisterFile("debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto", fileDescriptor_783a24b01ebd5381) +} -var fileDescriptor_fc31080c27db9707 = []byte{ - // 394 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xcd, 0x4a, 0xf3, 0x40, - 0x14, 0x6d, 0xd2, 0xdf, 0xdc, 0xef, 0xa7, 0xed, 0x20, 0x12, 0x23, 0x86, 0x32, 0x42, 0x29, 0x28, - 0x2d, 0xd4, 0x85, 0xcb, 0xd2, 0xa2, 0x42, 0x11, 0x45, 0xa2, 0x2b, 0x77, 0xb1, 0x33, 0x60, 0xa0, - 0xe9, 0x8c, 0x99, 0xe4, 0x3d, 0x5c, 0xf9, 0x4c, 0x2e, 0xbb, 0x74, 0x29, 0xed, 0x8b, 0xc8, 0x24, - 0x93, 0x34, 0xa9, 0x05, 0x17, 0x6e, 0x92, 0x39, 0x73, 0x6e, 0xce, 0x3d, 0x73, 0xcf, 0x04, 0x8e, - 0x5c, 0xee, 0x0d, 0x5c, 0xee, 0xf1, 0x80, 0x85, 0x6c, 0x10, 0x3f, 0x85, 0xc4, 0xfd, 0x78, 0x89, - 0xea, 0x0b, 0x46, 0xa8, 0xcb, 0x3d, 0x7c, 0x0d, 0xcd, 0x8b, 0xc8, 0xe7, 0x0f, 0x01, 0xa5, 0x0e, - 0x7d, 0x89, 0xa8, 0x08, 0x91, 0x09, 0x75, 0xc1, 0xdd, 0x19, 0x9d, 0x12, 0x53, 0xeb, 0x68, 0x3d, - 0xc3, 0x49, 0x21, 0xb2, 0x01, 0x08, 0x9b, 0x45, 0x3e, 0x5d, 0x84, 0x53, 0x62, 0xea, 0x31, 0x99, - 0xdb, 0xc1, 0x5d, 0x68, 0x6d, 0xc4, 0x04, 0x67, 0x0b, 0x41, 0x11, 0x82, 0x0a, 0x89, 0x7c, 0xae, - 0xa4, 0xe2, 0x35, 0x3e, 0x81, 0xe6, 0x78, 0x3e, 0x97, 0x65, 0xe2, 0xc7, 0xa6, 0xf8, 0x14, 0x2a, - 0xb2, 0x12, 0xfd, 0x07, 0xdd, 0x4b, 0x49, 0xdd, 0x23, 0x68, 0x0f, 0xaa, 0xcf, 0xd4, 0x25, 0xc2, - 0xd4, 0x3b, 0xe5, 0x9e, 0xe1, 0x24, 0x00, 0x9f, 0x43, 0x6b, 0x23, 0xad, 0x2c, 0x1c, 0x43, 0x35, - 0x94, 0x1b, 0xa6, 0xd6, 0x29, 0xf7, 0xfe, 0x0c, 0xff, 0xf5, 0xd5, 0xe1, 0xfb, 0xb1, 0xd1, 0x84, - 0xc3, 0x28, 0xfe, 0xf0, 0x5e, 0x36, 0x4d, 0x4d, 0xe1, 0x01, 0xb4, 0x73, 0x7b, 0x4a, 0xcd, 0x82, - 0x86, 0xb2, 0x96, 0x08, 0x1a, 0x4e, 0x86, 0xf1, 0x0d, 0xb4, 0xa5, 0xe6, 0x9d, 0x1b, 0xb8, 0xbe, - 0xf8, 0xfd, 0x3c, 0xaf, 0x00, 0xe5, 0xe5, 0x94, 0x81, 0x7d, 0xa8, 0x05, 0x8c, 0x85, 0x99, 0x9c, - 0x42, 0xb2, 0x8f, 0x9c, 0xc1, 0x34, 0x1b, 0x49, 0x0a, 0x87, 0x6f, 0x3a, 0xd4, 0x6f, 0x19, 0xa1, - 0x63, 0xee, 0xa1, 0x11, 0x34, 0xd2, 0x8c, 0x90, 0x99, 0x4d, 0x62, 0xeb, 0x0e, 0x58, 0x07, 0x3b, - 0x18, 0xd5, 0xfe, 0x12, 0x60, 0x63, 0x0a, 0x59, 0x85, 0x61, 0x16, 0x0e, 0x6e, 0x1d, 0xee, 0xe4, - 0x94, 0xcc, 0x08, 0x1a, 0x69, 0x50, 0x39, 0x1f, 0x5b, 0xd7, 0x22, 0xe7, 0xe3, 0x5b, 0xaa, 0x13, - 0x30, 0xb2, 0x70, 0x50, 0xa1, 0xae, 0x10, 0xa2, 0x65, 0xed, 0xa2, 0x12, 0x8d, 0x49, 0xf7, 0x7d, - 0x65, 0x6b, 0xcb, 0x95, 0xad, 0x7d, 0xae, 0x6c, 0xed, 0x75, 0x6d, 0x97, 0x96, 0x6b, 0xbb, 0xf4, - 0xb1, 0xb6, 0x4b, 0x8f, 0x7f, 0xf3, 0xff, 0xcf, 0x53, 0x2d, 0x7e, 0x9d, 0x7d, 0x05, 0x00, 0x00, - 0xff, 0xff, 0xb6, 0x98, 0xe5, 0x1d, 0x56, 0x03, 0x00, 0x00, +var fileDescriptor_783a24b01ebd5381 = []byte{ + // 406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xcf, 0x6b, 0xdb, 0x30, + 0x18, 0x8d, 0x9d, 0x9f, 0xfe, 0xc6, 0x96, 0x44, 0x8c, 0xe1, 0x79, 0x60, 0x82, 0x36, 0x46, 0x60, + 0x23, 0x81, 0xec, 0xb0, 0x5b, 0x42, 0xc2, 0x36, 0x08, 0xa3, 0xa5, 0xb8, 0x3d, 0xf5, 0xe6, 0x44, + 0xa2, 0x35, 0xc4, 0x91, 0x6a, 0xd9, 0xff, 0x47, 0x4f, 0xfd, 0x9b, 0x7a, 0xcc, 0xb1, 0xc7, 0x92, + 0xfc, 0x23, 0x45, 0xb2, 0xec, 0xd8, 0x69, 0xa0, 0x85, 0x5e, 0x6c, 0xbd, 0xef, 0xc9, 0xef, 0x7b, + 0xfa, 0x9e, 0x0c, 0x63, 0x42, 0x17, 0xc9, 0xd5, 0x70, 0xcd, 0x08, 0x55, 0xab, 0x88, 0x2f, 0x4b, + 0x80, 0x47, 0x2c, 0x66, 0x43, 0xf5, 0x14, 0x25, 0x62, 0xa0, 0x6a, 0xa8, 0x29, 0x6b, 0x3e, 0x0f, + 0xf0, 0x7f, 0x68, 0xff, 0x49, 0x42, 0x7e, 0x11, 0x51, 0xea, 0xd1, 0x9b, 0x84, 0x8a, 0x18, 0xd9, + 0xd0, 0x14, 0xdc, 0x5f, 0xd2, 0x39, 0xb1, 0x8d, 0x9e, 0xd1, 0xb7, 0xbc, 0x0c, 0x22, 0x17, 0x80, + 0xb0, 0x65, 0x12, 0xd2, 0x75, 0x3c, 0x27, 0xb6, 0xa9, 0xc8, 0x42, 0x05, 0x7f, 0x87, 0xce, 0x5e, + 0x4c, 0x70, 0xb6, 0x16, 0x14, 0x21, 0xa8, 0x91, 0x24, 0xe4, 0x5a, 0x4a, 0xad, 0xf1, 0x0f, 0x68, + 0x4f, 0x57, 0x2b, 0xb9, 0x4d, 0xbc, 0xd8, 0x14, 0xff, 0x84, 0x9a, 0xdc, 0x89, 0x3e, 0x80, 0x19, + 0x64, 0xa4, 0x19, 0x10, 0xf4, 0x11, 0xea, 0xd7, 0xd4, 0x27, 0xc2, 0x36, 0x7b, 0xd5, 0xbe, 0xe5, + 0xa5, 0x00, 0xff, 0x86, 0xce, 0x5e, 0x5a, 0x5b, 0xf8, 0x0a, 0xf5, 0x58, 0x16, 0x6c, 0xa3, 0x57, + 0xed, 0xbf, 0x1b, 0xbd, 0x1f, 0xe8, 0xc3, 0x0f, 0x94, 0xd1, 0x94, 0xc3, 0x48, 0x7d, 0x78, 0x2e, + 0x9b, 0x66, 0xa6, 0xf0, 0x10, 0xba, 0x85, 0x9a, 0x56, 0x73, 0xa0, 0xa5, 0xad, 0xa5, 0x82, 0x96, + 0x97, 0x63, 0x7c, 0x02, 0x5d, 0xa9, 0x79, 0xe6, 0x47, 0x7e, 0x28, 0xde, 0x3e, 0xcf, 0x7f, 0x80, + 0x8a, 0x72, 0xda, 0xc0, 0x27, 0x68, 0x44, 0x8c, 0xc5, 0xb9, 0x9c, 0x46, 0xb2, 0x8f, 0x9c, 0xc1, + 0x3c, 0x1f, 0x49, 0x06, 0x47, 0x77, 0x26, 0x34, 0x4f, 0x19, 0xa1, 0x53, 0x1e, 0xa0, 0x09, 0xb4, + 0xb2, 0x8c, 0x90, 0x9d, 0x4f, 0xe2, 0xe0, 0x0e, 0x38, 0x9f, 0x8f, 0x30, 0xba, 0xfd, 0x5f, 0x80, + 0xbd, 0x29, 0xe4, 0x94, 0x86, 0x59, 0x3a, 0xb8, 0xf3, 0xe5, 0x28, 0xa7, 0x65, 0x26, 0xd0, 0xca, + 0x82, 0x2a, 0xf8, 0x38, 0xb8, 0x16, 0x05, 0x1f, 0xcf, 0x52, 0x9d, 0x81, 0x95, 0x87, 0x83, 0x4a, + 0xfb, 0x4a, 0x21, 0x3a, 0xce, 0x31, 0x2a, 0xd5, 0x98, 0x8d, 0xef, 0xb7, 0xae, 0xb1, 0xd9, 0xba, + 0xc6, 0xe3, 0xd6, 0x35, 0x6e, 0x77, 0x6e, 0x65, 0xb3, 0x73, 0x2b, 0x0f, 0x3b, 0xb7, 0x72, 0xf9, + 0xed, 0x35, 0x3f, 0xd8, 0xa2, 0xa1, 0x5e, 0xbf, 0x9e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xac, 0x0e, + 0xb9, 0x90, 0x8f, 0x03, 0x00, 0x00, } func (m *DumpTreeRequest) Marshal() (dAtA []byte, err error) { @@ -508,14 +511,14 @@ func (m *DumpTreeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -545,7 +548,7 @@ func (m *DumpTreeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Dump) > 0 { i -= len(m.Dump) copy(dAtA[i:], m.Dump) - i = encodeVarintApi(dAtA, i, uint64(len(m.Dump))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.Dump))) i-- dAtA[i] = 0xa } @@ -575,7 +578,7 @@ func (m *AllTreesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -606,7 +609,7 @@ func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.Heads) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Heads[iNdEx]) copy(dAtA[i:], m.Heads[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.Heads[iNdEx]))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.Heads[iNdEx]))) i-- dAtA[i] = 0x12 } @@ -614,7 +617,7 @@ func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.Id) > 0 { i -= len(m.Id) copy(dAtA[i:], m.Id) - i = encodeVarintApi(dAtA, i, uint64(len(m.Id))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.Id))) i-- dAtA[i] = 0xa } @@ -649,7 +652,7 @@ func (m *AllTreesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return 0, err } i -= size - i = encodeVarintApi(dAtA, i, uint64(size)) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(size)) } i-- dAtA[i] = 0xa @@ -705,7 +708,7 @@ func (m *AllSpacesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.SpaceIds) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.SpaceIds[iNdEx]) copy(dAtA[i:], m.SpaceIds[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceIds[iNdEx]))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.SpaceIds[iNdEx]))) i-- dAtA[i] = 0xa } @@ -736,14 +739,14 @@ func (m *TreeParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) - i = encodeVarintApi(dAtA, i, uint64(len(m.DocumentId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.DocumentId))) i-- dAtA[i] = 0x12 } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) - i = encodeVarintApi(dAtA, i, uint64(len(m.SpaceId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.SpaceId))) i-- dAtA[i] = 0xa } @@ -774,7 +777,7 @@ func (m *TreeParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { for iNdEx := len(m.HeadIds) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.HeadIds[iNdEx]) copy(dAtA[i:], m.HeadIds[iNdEx]) - i = encodeVarintApi(dAtA, i, uint64(len(m.HeadIds[iNdEx]))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.HeadIds[iNdEx]))) i-- dAtA[i] = 0x12 } @@ -782,15 +785,15 @@ func (m *TreeParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { if len(m.RootId) > 0 { i -= len(m.RootId) copy(dAtA[i:], m.RootId) - i = encodeVarintApi(dAtA, i, uint64(len(m.RootId))) + i = encodeVarintNodedebugrpc(dAtA, i, uint64(len(m.RootId))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func encodeVarintApi(dAtA []byte, offset int, v uint64) int { - offset -= sovApi(v) +func encodeVarintNodedebugrpc(dAtA []byte, offset int, v uint64) int { + offset -= sovNodedebugrpc(v) base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) @@ -808,11 +811,11 @@ func (m *DumpTreeRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } return n } @@ -825,7 +828,7 @@ func (m *DumpTreeResponse) Size() (n int) { _ = l l = len(m.Dump) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } return n } @@ -838,7 +841,7 @@ func (m *AllTreesRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } return n } @@ -851,12 +854,12 @@ func (m *Tree) Size() (n int) { _ = l l = len(m.Id) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } if len(m.Heads) > 0 { for _, s := range m.Heads { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } } return n @@ -871,7 +874,7 @@ func (m *AllTreesResponse) Size() (n int) { if len(m.Trees) > 0 { for _, e := range m.Trees { l = e.Size() - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } } return n @@ -895,7 +898,7 @@ func (m *AllSpacesResponse) Size() (n int) { if len(m.SpaceIds) > 0 { for _, s := range m.SpaceIds { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } } return n @@ -909,11 +912,11 @@ func (m *TreeParamsRequest) Size() (n int) { _ = l l = len(m.SpaceId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } l = len(m.DocumentId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } return n } @@ -926,22 +929,22 @@ func (m *TreeParamsResponse) Size() (n int) { _ = l l = len(m.RootId) if l > 0 { - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } if len(m.HeadIds) > 0 { for _, s := range m.HeadIds { l = len(s) - n += 1 + l + sovApi(uint64(l)) + n += 1 + l + sovNodedebugrpc(uint64(l)) } } return n } -func sovApi(x uint64) (n int) { +func sovNodedebugrpc(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } -func sozApi(x uint64) (n int) { - return sovApi(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozNodedebugrpc(x uint64) (n int) { + return sovNodedebugrpc(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) @@ -951,7 +954,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -979,7 +982,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -993,11 +996,11 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1011,7 +1014,7 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1025,11 +1028,11 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1038,12 +1041,12 @@ func (m *DumpTreeRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1065,7 +1068,7 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1093,7 +1096,7 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1107,11 +1110,11 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1120,12 +1123,12 @@ func (m *DumpTreeResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1147,7 +1150,7 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1175,7 +1178,7 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1189,11 +1192,11 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1202,12 +1205,12 @@ func (m *AllTreesRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1229,7 +1232,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1257,7 +1260,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1271,11 +1274,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1289,7 +1292,7 @@ func (m *Tree) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1303,11 +1306,11 @@ func (m *Tree) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1316,12 +1319,12 @@ func (m *Tree) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1343,7 +1346,7 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1371,7 +1374,7 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1384,11 +1387,11 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + msglen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1400,12 +1403,12 @@ func (m *AllTreesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1427,7 +1430,7 @@ func (m *AllSpacesRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1450,12 +1453,12 @@ func (m *AllSpacesRequest) Unmarshal(dAtA []byte) error { switch fieldNum { default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1477,7 +1480,7 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1505,7 +1508,7 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1519,11 +1522,11 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1532,12 +1535,12 @@ func (m *AllSpacesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1559,7 +1562,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1587,7 +1590,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1601,11 +1604,11 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1619,7 +1622,7 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1633,11 +1636,11 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1646,12 +1649,12 @@ func (m *TreeParamsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1673,7 +1676,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1701,7 +1704,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1715,11 +1718,11 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1733,7 +1736,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowApi + return ErrIntOverflowNodedebugrpc } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -1747,11 +1750,11 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } postIndex := iNdEx + intStringLen if postIndex < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if postIndex > l { return io.ErrUnexpectedEOF @@ -1760,12 +1763,12 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipApi(dAtA[iNdEx:]) + skippy, err := skipNodedebugrpc(dAtA[iNdEx:]) if err != nil { return err } if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthApi + return ErrInvalidLengthNodedebugrpc } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -1779,7 +1782,7 @@ func (m *TreeParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func skipApi(dAtA []byte) (n int, err error) { +func skipNodedebugrpc(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 depth := 0 @@ -1787,7 +1790,7 @@ func skipApi(dAtA []byte) (n int, err error) { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowNodedebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -1804,7 +1807,7 @@ func skipApi(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowNodedebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -1820,7 +1823,7 @@ func skipApi(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowApi + return 0, ErrIntOverflowNodedebugrpc } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -1833,14 +1836,14 @@ func skipApi(dAtA []byte) (n int, err error) { } } if length < 0 { - return 0, ErrInvalidLengthApi + return 0, ErrInvalidLengthNodedebugrpc } iNdEx += length case 3: depth++ case 4: if depth == 0 { - return 0, ErrUnexpectedEndOfGroupApi + return 0, ErrUnexpectedEndOfGroupNodedebugrpc } depth-- case 5: @@ -1849,7 +1852,7 @@ func skipApi(dAtA []byte) (n int, err error) { return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } if iNdEx < 0 { - return 0, ErrInvalidLengthApi + return 0, ErrInvalidLengthNodedebugrpc } if depth == 0 { return iNdEx, nil @@ -1859,7 +1862,7 @@ func skipApi(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupApi = fmt.Errorf("proto: unexpected end of group") + ErrInvalidLengthNodedebugrpc = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowNodedebugrpc = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupNodedebugrpc = fmt.Errorf("proto: unexpected end of group") ) diff --git a/node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go b/node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc_drpc.pb.go similarity index 74% rename from node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go rename to node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc_drpc.pb.go index f13b466b..4981b9fd 100644 --- a/node/debug/nodedebugrpc/nodedebugrpcproto/api_drpc.pb.go +++ b/node/debug/nodedebugrpc/nodedebugrpcproto/nodedebugrpc_drpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-drpc. DO NOT EDIT. // protoc-gen-go-drpc version: v0.0.32 -// source: api/apiproto/protos/api.proto +// source: debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto package nodedebugrpcproto @@ -14,17 +14,17 @@ import ( drpcerr "storj.io/drpc/drpcerr" ) -type drpcEncoding_File_api_apiproto_protos_api_proto struct{} +type drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto struct{} -func (drpcEncoding_File_api_apiproto_protos_api_proto) Marshal(msg drpc.Message) ([]byte, error) { +func (drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto) Marshal(msg drpc.Message) ([]byte, error) { return proto.Marshal(msg.(proto.Message)) } -func (drpcEncoding_File_api_apiproto_protos_api_proto) Unmarshal(buf []byte, msg drpc.Message) error { +func (drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto) Unmarshal(buf []byte, msg drpc.Message) error { return proto.Unmarshal(buf, msg.(proto.Message)) } -func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONMarshal(msg drpc.Message) ([]byte, error) { +func (drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto) JSONMarshal(msg drpc.Message) ([]byte, error) { var buf bytes.Buffer err := new(jsonpb.Marshaler).Marshal(&buf, msg.(proto.Message)) if err != nil { @@ -33,7 +33,7 @@ func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONMarshal(msg drpc.Mess return buf.Bytes(), nil } -func (drpcEncoding_File_api_apiproto_protos_api_proto) JSONUnmarshal(buf []byte, msg drpc.Message) error { +func (drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto) JSONUnmarshal(buf []byte, msg drpc.Message) error { return jsonpb.Unmarshal(bytes.NewReader(buf), msg.(proto.Message)) } @@ -58,7 +58,7 @@ func (c *drpcNodeApiClient) DRPCConn() drpc.Conn { return c.cc } func (c *drpcNodeApiClient) DumpTree(ctx context.Context, in *DumpTreeRequest) (*DumpTreeResponse, error) { out := new(DumpTreeResponse) - err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/DumpTree", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/DumpTree", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -67,7 +67,7 @@ func (c *drpcNodeApiClient) DumpTree(ctx context.Context, in *DumpTreeRequest) ( func (c *drpcNodeApiClient) TreeParams(ctx context.Context, in *TreeParamsRequest) (*TreeParamsResponse, error) { out := new(TreeParamsResponse) - err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/TreeParams", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/TreeParams", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (c *drpcNodeApiClient) TreeParams(ctx context.Context, in *TreeParamsReques func (c *drpcNodeApiClient) AllTrees(ctx context.Context, in *AllTreesRequest) (*AllTreesResponse, error) { out := new(AllTreesResponse) - err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/AllTrees", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/AllTrees", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -85,7 +85,7 @@ func (c *drpcNodeApiClient) AllTrees(ctx context.Context, in *AllTreesRequest) ( func (c *drpcNodeApiClient) AllSpaces(ctx context.Context, in *AllSpacesRequest) (*AllSpacesResponse, error) { out := new(AllSpacesResponse) - err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/AllSpaces", drpcEncoding_File_api_apiproto_protos_api_proto{}, in, out) + err := c.cc.Invoke(ctx, "/nodeapi.NodeApi/AllSpaces", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, in, out) if err != nil { return nil, err } @@ -124,7 +124,7 @@ func (DRPCNodeApiDescription) NumMethods() int { return 4 } func (DRPCNodeApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { case 0: - return "/nodeapi.NodeApi/DumpTree", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/nodeapi.NodeApi/DumpTree", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCNodeApiServer). DumpTree( @@ -133,7 +133,7 @@ func (DRPCNodeApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receive ) }, DRPCNodeApiServer.DumpTree, true case 1: - return "/nodeapi.NodeApi/TreeParams", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/nodeapi.NodeApi/TreeParams", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCNodeApiServer). TreeParams( @@ -142,7 +142,7 @@ func (DRPCNodeApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receive ) }, DRPCNodeApiServer.TreeParams, true case 2: - return "/nodeapi.NodeApi/AllTrees", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/nodeapi.NodeApi/AllTrees", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCNodeApiServer). AllTrees( @@ -151,7 +151,7 @@ func (DRPCNodeApiDescription) Method(n int) (string, drpc.Encoding, drpc.Receive ) }, DRPCNodeApiServer.AllTrees, true case 3: - return "/nodeapi.NodeApi/AllSpaces", drpcEncoding_File_api_apiproto_protos_api_proto{}, + return "/nodeapi.NodeApi/AllSpaces", drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { return srv.(DRPCNodeApiServer). AllSpaces( @@ -178,7 +178,7 @@ type drpcNodeApi_DumpTreeStream struct { } func (x *drpcNodeApi_DumpTreeStream) SendAndClose(m *DumpTreeResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -194,7 +194,7 @@ type drpcNodeApi_TreeParamsStream struct { } func (x *drpcNodeApi_TreeParamsStream) SendAndClose(m *TreeParamsResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -210,7 +210,7 @@ type drpcNodeApi_AllTreesStream struct { } func (x *drpcNodeApi_AllTreesStream) SendAndClose(m *AllTreesResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}); err != nil { return err } return x.CloseSend() @@ -226,7 +226,7 @@ type drpcNodeApi_AllSpacesStream struct { } func (x *drpcNodeApi_AllSpacesStream) SendAndClose(m *AllSpacesResponse) error { - if err := x.MsgSend(m, drpcEncoding_File_api_apiproto_protos_api_proto{}); err != nil { + if err := x.MsgSend(m, drpcEncoding_File_debug_nodedebugrpc_nodedebugrpcproto_protos_nodedebugrpc_proto{}); err != nil { return err } return x.CloseSend() diff --git a/node/debug/nodedebugrpc/nodedebugrpcproto/protos/api.proto b/node/debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto similarity index 93% rename from node/debug/nodedebugrpc/nodedebugrpcproto/protos/api.proto rename to node/debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto index 4ed13b20..0425bc61 100644 --- a/node/debug/nodedebugrpc/nodedebugrpcproto/protos/api.proto +++ b/node/debug/nodedebugrpc/nodedebugrpcproto/protos/nodedebugrpc.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package nodeapi; -option go_package = "api/apiproto"; +option go_package = "debug/nodedebugrpc/nodedebugrpcproto"; service NodeApi { rpc DumpTree(DumpTreeRequest) returns(DumpTreeResponse); diff --git a/node/nodespace/rpchandler.go b/node/nodespace/rpchandler.go index 0e9d7da4..f82f6d79 100644 --- a/node/nodespace/rpchandler.go +++ b/node/nodespace/rpchandler.go @@ -10,7 +10,7 @@ type rpcHandler struct { s *service } -func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { +func (r *rpcHandler) SpacePull(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { sp, err := r.s.GetSpace(ctx, request.Id) if err != nil { if err != spacesyncproto.ErrSpaceMissing { @@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Spac return } -func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { +func (r *rpcHandler) SpacePush(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { description := commonspace.SpaceDescription{ SpaceHeader: req.Payload.SpaceHeader, AclId: req.Payload.AclPayloadId, @@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR return sp.SpaceSyncRpc().HeadSync(ctx, req) } -func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { +func (r *rpcHandler) ObjectSyncStream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { msg, err := stream.Recv() if err != nil { return err diff --git a/node/nodespace/service.go b/node/nodespace/service.go index 1d07efbb..26ae28ca 100644 --- a/node/nodespace/service.go +++ b/node/nodespace/service.go @@ -43,7 +43,7 @@ func (s *service) Init(a *app.App) (err error) { ocache.WithGCPeriod(time.Minute), ocache.WithTTL(time.Duration(s.conf.GCTTL)*time.Second), ) - return spacesyncproto.DRPCRegisterSpace(a.MustComponent(server.CName).(server.DRPCServer), &rpcHandler{s}) + return spacesyncproto.DRPCRegisterSpaceSync(a.MustComponent(server.CName).(server.DRPCServer), &rpcHandler{s}) } func (s *service) Name() (name string) { diff --git a/util/cmd/debug/commands/client/service.go b/util/cmd/debug/commands/client/service.go index f370e0e0..b5f57eac 100644 --- a/util/cmd/debug/commands/client/service.go +++ b/util/cmd/debug/commands/client/service.go @@ -8,7 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cmd/debug/drpcclient" ) -const CName = "commands.client" +const CName = "debug.commands.client" var log = logger.NewNamed(CName) diff --git a/util/cmd/debug/commands/node/service.go b/util/cmd/debug/commands/node/service.go index 32b81fcb..0d83d38c 100644 --- a/util/cmd/debug/commands/node/service.go +++ b/util/cmd/debug/commands/node/service.go @@ -8,7 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cmd/debug/drpcclient" ) -const CName = "commands.node" +const CName = "debug.commands.node" var log = logger.NewNamed(CName) From 9da4e0e7e9fdbcdb28df56ed18871cd22ca7ee19 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 26 Dec 2022 17:52:39 +0100 Subject: [PATCH 06/17] Change ACL to Acl --- client/clientspace/rpchandler.go | 6 +- client/clientspace/service.go | 2 +- client/storage/keys.go | 2 +- client/storage/liststorage.go | 18 +- client/storage/liststorage_test.go | 6 +- client/storage/spacestorage.go | 2 +- client/storage/spacestorage_test.go | 4 +- common/commonspace/commongetter.go | 4 +- common/commonspace/headsync/diffsyncer.go | 2 +- .../commonspace/headsync/diffsyncer_test.go | 4 +- .../acl/aclrecordproto/aclreadkeyderive.go | 2 +- .../object/acl/aclrecordproto/aclrecord.pb.go | 1206 ++++++++--------- .../acl/aclrecordproto/protos/aclrecord.proto | 70 +- .../object/acl/list/aclrecordbuilder.go | 36 +- .../object/acl/list/aclrecordbuilder_test.go | 12 +- .../commonspace/object/acl/list/aclstate.go | 92 +- .../object/acl/list/aclstatebuilder.go | 12 +- common/commonspace/object/acl/list/list.go | 54 +- .../commonspace/object/acl/list/list_test.go | 50 +- .../object/acl/list/mock_list/mock_list.go | 130 +- common/commonspace/object/acl/list/record.go | 2 +- .../object/acl/liststorage/inmemory.go | 26 +- .../object/acl/liststorage/liststorage.go | 10 +- .../mock_liststorage/mock_liststorage.go | 10 +- .../commonspace/object/acl/syncacl/syncacl.go | 10 +- .../object/acl/syncacl/syncaclhandler.go | 6 +- .../acl/testutils/acllistbuilder/keychain.go | 2 +- .../acllistbuilder/liststoragebuilder.go | 88 +- .../acllistbuilder/liststoragebuildergraph.go | 2 +- .../liststoragebuildergraph_nix.go | 10 +- .../testutils/acllistbuilder/ymlentities.go | 4 +- .../object/tree/objecttree/changevalidator.go | 18 +- .../object/tree/objecttree/objecttree.go | 14 +- .../object/tree/objecttree/objecttree_test.go | 14 +- .../tree/objecttree/objecttreefactory.go | 8 +- .../tree/objecttree/rawtreevalidator.go | 2 +- .../object/tree/synctree/synctree.go | 4 +- .../object/tree/synctree/synctree_test.go | 8 +- .../mock_treestorage/mock_storage.go | 10 +- common/commonspace/payloads.go | 16 +- common/commonspace/space.go | 8 +- common/commonspace/spaceservice.go | 4 +- .../mock_spacestorage/mock_storage.go | 12 +- common/commonspace/spacestorage/storage.go | 4 +- node/acl/service.go | 12 +- node/acl/service_test.go | 14 +- node/acl/watcher.go | 12 +- node/storage/liststorage.go | 20 +- node/storage/liststorage_test.go | 8 +- node/storage/spacestorage.go | 2 +- node/storage/spacestorage_test.go | 4 +- 51 files changed, 1039 insertions(+), 1039 deletions(-) diff --git a/client/clientspace/rpchandler.go b/client/clientspace/rpchandler.go index df6a8dc0..45f8a4be 100644 --- a/client/clientspace/rpchandler.go +++ b/client/clientspace/rpchandler.go @@ -10,7 +10,7 @@ type rpcHandler struct { s *service } -func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { +func (r *rpcHandler) SpacePull(ctx context.Context, request *spacesyncproto.SpacePullRequest) (resp *spacesyncproto.SpacePullResponse, err error) { sp, err := r.s.GetSpace(ctx, request.Id) if err != nil { if err != spacesyncproto.ErrSpaceMissing { @@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Spac return } -func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { +func (r *rpcHandler) SpacePush(ctx context.Context, req *spacesyncproto.SpacePushRequest) (resp *spacesyncproto.SpacePushResponse, err error) { description := commonspace.SpaceDescription{ SpaceHeader: req.Payload.SpaceHeader, AclId: req.Payload.AclPayloadId, @@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR return sp.SpaceSyncRpc().HeadSync(ctx, req) } -func (r *rpcHandler) Stream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { +func (r *rpcHandler) ObjectSyncStream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error { msg, err := stream.Recv() if err != nil { return err diff --git a/client/clientspace/service.go b/client/clientspace/service.go index 046242cc..e545003f 100644 --- a/client/clientspace/service.go +++ b/client/clientspace/service.go @@ -46,7 +46,7 @@ func (s *service) Init(a *app.App) (err error) { ocache.WithGCPeriod(time.Minute), ocache.WithTTL(time.Duration(s.conf.GCTTL)*time.Second), ) - return spacesyncproto.DRPCRegisterSpace(a.MustComponent(server.CName).(server.DRPCServer), &rpcHandler{s}) + return spacesyncproto.DRPCRegisterSpaceSync(a.MustComponent(server.CName).(server.DRPCServer), &rpcHandler{s}) } func (s *service) Name() (name string) { diff --git a/client/storage/keys.go b/client/storage/keys.go index e3688ce3..b2d7ac61 100644 --- a/client/storage/keys.go +++ b/client/storage/keys.go @@ -10,7 +10,7 @@ type aclKeys struct { headKey []byte } -func newACLKeys(spaceId string) aclKeys { +func newAclKeys(spaceId string) aclKeys { return aclKeys{ spaceId: spaceId, rootKey: treestorage.JoinStringsToBytes("space", spaceId, "a", "rootId"), diff --git a/client/storage/liststorage.go b/client/storage/liststorage.go index ed6456cb..923a274d 100644 --- a/client/storage/liststorage.go +++ b/client/storage/liststorage.go @@ -14,11 +14,11 @@ type listStorage struct { db *badger.DB keys aclKeys id string - root *aclrecordproto.RawACLRecordWithId + root *aclrecordproto.RawAclRecordWithId } func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls liststorage.ListStorage, err error) { - keys := newACLKeys(spaceId) + keys := newAclKeys(spaceId) rootId, err := getTxn(txn, keys.RootIdKey()) if err != nil { return @@ -30,7 +30,7 @@ func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls liststor return } - rootWithId := &aclrecordproto.RawACLRecordWithId{ + rootWithId := &aclrecordproto.RawAclRecordWithId{ Payload: value, Id: stringId, } @@ -44,8 +44,8 @@ func newListStorage(spaceId string, db *badger.DB, txn *badger.Txn) (ls liststor return } -func createListStorage(spaceId string, db *badger.DB, txn *badger.Txn, root *aclrecordproto.RawACLRecordWithId) (ls liststorage.ListStorage, err error) { - keys := newACLKeys(spaceId) +func createListStorage(spaceId string, db *badger.DB, txn *badger.Txn, root *aclrecordproto.RawAclRecordWithId) (ls liststorage.ListStorage, err error) { + keys := newAclKeys(spaceId) _, err = getTxn(txn, keys.RootIdKey()) if err != badger.ErrKeyNotFound { if err == nil { @@ -81,7 +81,7 @@ func (l *listStorage) Id() string { return l.id } -func (l *listStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { +func (l *listStorage) Root() (*aclrecordproto.RawAclRecordWithId, error) { return l.root, nil } @@ -94,7 +94,7 @@ func (l *listStorage) Head() (head string, err error) { return } -func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclrecordproto.RawACLRecordWithId, err error) { +func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclrecordproto.RawAclRecordWithId, err error) { res, err := getDB(l.db, l.keys.RawRecordKey(id)) if err != nil { if err == badger.ErrKeyNotFound { @@ -103,7 +103,7 @@ func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclreco return } - raw = &aclrecordproto.RawACLRecordWithId{ + raw = &aclrecordproto.RawAclRecordWithId{ Payload: res, Id: id, } @@ -114,6 +114,6 @@ func (l *listStorage) SetHead(headId string) (err error) { return putDB(l.db, l.keys.HeadIdKey(), []byte(headId)) } -func (l *listStorage) AddRawRecord(ctx context.Context, rec *aclrecordproto.RawACLRecordWithId) error { +func (l *listStorage) AddRawRecord(ctx context.Context, rec *aclrecordproto.RawAclRecordWithId) error { return putDB(l.db, l.keys.RawRecordKey(rec.Id), rec.Payload) } diff --git a/client/storage/liststorage_test.go b/client/storage/liststorage_test.go index 7146fc67..8b9a344c 100644 --- a/client/storage/liststorage_test.go +++ b/client/storage/liststorage_test.go @@ -9,7 +9,7 @@ import ( "testing" ) -func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { +func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawAclRecordWithId, head string) { require.Equal(t, store.Id(), root.Id) aclRoot, err := store.Root() @@ -26,7 +26,7 @@ func TestListStorage(t *testing.T) { fx.open(t) defer fx.stop(t) spaceId := "spaceId" - aclRoot := &aclrecordproto.RawACLRecordWithId{Payload: []byte("root"), Id: "someRootId"} + aclRoot := &aclrecordproto.RawAclRecordWithId{Payload: []byte("root"), Id: "someRootId"} fx.db.Update(func(txn *badger.Txn) error { _, err := createListStorage(spaceId, fx.db, txn, aclRoot) @@ -63,7 +63,7 @@ func TestListStorage(t *testing.T) { }) t.Run("add raw record and get raw record", func(t *testing.T) { - newRec := &aclrecordproto.RawACLRecordWithId{Payload: []byte("rec"), Id: "someRecId"} + newRec := &aclrecordproto.RawAclRecordWithId{Payload: []byte("rec"), Id: "someRecId"} require.NoError(t, listStore.AddRawRecord(context.Background(), newRec)) aclRec, err := listStore.GetRawRecord(context.Background(), newRec.Id) require.NoError(t, err) diff --git a/client/storage/spacestorage.go b/client/storage/spacestorage.go index c1447d10..83022299 100644 --- a/client/storage/spacestorage.go +++ b/client/storage/spacestorage.go @@ -120,7 +120,7 @@ func (s *spaceStorage) CreateTreeStorage(payload storage.TreeStorageCreatePayloa return createTreeStorage(s.objDb, s.spaceId, payload) } -func (s *spaceStorage) ACLStorage() (liststorage.ListStorage, error) { +func (s *spaceStorage) AclStorage() (liststorage.ListStorage, error) { return s.aclStorage, nil } diff --git a/client/storage/spacestorage_test.go b/client/storage/spacestorage_test.go index 8083d2f0..7b48068c 100644 --- a/client/storage/spacestorage_test.go +++ b/client/storage/spacestorage_test.go @@ -16,7 +16,7 @@ func spaceTestPayload() spacestorage.SpaceStorageCreatePayload { RawHeader: []byte("header"), Id: "headerId", } - aclRoot := &aclrecordproto.RawACLRecordWithId{ + aclRoot := &aclrecordproto.RawAclRecordWithId{ Payload: []byte("aclRoot"), Id: "aclRootId", } @@ -36,7 +36,7 @@ func testSpace(t *testing.T, store spacestorage.SpaceStorage, payload spacestora require.NoError(t, err) require.Equal(t, payload.SpaceHeaderWithId, header) - aclStorage, err := store.ACLStorage() + aclStorage, err := store.AclStorage() require.NoError(t, err) testList(t, aclStorage, payload.AclWithId, payload.AclWithId.Id) } diff --git a/common/commonspace/commongetter.go b/common/commonspace/commongetter.go index 6f28b51d..70f799c3 100644 --- a/common/commonspace/commongetter.go +++ b/common/commonspace/commongetter.go @@ -10,12 +10,12 @@ import ( type commonSpaceGetter struct { spaceId string - aclList *syncacl.SyncACL + aclList *syncacl.SyncAcl treeGetter treegetter.TreeGetter settings settings.SettingsObject } -func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settings.SettingsObject) syncobjectgetter.SyncObjectGetter { +func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncAcl, treeGetter treegetter.TreeGetter, settings settings.SettingsObject) syncobjectgetter.SyncObjectGetter { return &commonSpaceGetter{ spaceId: spaceId, aclList: aclList, diff --git a/common/commonspace/headsync/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go index baec9b22..5e1d6d1e 100644 --- a/common/commonspace/headsync/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -147,7 +147,7 @@ func (d *diffSyncer) pingTreesInCache(ctx context.Context, trees []string) { } func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, cl spacesyncproto.DRPCSpaceSyncClient) (err error) { - aclStorage, err := d.storage.ACLStorage() + aclStorage, err := d.storage.AclStorage() if err != nil { return } diff --git a/common/commonspace/headsync/diffsyncer_test.go b/common/commonspace/headsync/diffsyncer_test.go index 9cfb278d..75957c05 100644 --- a/common/commonspace/headsync/diffsyncer_test.go +++ b/common/commonspace/headsync/diffsyncer_test.go @@ -160,7 +160,7 @@ func TestDiffSyncer_Sync(t *testing.T) { aclStorageMock := mock_treestorage.NewMockListStorage(ctrl) settingsStorage := mock_treestorage.NewMockTreeStorage(ctrl) settingsId := "settingsId" - aclRoot := &aclrecordproto.RawACLRecordWithId{ + aclRoot := &aclrecordproto.RawAclRecordWithId{ Id: aclRootId, } settingsRoot := &treechangeproto.RawTreeChangeWithId{ @@ -176,7 +176,7 @@ func TestDiffSyncer_Sync(t *testing.T) { Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))). Return(nil, nil, nil, spacesyncproto.ErrSpaceMissing) - stMock.EXPECT().ACLStorage().Return(aclStorageMock, nil) + stMock.EXPECT().AclStorage().Return(aclStorageMock, nil) stMock.EXPECT().SpaceHeader().Return(spaceHeader, nil) stMock.EXPECT().SpaceSettingsId().Return(spaceSettingsId) stMock.EXPECT().TreeStorage(spaceSettingsId).Return(settingsStorage, nil) diff --git a/common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go b/common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go index 40acc8ec..4baac9a3 100644 --- a/common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go +++ b/common/commonspace/object/acl/aclrecordproto/aclreadkeyderive.go @@ -4,7 +4,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric" ) -func ACLReadKeyDerive(signKey []byte, encKey []byte) (*symmetric.Key, error) { +func AclReadKeyDerive(signKey []byte, encKey []byte) (*symmetric.Key, error) { concBuf := make([]byte, 0, len(signKey)+len(encKey)) concBuf = append(concBuf, signKey...) concBuf = append(concBuf, encKey...) diff --git a/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go b/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go index ff10ae2b..3a25533b 100644 --- a/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go +++ b/common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go @@ -22,53 +22,53 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type ACLUserPermissions int32 +type AclUserPermissions int32 const ( - ACLUserPermissions_Admin ACLUserPermissions = 0 - ACLUserPermissions_Writer ACLUserPermissions = 1 - ACLUserPermissions_Reader ACLUserPermissions = 2 + AclUserPermissions_Admin AclUserPermissions = 0 + AclUserPermissions_Writer AclUserPermissions = 1 + AclUserPermissions_Reader AclUserPermissions = 2 ) -var ACLUserPermissions_name = map[int32]string{ +var AclUserPermissions_name = map[int32]string{ 0: "Admin", 1: "Writer", 2: "Reader", } -var ACLUserPermissions_value = map[string]int32{ +var AclUserPermissions_value = map[string]int32{ "Admin": 0, "Writer": 1, "Reader": 2, } -func (x ACLUserPermissions) String() string { - return proto.EnumName(ACLUserPermissions_name, int32(x)) +func (x AclUserPermissions) String() string { + return proto.EnumName(AclUserPermissions_name, int32(x)) } -func (ACLUserPermissions) EnumDescriptor() ([]byte, []int) { +func (AclUserPermissions) EnumDescriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{0} } -type RawACLRecord struct { +type RawAclRecord struct { Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` AcceptorIdentity []byte `protobuf:"bytes,3,opt,name=acceptorIdentity,proto3" json:"acceptorIdentity,omitempty"` AcceptorSignature []byte `protobuf:"bytes,4,opt,name=acceptorSignature,proto3" json:"acceptorSignature,omitempty"` } -func (m *RawACLRecord) Reset() { *m = RawACLRecord{} } -func (m *RawACLRecord) String() string { return proto.CompactTextString(m) } -func (*RawACLRecord) ProtoMessage() {} -func (*RawACLRecord) Descriptor() ([]byte, []int) { +func (m *RawAclRecord) Reset() { *m = RawAclRecord{} } +func (m *RawAclRecord) String() string { return proto.CompactTextString(m) } +func (*RawAclRecord) ProtoMessage() {} +func (*RawAclRecord) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{0} } -func (m *RawACLRecord) XXX_Unmarshal(b []byte) error { +func (m *RawAclRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *RawACLRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *RawAclRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_RawACLRecord.Marshal(b, m, deterministic) + return xxx_messageInfo_RawAclRecord.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -78,63 +78,63 @@ func (m *RawACLRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *RawACLRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_RawACLRecord.Merge(m, src) +func (m *RawAclRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_RawAclRecord.Merge(m, src) } -func (m *RawACLRecord) XXX_Size() int { +func (m *RawAclRecord) XXX_Size() int { return m.Size() } -func (m *RawACLRecord) XXX_DiscardUnknown() { - xxx_messageInfo_RawACLRecord.DiscardUnknown(m) +func (m *RawAclRecord) XXX_DiscardUnknown() { + xxx_messageInfo_RawAclRecord.DiscardUnknown(m) } -var xxx_messageInfo_RawACLRecord proto.InternalMessageInfo +var xxx_messageInfo_RawAclRecord proto.InternalMessageInfo -func (m *RawACLRecord) GetPayload() []byte { +func (m *RawAclRecord) GetPayload() []byte { if m != nil { return m.Payload } return nil } -func (m *RawACLRecord) GetSignature() []byte { +func (m *RawAclRecord) GetSignature() []byte { if m != nil { return m.Signature } return nil } -func (m *RawACLRecord) GetAcceptorIdentity() []byte { +func (m *RawAclRecord) GetAcceptorIdentity() []byte { if m != nil { return m.AcceptorIdentity } return nil } -func (m *RawACLRecord) GetAcceptorSignature() []byte { +func (m *RawAclRecord) GetAcceptorSignature() []byte { if m != nil { return m.AcceptorSignature } return nil } -type RawACLRecordWithId struct { +type RawAclRecordWithId struct { Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` } -func (m *RawACLRecordWithId) Reset() { *m = RawACLRecordWithId{} } -func (m *RawACLRecordWithId) String() string { return proto.CompactTextString(m) } -func (*RawACLRecordWithId) ProtoMessage() {} -func (*RawACLRecordWithId) Descriptor() ([]byte, []int) { +func (m *RawAclRecordWithId) Reset() { *m = RawAclRecordWithId{} } +func (m *RawAclRecordWithId) String() string { return proto.CompactTextString(m) } +func (*RawAclRecordWithId) ProtoMessage() {} +func (*RawAclRecordWithId) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{1} } -func (m *RawACLRecordWithId) XXX_Unmarshal(b []byte) error { +func (m *RawAclRecordWithId) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *RawACLRecordWithId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *RawAclRecordWithId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_RawACLRecordWithId.Marshal(b, m, deterministic) + return xxx_messageInfo_RawAclRecordWithId.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -144,33 +144,33 @@ func (m *RawACLRecordWithId) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *RawACLRecordWithId) XXX_Merge(src proto.Message) { - xxx_messageInfo_RawACLRecordWithId.Merge(m, src) +func (m *RawAclRecordWithId) XXX_Merge(src proto.Message) { + xxx_messageInfo_RawAclRecordWithId.Merge(m, src) } -func (m *RawACLRecordWithId) XXX_Size() int { +func (m *RawAclRecordWithId) XXX_Size() int { return m.Size() } -func (m *RawACLRecordWithId) XXX_DiscardUnknown() { - xxx_messageInfo_RawACLRecordWithId.DiscardUnknown(m) +func (m *RawAclRecordWithId) XXX_DiscardUnknown() { + xxx_messageInfo_RawAclRecordWithId.DiscardUnknown(m) } -var xxx_messageInfo_RawACLRecordWithId proto.InternalMessageInfo +var xxx_messageInfo_RawAclRecordWithId proto.InternalMessageInfo -func (m *RawACLRecordWithId) GetPayload() []byte { +func (m *RawAclRecordWithId) GetPayload() []byte { if m != nil { return m.Payload } return nil } -func (m *RawACLRecordWithId) GetId() string { +func (m *RawAclRecordWithId) GetId() string { if m != nil { return m.Id } return "" } -type ACLRecord struct { +type AclRecord struct { PrevId string `protobuf:"bytes,1,opt,name=prevId,proto3" json:"prevId,omitempty"` Identity []byte `protobuf:"bytes,2,opt,name=identity,proto3" json:"identity,omitempty"` Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` @@ -178,18 +178,18 @@ type ACLRecord struct { Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *ACLRecord) Reset() { *m = ACLRecord{} } -func (m *ACLRecord) String() string { return proto.CompactTextString(m) } -func (*ACLRecord) ProtoMessage() {} -func (*ACLRecord) Descriptor() ([]byte, []int) { +func (m *AclRecord) Reset() { *m = AclRecord{} } +func (m *AclRecord) String() string { return proto.CompactTextString(m) } +func (*AclRecord) ProtoMessage() {} +func (*AclRecord) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{2} } -func (m *ACLRecord) XXX_Unmarshal(b []byte) error { +func (m *AclRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLRecord.Marshal(b, m, deterministic) + return xxx_messageInfo_AclRecord.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -199,54 +199,54 @@ func (m *ACLRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *ACLRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLRecord.Merge(m, src) +func (m *AclRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclRecord.Merge(m, src) } -func (m *ACLRecord) XXX_Size() int { +func (m *AclRecord) XXX_Size() int { return m.Size() } -func (m *ACLRecord) XXX_DiscardUnknown() { - xxx_messageInfo_ACLRecord.DiscardUnknown(m) +func (m *AclRecord) XXX_DiscardUnknown() { + xxx_messageInfo_AclRecord.DiscardUnknown(m) } -var xxx_messageInfo_ACLRecord proto.InternalMessageInfo +var xxx_messageInfo_AclRecord proto.InternalMessageInfo -func (m *ACLRecord) GetPrevId() string { +func (m *AclRecord) GetPrevId() string { if m != nil { return m.PrevId } return "" } -func (m *ACLRecord) GetIdentity() []byte { +func (m *AclRecord) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLRecord) GetData() []byte { +func (m *AclRecord) GetData() []byte { if m != nil { return m.Data } return nil } -func (m *ACLRecord) GetCurrentReadKeyHash() uint64 { +func (m *AclRecord) GetCurrentReadKeyHash() uint64 { if m != nil { return m.CurrentReadKeyHash } return 0 } -func (m *ACLRecord) GetTimestamp() int64 { +func (m *AclRecord) GetTimestamp() int64 { if m != nil { return m.Timestamp } return 0 } -type ACLRoot struct { +type AclRoot struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,omitempty"` SpaceId string `protobuf:"bytes,3,opt,name=spaceId,proto3" json:"spaceId,omitempty"` @@ -256,18 +256,18 @@ type ACLRoot struct { Timestamp int64 `protobuf:"varint,7,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *ACLRoot) Reset() { *m = ACLRoot{} } -func (m *ACLRoot) String() string { return proto.CompactTextString(m) } -func (*ACLRoot) ProtoMessage() {} -func (*ACLRoot) Descriptor() ([]byte, []int) { +func (m *AclRoot) Reset() { *m = AclRoot{} } +func (m *AclRoot) String() string { return proto.CompactTextString(m) } +func (*AclRoot) ProtoMessage() {} +func (*AclRoot) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{3} } -func (m *ACLRoot) XXX_Unmarshal(b []byte) error { +func (m *AclRoot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLRoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclRoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLRoot.Marshal(b, m, deterministic) + return xxx_messageInfo_AclRoot.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -277,90 +277,90 @@ func (m *ACLRoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *ACLRoot) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLRoot.Merge(m, src) +func (m *AclRoot) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclRoot.Merge(m, src) } -func (m *ACLRoot) XXX_Size() int { +func (m *AclRoot) XXX_Size() int { return m.Size() } -func (m *ACLRoot) XXX_DiscardUnknown() { - xxx_messageInfo_ACLRoot.DiscardUnknown(m) +func (m *AclRoot) XXX_DiscardUnknown() { + xxx_messageInfo_AclRoot.DiscardUnknown(m) } -var xxx_messageInfo_ACLRoot proto.InternalMessageInfo +var xxx_messageInfo_AclRoot proto.InternalMessageInfo -func (m *ACLRoot) GetIdentity() []byte { +func (m *AclRoot) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLRoot) GetEncryptionKey() []byte { +func (m *AclRoot) GetEncryptionKey() []byte { if m != nil { return m.EncryptionKey } return nil } -func (m *ACLRoot) GetSpaceId() string { +func (m *AclRoot) GetSpaceId() string { if m != nil { return m.SpaceId } return "" } -func (m *ACLRoot) GetEncryptedReadKey() []byte { +func (m *AclRoot) GetEncryptedReadKey() []byte { if m != nil { return m.EncryptedReadKey } return nil } -func (m *ACLRoot) GetDerivationScheme() string { +func (m *AclRoot) GetDerivationScheme() string { if m != nil { return m.DerivationScheme } return "" } -func (m *ACLRoot) GetCurrentReadKeyHash() uint64 { +func (m *AclRoot) GetCurrentReadKeyHash() uint64 { if m != nil { return m.CurrentReadKeyHash } return 0 } -func (m *ACLRoot) GetTimestamp() int64 { +func (m *AclRoot) GetTimestamp() int64 { if m != nil { return m.Timestamp } return 0 } -type ACLContentValue struct { +type AclContentValue struct { // Types that are valid to be assigned to Value: // - // *ACLContentValue_UserAdd - // *ACLContentValue_UserRemove - // *ACLContentValue_UserPermissionChange - // *ACLContentValue_UserInvite - // *ACLContentValue_UserJoin - Value isACLContentValue_Value `protobuf_oneof:"value"` + // *AclContentValue_UserAdd + // *AclContentValue_UserRemove + // *AclContentValue_UserPermissionChange + // *AclContentValue_UserInvite + // *AclContentValue_UserJoin + Value isAclContentValue_Value `protobuf_oneof:"value"` } -func (m *ACLContentValue) Reset() { *m = ACLContentValue{} } -func (m *ACLContentValue) String() string { return proto.CompactTextString(m) } -func (*ACLContentValue) ProtoMessage() {} -func (*ACLContentValue) Descriptor() ([]byte, []int) { +func (m *AclContentValue) Reset() { *m = AclContentValue{} } +func (m *AclContentValue) String() string { return proto.CompactTextString(m) } +func (*AclContentValue) ProtoMessage() {} +func (*AclContentValue) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{4} } -func (m *ACLContentValue) XXX_Unmarshal(b []byte) error { +func (m *AclContentValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLContentValue.Marshal(b, m, deterministic) + return xxx_messageInfo_AclContentValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -370,115 +370,115 @@ func (m *ACLContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *ACLContentValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLContentValue.Merge(m, src) +func (m *AclContentValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclContentValue.Merge(m, src) } -func (m *ACLContentValue) XXX_Size() int { +func (m *AclContentValue) XXX_Size() int { return m.Size() } -func (m *ACLContentValue) XXX_DiscardUnknown() { - xxx_messageInfo_ACLContentValue.DiscardUnknown(m) +func (m *AclContentValue) XXX_DiscardUnknown() { + xxx_messageInfo_AclContentValue.DiscardUnknown(m) } -var xxx_messageInfo_ACLContentValue proto.InternalMessageInfo +var xxx_messageInfo_AclContentValue proto.InternalMessageInfo -type isACLContentValue_Value interface { - isACLContentValue_Value() +type isAclContentValue_Value interface { + isAclContentValue_Value() MarshalTo([]byte) (int, error) Size() int } -type ACLContentValue_UserAdd struct { - UserAdd *ACLUserAdd `protobuf:"bytes,1,opt,name=userAdd,proto3,oneof" json:"userAdd,omitempty"` +type AclContentValue_UserAdd struct { + UserAdd *AclUserAdd `protobuf:"bytes,1,opt,name=userAdd,proto3,oneof" json:"userAdd,omitempty"` } -type ACLContentValue_UserRemove struct { - UserRemove *ACLUserRemove `protobuf:"bytes,2,opt,name=userRemove,proto3,oneof" json:"userRemove,omitempty"` +type AclContentValue_UserRemove struct { + UserRemove *AclUserRemove `protobuf:"bytes,2,opt,name=userRemove,proto3,oneof" json:"userRemove,omitempty"` } -type ACLContentValue_UserPermissionChange struct { - UserPermissionChange *ACLUserPermissionChange `protobuf:"bytes,3,opt,name=userPermissionChange,proto3,oneof" json:"userPermissionChange,omitempty"` +type AclContentValue_UserPermissionChange struct { + UserPermissionChange *AclUserPermissionChange `protobuf:"bytes,3,opt,name=userPermissionChange,proto3,oneof" json:"userPermissionChange,omitempty"` } -type ACLContentValue_UserInvite struct { - UserInvite *ACLUserInvite `protobuf:"bytes,4,opt,name=userInvite,proto3,oneof" json:"userInvite,omitempty"` +type AclContentValue_UserInvite struct { + UserInvite *AclUserInvite `protobuf:"bytes,4,opt,name=userInvite,proto3,oneof" json:"userInvite,omitempty"` } -type ACLContentValue_UserJoin struct { - UserJoin *ACLUserJoin `protobuf:"bytes,5,opt,name=userJoin,proto3,oneof" json:"userJoin,omitempty"` +type AclContentValue_UserJoin struct { + UserJoin *AclUserJoin `protobuf:"bytes,5,opt,name=userJoin,proto3,oneof" json:"userJoin,omitempty"` } -func (*ACLContentValue_UserAdd) isACLContentValue_Value() {} -func (*ACLContentValue_UserRemove) isACLContentValue_Value() {} -func (*ACLContentValue_UserPermissionChange) isACLContentValue_Value() {} -func (*ACLContentValue_UserInvite) isACLContentValue_Value() {} -func (*ACLContentValue_UserJoin) isACLContentValue_Value() {} +func (*AclContentValue_UserAdd) isAclContentValue_Value() {} +func (*AclContentValue_UserRemove) isAclContentValue_Value() {} +func (*AclContentValue_UserPermissionChange) isAclContentValue_Value() {} +func (*AclContentValue_UserInvite) isAclContentValue_Value() {} +func (*AclContentValue_UserJoin) isAclContentValue_Value() {} -func (m *ACLContentValue) GetValue() isACLContentValue_Value { +func (m *AclContentValue) GetValue() isAclContentValue_Value { if m != nil { return m.Value } return nil } -func (m *ACLContentValue) GetUserAdd() *ACLUserAdd { - if x, ok := m.GetValue().(*ACLContentValue_UserAdd); ok { +func (m *AclContentValue) GetUserAdd() *AclUserAdd { + if x, ok := m.GetValue().(*AclContentValue_UserAdd); ok { return x.UserAdd } return nil } -func (m *ACLContentValue) GetUserRemove() *ACLUserRemove { - if x, ok := m.GetValue().(*ACLContentValue_UserRemove); ok { +func (m *AclContentValue) GetUserRemove() *AclUserRemove { + if x, ok := m.GetValue().(*AclContentValue_UserRemove); ok { return x.UserRemove } return nil } -func (m *ACLContentValue) GetUserPermissionChange() *ACLUserPermissionChange { - if x, ok := m.GetValue().(*ACLContentValue_UserPermissionChange); ok { +func (m *AclContentValue) GetUserPermissionChange() *AclUserPermissionChange { + if x, ok := m.GetValue().(*AclContentValue_UserPermissionChange); ok { return x.UserPermissionChange } return nil } -func (m *ACLContentValue) GetUserInvite() *ACLUserInvite { - if x, ok := m.GetValue().(*ACLContentValue_UserInvite); ok { +func (m *AclContentValue) GetUserInvite() *AclUserInvite { + if x, ok := m.GetValue().(*AclContentValue_UserInvite); ok { return x.UserInvite } return nil } -func (m *ACLContentValue) GetUserJoin() *ACLUserJoin { - if x, ok := m.GetValue().(*ACLContentValue_UserJoin); ok { +func (m *AclContentValue) GetUserJoin() *AclUserJoin { + if x, ok := m.GetValue().(*AclContentValue_UserJoin); ok { return x.UserJoin } return nil } // XXX_OneofWrappers is for the internal use of the proto package. -func (*ACLContentValue) XXX_OneofWrappers() []interface{} { +func (*AclContentValue) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*ACLContentValue_UserAdd)(nil), - (*ACLContentValue_UserRemove)(nil), - (*ACLContentValue_UserPermissionChange)(nil), - (*ACLContentValue_UserInvite)(nil), - (*ACLContentValue_UserJoin)(nil), + (*AclContentValue_UserAdd)(nil), + (*AclContentValue_UserRemove)(nil), + (*AclContentValue_UserPermissionChange)(nil), + (*AclContentValue_UserInvite)(nil), + (*AclContentValue_UserJoin)(nil), } } -type ACLData struct { - AclContent []*ACLContentValue `protobuf:"bytes,1,rep,name=aclContent,proto3" json:"aclContent,omitempty"` +type AclData struct { + AclContent []*AclContentValue `protobuf:"bytes,1,rep,name=aclContent,proto3" json:"aclContent,omitempty"` } -func (m *ACLData) Reset() { *m = ACLData{} } -func (m *ACLData) String() string { return proto.CompactTextString(m) } -func (*ACLData) ProtoMessage() {} -func (*ACLData) Descriptor() ([]byte, []int) { +func (m *AclData) Reset() { *m = AclData{} } +func (m *AclData) String() string { return proto.CompactTextString(m) } +func (*AclData) ProtoMessage() {} +func (*AclData) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{5} } -func (m *ACLData) XXX_Unmarshal(b []byte) error { +func (m *AclData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLData.Marshal(b, m, deterministic) + return xxx_messageInfo_AclData.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -488,43 +488,43 @@ func (m *ACLData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *ACLData) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLData.Merge(m, src) +func (m *AclData) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclData.Merge(m, src) } -func (m *ACLData) XXX_Size() int { +func (m *AclData) XXX_Size() int { return m.Size() } -func (m *ACLData) XXX_DiscardUnknown() { - xxx_messageInfo_ACLData.DiscardUnknown(m) +func (m *AclData) XXX_DiscardUnknown() { + xxx_messageInfo_AclData.DiscardUnknown(m) } -var xxx_messageInfo_ACLData proto.InternalMessageInfo +var xxx_messageInfo_AclData proto.InternalMessageInfo -func (m *ACLData) GetAclContent() []*ACLContentValue { +func (m *AclData) GetAclContent() []*AclContentValue { if m != nil { return m.AclContent } return nil } -type ACLState struct { +type AclState struct { ReadKeyHashes []uint64 `protobuf:"varint,1,rep,packed,name=readKeyHashes,proto3" json:"readKeyHashes,omitempty"` - UserStates []*ACLUserState `protobuf:"bytes,2,rep,name=userStates,proto3" json:"userStates,omitempty"` - Invites map[string]*ACLUserInvite `protobuf:"bytes,3,rep,name=invites,proto3" json:"invites,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + UserStates []*AclUserState `protobuf:"bytes,2,rep,name=userStates,proto3" json:"userStates,omitempty"` + Invites map[string]*AclUserInvite `protobuf:"bytes,3,rep,name=invites,proto3" json:"invites,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (m *ACLState) Reset() { *m = ACLState{} } -func (m *ACLState) String() string { return proto.CompactTextString(m) } -func (*ACLState) ProtoMessage() {} -func (*ACLState) Descriptor() ([]byte, []int) { +func (m *AclState) Reset() { *m = AclState{} } +func (m *AclState) String() string { return proto.CompactTextString(m) } +func (*AclState) ProtoMessage() {} +func (*AclState) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{6} } -func (m *ACLState) XXX_Unmarshal(b []byte) error { +func (m *AclState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLState.Marshal(b, m, deterministic) + return xxx_messageInfo_AclState.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -534,57 +534,57 @@ func (m *ACLState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *ACLState) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLState.Merge(m, src) +func (m *AclState) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclState.Merge(m, src) } -func (m *ACLState) XXX_Size() int { +func (m *AclState) XXX_Size() int { return m.Size() } -func (m *ACLState) XXX_DiscardUnknown() { - xxx_messageInfo_ACLState.DiscardUnknown(m) +func (m *AclState) XXX_DiscardUnknown() { + xxx_messageInfo_AclState.DiscardUnknown(m) } -var xxx_messageInfo_ACLState proto.InternalMessageInfo +var xxx_messageInfo_AclState proto.InternalMessageInfo -func (m *ACLState) GetReadKeyHashes() []uint64 { +func (m *AclState) GetReadKeyHashes() []uint64 { if m != nil { return m.ReadKeyHashes } return nil } -func (m *ACLState) GetUserStates() []*ACLUserState { +func (m *AclState) GetUserStates() []*AclUserState { if m != nil { return m.UserStates } return nil } -func (m *ACLState) GetInvites() map[string]*ACLUserInvite { +func (m *AclState) GetInvites() map[string]*AclUserInvite { if m != nil { return m.Invites } return nil } -type ACLUserState struct { +type AclUserState struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,omitempty"` - Permissions ACLUserPermissions `protobuf:"varint,3,opt,name=permissions,proto3,enum=aclrecord.ACLUserPermissions" json:"permissions,omitempty"` + Permissions AclUserPermissions `protobuf:"varint,3,opt,name=permissions,proto3,enum=aclrecord.AclUserPermissions" json:"permissions,omitempty"` } -func (m *ACLUserState) Reset() { *m = ACLUserState{} } -func (m *ACLUserState) String() string { return proto.CompactTextString(m) } -func (*ACLUserState) ProtoMessage() {} -func (*ACLUserState) Descriptor() ([]byte, []int) { +func (m *AclUserState) Reset() { *m = AclUserState{} } +func (m *AclUserState) String() string { return proto.CompactTextString(m) } +func (*AclUserState) ProtoMessage() {} +func (*AclUserState) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{7} } -func (m *ACLUserState) XXX_Unmarshal(b []byte) error { +func (m *AclUserState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserState.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserState.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -594,58 +594,58 @@ func (m *ACLUserState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *ACLUserState) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserState.Merge(m, src) +func (m *AclUserState) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserState.Merge(m, src) } -func (m *ACLUserState) XXX_Size() int { +func (m *AclUserState) XXX_Size() int { return m.Size() } -func (m *ACLUserState) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserState.DiscardUnknown(m) +func (m *AclUserState) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserState.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserState proto.InternalMessageInfo +var xxx_messageInfo_AclUserState proto.InternalMessageInfo -func (m *ACLUserState) GetIdentity() []byte { +func (m *AclUserState) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLUserState) GetEncryptionKey() []byte { +func (m *AclUserState) GetEncryptionKey() []byte { if m != nil { return m.EncryptionKey } return nil } -func (m *ACLUserState) GetPermissions() ACLUserPermissions { +func (m *AclUserState) GetPermissions() AclUserPermissions { if m != nil { return m.Permissions } - return ACLUserPermissions_Admin + return AclUserPermissions_Admin } -type ACLUserAdd struct { +type AclUserAdd struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,omitempty"` EncryptedReadKeys [][]byte `protobuf:"bytes,3,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,omitempty"` - Permissions ACLUserPermissions `protobuf:"varint,4,opt,name=permissions,proto3,enum=aclrecord.ACLUserPermissions" json:"permissions,omitempty"` + Permissions AclUserPermissions `protobuf:"varint,4,opt,name=permissions,proto3,enum=aclrecord.AclUserPermissions" json:"permissions,omitempty"` } -func (m *ACLUserAdd) Reset() { *m = ACLUserAdd{} } -func (m *ACLUserAdd) String() string { return proto.CompactTextString(m) } -func (*ACLUserAdd) ProtoMessage() {} -func (*ACLUserAdd) Descriptor() ([]byte, []int) { +func (m *AclUserAdd) Reset() { *m = AclUserAdd{} } +func (m *AclUserAdd) String() string { return proto.CompactTextString(m) } +func (*AclUserAdd) ProtoMessage() {} +func (*AclUserAdd) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{8} } -func (m *ACLUserAdd) XXX_Unmarshal(b []byte) error { +func (m *AclUserAdd) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserAdd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserAdd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserAdd.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserAdd.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -655,65 +655,65 @@ func (m *ACLUserAdd) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *ACLUserAdd) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserAdd.Merge(m, src) +func (m *AclUserAdd) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserAdd.Merge(m, src) } -func (m *ACLUserAdd) XXX_Size() int { +func (m *AclUserAdd) XXX_Size() int { return m.Size() } -func (m *ACLUserAdd) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserAdd.DiscardUnknown(m) +func (m *AclUserAdd) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserAdd.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserAdd proto.InternalMessageInfo +var xxx_messageInfo_AclUserAdd proto.InternalMessageInfo -func (m *ACLUserAdd) GetIdentity() []byte { +func (m *AclUserAdd) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLUserAdd) GetEncryptionKey() []byte { +func (m *AclUserAdd) GetEncryptionKey() []byte { if m != nil { return m.EncryptionKey } return nil } -func (m *ACLUserAdd) GetEncryptedReadKeys() [][]byte { +func (m *AclUserAdd) GetEncryptedReadKeys() [][]byte { if m != nil { return m.EncryptedReadKeys } return nil } -func (m *ACLUserAdd) GetPermissions() ACLUserPermissions { +func (m *AclUserAdd) GetPermissions() AclUserPermissions { if m != nil { return m.Permissions } - return ACLUserPermissions_Admin + return AclUserPermissions_Admin } -type ACLUserInvite struct { +type AclUserInvite struct { AcceptPublicKey []byte `protobuf:"bytes,1,opt,name=acceptPublicKey,proto3" json:"acceptPublicKey,omitempty"` EncryptSymKeyHash uint64 `protobuf:"varint,2,opt,name=encryptSymKeyHash,proto3" json:"encryptSymKeyHash,omitempty"` EncryptedReadKeys [][]byte `protobuf:"bytes,3,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,omitempty"` - Permissions ACLUserPermissions `protobuf:"varint,4,opt,name=permissions,proto3,enum=aclrecord.ACLUserPermissions" json:"permissions,omitempty"` + Permissions AclUserPermissions `protobuf:"varint,4,opt,name=permissions,proto3,enum=aclrecord.AclUserPermissions" json:"permissions,omitempty"` } -func (m *ACLUserInvite) Reset() { *m = ACLUserInvite{} } -func (m *ACLUserInvite) String() string { return proto.CompactTextString(m) } -func (*ACLUserInvite) ProtoMessage() {} -func (*ACLUserInvite) Descriptor() ([]byte, []int) { +func (m *AclUserInvite) Reset() { *m = AclUserInvite{} } +func (m *AclUserInvite) String() string { return proto.CompactTextString(m) } +func (*AclUserInvite) ProtoMessage() {} +func (*AclUserInvite) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{9} } -func (m *ACLUserInvite) XXX_Unmarshal(b []byte) error { +func (m *AclUserInvite) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserInvite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserInvite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserInvite.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserInvite.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -723,47 +723,47 @@ func (m *ACLUserInvite) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *ACLUserInvite) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserInvite.Merge(m, src) +func (m *AclUserInvite) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserInvite.Merge(m, src) } -func (m *ACLUserInvite) XXX_Size() int { +func (m *AclUserInvite) XXX_Size() int { return m.Size() } -func (m *ACLUserInvite) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserInvite.DiscardUnknown(m) +func (m *AclUserInvite) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserInvite.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserInvite proto.InternalMessageInfo +var xxx_messageInfo_AclUserInvite proto.InternalMessageInfo -func (m *ACLUserInvite) GetAcceptPublicKey() []byte { +func (m *AclUserInvite) GetAcceptPublicKey() []byte { if m != nil { return m.AcceptPublicKey } return nil } -func (m *ACLUserInvite) GetEncryptSymKeyHash() uint64 { +func (m *AclUserInvite) GetEncryptSymKeyHash() uint64 { if m != nil { return m.EncryptSymKeyHash } return 0 } -func (m *ACLUserInvite) GetEncryptedReadKeys() [][]byte { +func (m *AclUserInvite) GetEncryptedReadKeys() [][]byte { if m != nil { return m.EncryptedReadKeys } return nil } -func (m *ACLUserInvite) GetPermissions() ACLUserPermissions { +func (m *AclUserInvite) GetPermissions() AclUserPermissions { if m != nil { return m.Permissions } - return ACLUserPermissions_Admin + return AclUserPermissions_Admin } -type ACLUserJoin struct { +type AclUserJoin struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,omitempty"` AcceptSignature []byte `protobuf:"bytes,3,opt,name=acceptSignature,proto3" json:"acceptSignature,omitempty"` @@ -771,18 +771,18 @@ type ACLUserJoin struct { EncryptedReadKeys [][]byte `protobuf:"bytes,5,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,omitempty"` } -func (m *ACLUserJoin) Reset() { *m = ACLUserJoin{} } -func (m *ACLUserJoin) String() string { return proto.CompactTextString(m) } -func (*ACLUserJoin) ProtoMessage() {} -func (*ACLUserJoin) Descriptor() ([]byte, []int) { +func (m *AclUserJoin) Reset() { *m = AclUserJoin{} } +func (m *AclUserJoin) String() string { return proto.CompactTextString(m) } +func (*AclUserJoin) ProtoMessage() {} +func (*AclUserJoin) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{10} } -func (m *ACLUserJoin) XXX_Unmarshal(b []byte) error { +func (m *AclUserJoin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserJoin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserJoin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserJoin.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserJoin.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -792,70 +792,70 @@ func (m *ACLUserJoin) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *ACLUserJoin) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserJoin.Merge(m, src) +func (m *AclUserJoin) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserJoin.Merge(m, src) } -func (m *ACLUserJoin) XXX_Size() int { +func (m *AclUserJoin) XXX_Size() int { return m.Size() } -func (m *ACLUserJoin) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserJoin.DiscardUnknown(m) +func (m *AclUserJoin) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserJoin.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserJoin proto.InternalMessageInfo +var xxx_messageInfo_AclUserJoin proto.InternalMessageInfo -func (m *ACLUserJoin) GetIdentity() []byte { +func (m *AclUserJoin) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLUserJoin) GetEncryptionKey() []byte { +func (m *AclUserJoin) GetEncryptionKey() []byte { if m != nil { return m.EncryptionKey } return nil } -func (m *ACLUserJoin) GetAcceptSignature() []byte { +func (m *AclUserJoin) GetAcceptSignature() []byte { if m != nil { return m.AcceptSignature } return nil } -func (m *ACLUserJoin) GetAcceptPubKey() []byte { +func (m *AclUserJoin) GetAcceptPubKey() []byte { if m != nil { return m.AcceptPubKey } return nil } -func (m *ACLUserJoin) GetEncryptedReadKeys() [][]byte { +func (m *AclUserJoin) GetEncryptedReadKeys() [][]byte { if m != nil { return m.EncryptedReadKeys } return nil } -type ACLUserRemove struct { +type AclUserRemove struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` - ReadKeyReplaces []*ACLReadKeyReplace `protobuf:"bytes,2,rep,name=readKeyReplaces,proto3" json:"readKeyReplaces,omitempty"` + ReadKeyReplaces []*AclReadKeyReplace `protobuf:"bytes,2,rep,name=readKeyReplaces,proto3" json:"readKeyReplaces,omitempty"` } -func (m *ACLUserRemove) Reset() { *m = ACLUserRemove{} } -func (m *ACLUserRemove) String() string { return proto.CompactTextString(m) } -func (*ACLUserRemove) ProtoMessage() {} -func (*ACLUserRemove) Descriptor() ([]byte, []int) { +func (m *AclUserRemove) Reset() { *m = AclUserRemove{} } +func (m *AclUserRemove) String() string { return proto.CompactTextString(m) } +func (*AclUserRemove) ProtoMessage() {} +func (*AclUserRemove) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{11} } -func (m *ACLUserRemove) XXX_Unmarshal(b []byte) error { +func (m *AclUserRemove) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserRemove.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserRemove.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -865,50 +865,50 @@ func (m *ACLUserRemove) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *ACLUserRemove) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserRemove.Merge(m, src) +func (m *AclUserRemove) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserRemove.Merge(m, src) } -func (m *ACLUserRemove) XXX_Size() int { +func (m *AclUserRemove) XXX_Size() int { return m.Size() } -func (m *ACLUserRemove) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserRemove.DiscardUnknown(m) +func (m *AclUserRemove) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserRemove.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserRemove proto.InternalMessageInfo +var xxx_messageInfo_AclUserRemove proto.InternalMessageInfo -func (m *ACLUserRemove) GetIdentity() []byte { +func (m *AclUserRemove) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLUserRemove) GetReadKeyReplaces() []*ACLReadKeyReplace { +func (m *AclUserRemove) GetReadKeyReplaces() []*AclReadKeyReplace { if m != nil { return m.ReadKeyReplaces } return nil } -type ACLReadKeyReplace struct { +type AclReadKeyReplace struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,omitempty"` EncryptedReadKey []byte `protobuf:"bytes,3,opt,name=encryptedReadKey,proto3" json:"encryptedReadKey,omitempty"` } -func (m *ACLReadKeyReplace) Reset() { *m = ACLReadKeyReplace{} } -func (m *ACLReadKeyReplace) String() string { return proto.CompactTextString(m) } -func (*ACLReadKeyReplace) ProtoMessage() {} -func (*ACLReadKeyReplace) Descriptor() ([]byte, []int) { +func (m *AclReadKeyReplace) Reset() { *m = AclReadKeyReplace{} } +func (m *AclReadKeyReplace) String() string { return proto.CompactTextString(m) } +func (*AclReadKeyReplace) ProtoMessage() {} +func (*AclReadKeyReplace) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{12} } -func (m *ACLReadKeyReplace) XXX_Unmarshal(b []byte) error { +func (m *AclReadKeyReplace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLReadKeyReplace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclReadKeyReplace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLReadKeyReplace.Marshal(b, m, deterministic) + return xxx_messageInfo_AclReadKeyReplace.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -918,56 +918,56 @@ func (m *ACLReadKeyReplace) XXX_Marshal(b []byte, deterministic bool) ([]byte, e return b[:n], nil } } -func (m *ACLReadKeyReplace) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLReadKeyReplace.Merge(m, src) +func (m *AclReadKeyReplace) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclReadKeyReplace.Merge(m, src) } -func (m *ACLReadKeyReplace) XXX_Size() int { +func (m *AclReadKeyReplace) XXX_Size() int { return m.Size() } -func (m *ACLReadKeyReplace) XXX_DiscardUnknown() { - xxx_messageInfo_ACLReadKeyReplace.DiscardUnknown(m) +func (m *AclReadKeyReplace) XXX_DiscardUnknown() { + xxx_messageInfo_AclReadKeyReplace.DiscardUnknown(m) } -var xxx_messageInfo_ACLReadKeyReplace proto.InternalMessageInfo +var xxx_messageInfo_AclReadKeyReplace proto.InternalMessageInfo -func (m *ACLReadKeyReplace) GetIdentity() []byte { +func (m *AclReadKeyReplace) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLReadKeyReplace) GetEncryptionKey() []byte { +func (m *AclReadKeyReplace) GetEncryptionKey() []byte { if m != nil { return m.EncryptionKey } return nil } -func (m *ACLReadKeyReplace) GetEncryptedReadKey() []byte { +func (m *AclReadKeyReplace) GetEncryptedReadKey() []byte { if m != nil { return m.EncryptedReadKey } return nil } -type ACLUserPermissionChange struct { +type AclUserPermissionChange struct { Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` - Permissions ACLUserPermissions `protobuf:"varint,2,opt,name=permissions,proto3,enum=aclrecord.ACLUserPermissions" json:"permissions,omitempty"` + Permissions AclUserPermissions `protobuf:"varint,2,opt,name=permissions,proto3,enum=aclrecord.AclUserPermissions" json:"permissions,omitempty"` } -func (m *ACLUserPermissionChange) Reset() { *m = ACLUserPermissionChange{} } -func (m *ACLUserPermissionChange) String() string { return proto.CompactTextString(m) } -func (*ACLUserPermissionChange) ProtoMessage() {} -func (*ACLUserPermissionChange) Descriptor() ([]byte, []int) { +func (m *AclUserPermissionChange) Reset() { *m = AclUserPermissionChange{} } +func (m *AclUserPermissionChange) String() string { return proto.CompactTextString(m) } +func (*AclUserPermissionChange) ProtoMessage() {} +func (*AclUserPermissionChange) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{13} } -func (m *ACLUserPermissionChange) XXX_Unmarshal(b []byte) error { +func (m *AclUserPermissionChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLUserPermissionChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclUserPermissionChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLUserPermissionChange.Marshal(b, m, deterministic) + return xxx_messageInfo_AclUserPermissionChange.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -977,48 +977,48 @@ func (m *ACLUserPermissionChange) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (m *ACLUserPermissionChange) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLUserPermissionChange.Merge(m, src) +func (m *AclUserPermissionChange) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclUserPermissionChange.Merge(m, src) } -func (m *ACLUserPermissionChange) XXX_Size() int { +func (m *AclUserPermissionChange) XXX_Size() int { return m.Size() } -func (m *ACLUserPermissionChange) XXX_DiscardUnknown() { - xxx_messageInfo_ACLUserPermissionChange.DiscardUnknown(m) +func (m *AclUserPermissionChange) XXX_DiscardUnknown() { + xxx_messageInfo_AclUserPermissionChange.DiscardUnknown(m) } -var xxx_messageInfo_ACLUserPermissionChange proto.InternalMessageInfo +var xxx_messageInfo_AclUserPermissionChange proto.InternalMessageInfo -func (m *ACLUserPermissionChange) GetIdentity() []byte { +func (m *AclUserPermissionChange) GetIdentity() []byte { if m != nil { return m.Identity } return nil } -func (m *ACLUserPermissionChange) GetPermissions() ACLUserPermissions { +func (m *AclUserPermissionChange) GetPermissions() AclUserPermissions { if m != nil { return m.Permissions } - return ACLUserPermissions_Admin + return AclUserPermissions_Admin } -type ACLSyncMessage struct { - Content *ACLSyncContentValue `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` +type AclSyncMessage struct { + Content *AclSyncContentValue `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` } -func (m *ACLSyncMessage) Reset() { *m = ACLSyncMessage{} } -func (m *ACLSyncMessage) String() string { return proto.CompactTextString(m) } -func (*ACLSyncMessage) ProtoMessage() {} -func (*ACLSyncMessage) Descriptor() ([]byte, []int) { +func (m *AclSyncMessage) Reset() { *m = AclSyncMessage{} } +func (m *AclSyncMessage) String() string { return proto.CompactTextString(m) } +func (*AclSyncMessage) ProtoMessage() {} +func (*AclSyncMessage) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{14} } -func (m *ACLSyncMessage) XXX_Unmarshal(b []byte) error { +func (m *AclSyncMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLSyncMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclSyncMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLSyncMessage.Marshal(b, m, deterministic) + return xxx_messageInfo_AclSyncMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1028,45 +1028,45 @@ func (m *ACLSyncMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } -func (m *ACLSyncMessage) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLSyncMessage.Merge(m, src) +func (m *AclSyncMessage) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclSyncMessage.Merge(m, src) } -func (m *ACLSyncMessage) XXX_Size() int { +func (m *AclSyncMessage) XXX_Size() int { return m.Size() } -func (m *ACLSyncMessage) XXX_DiscardUnknown() { - xxx_messageInfo_ACLSyncMessage.DiscardUnknown(m) +func (m *AclSyncMessage) XXX_DiscardUnknown() { + xxx_messageInfo_AclSyncMessage.DiscardUnknown(m) } -var xxx_messageInfo_ACLSyncMessage proto.InternalMessageInfo +var xxx_messageInfo_AclSyncMessage proto.InternalMessageInfo -func (m *ACLSyncMessage) GetContent() *ACLSyncContentValue { +func (m *AclSyncMessage) GetContent() *AclSyncContentValue { if m != nil { return m.Content } return nil } -// ACLSyncContentValue provides different types for acl sync -type ACLSyncContentValue struct { +// AclSyncContentValue provides different types for acl sync +type AclSyncContentValue struct { // Types that are valid to be assigned to Value: // - // *ACLSyncContentValue_AddRecords - Value isACLSyncContentValue_Value `protobuf_oneof:"value"` + // *AclSyncContentValue_AddRecords + Value isAclSyncContentValue_Value `protobuf_oneof:"value"` } -func (m *ACLSyncContentValue) Reset() { *m = ACLSyncContentValue{} } -func (m *ACLSyncContentValue) String() string { return proto.CompactTextString(m) } -func (*ACLSyncContentValue) ProtoMessage() {} -func (*ACLSyncContentValue) Descriptor() ([]byte, []int) { +func (m *AclSyncContentValue) Reset() { *m = AclSyncContentValue{} } +func (m *AclSyncContentValue) String() string { return proto.CompactTextString(m) } +func (*AclSyncContentValue) ProtoMessage() {} +func (*AclSyncContentValue) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{15} } -func (m *ACLSyncContentValue) XXX_Unmarshal(b []byte) error { +func (m *AclSyncContentValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLSyncContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclSyncContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLSyncContentValue.Marshal(b, m, deterministic) + return xxx_messageInfo_AclSyncContentValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1076,67 +1076,67 @@ func (m *ACLSyncContentValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *ACLSyncContentValue) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLSyncContentValue.Merge(m, src) +func (m *AclSyncContentValue) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclSyncContentValue.Merge(m, src) } -func (m *ACLSyncContentValue) XXX_Size() int { +func (m *AclSyncContentValue) XXX_Size() int { return m.Size() } -func (m *ACLSyncContentValue) XXX_DiscardUnknown() { - xxx_messageInfo_ACLSyncContentValue.DiscardUnknown(m) +func (m *AclSyncContentValue) XXX_DiscardUnknown() { + xxx_messageInfo_AclSyncContentValue.DiscardUnknown(m) } -var xxx_messageInfo_ACLSyncContentValue proto.InternalMessageInfo +var xxx_messageInfo_AclSyncContentValue proto.InternalMessageInfo -type isACLSyncContentValue_Value interface { - isACLSyncContentValue_Value() +type isAclSyncContentValue_Value interface { + isAclSyncContentValue_Value() MarshalTo([]byte) (int, error) Size() int } -type ACLSyncContentValue_AddRecords struct { - AddRecords *ACLAddRecords `protobuf:"bytes,1,opt,name=addRecords,proto3,oneof" json:"addRecords,omitempty"` +type AclSyncContentValue_AddRecords struct { + AddRecords *AclAddRecords `protobuf:"bytes,1,opt,name=addRecords,proto3,oneof" json:"addRecords,omitempty"` } -func (*ACLSyncContentValue_AddRecords) isACLSyncContentValue_Value() {} +func (*AclSyncContentValue_AddRecords) isAclSyncContentValue_Value() {} -func (m *ACLSyncContentValue) GetValue() isACLSyncContentValue_Value { +func (m *AclSyncContentValue) GetValue() isAclSyncContentValue_Value { if m != nil { return m.Value } return nil } -func (m *ACLSyncContentValue) GetAddRecords() *ACLAddRecords { - if x, ok := m.GetValue().(*ACLSyncContentValue_AddRecords); ok { +func (m *AclSyncContentValue) GetAddRecords() *AclAddRecords { + if x, ok := m.GetValue().(*AclSyncContentValue_AddRecords); ok { return x.AddRecords } return nil } // XXX_OneofWrappers is for the internal use of the proto package. -func (*ACLSyncContentValue) XXX_OneofWrappers() []interface{} { +func (*AclSyncContentValue) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*ACLSyncContentValue_AddRecords)(nil), + (*AclSyncContentValue_AddRecords)(nil), } } -type ACLAddRecords struct { - Records []*RawACLRecordWithId `protobuf:"bytes,1,rep,name=records,proto3" json:"records,omitempty"` +type AclAddRecords struct { + Records []*RawAclRecordWithId `protobuf:"bytes,1,rep,name=records,proto3" json:"records,omitempty"` } -func (m *ACLAddRecords) Reset() { *m = ACLAddRecords{} } -func (m *ACLAddRecords) String() string { return proto.CompactTextString(m) } -func (*ACLAddRecords) ProtoMessage() {} -func (*ACLAddRecords) Descriptor() ([]byte, []int) { +func (m *AclAddRecords) Reset() { *m = AclAddRecords{} } +func (m *AclAddRecords) String() string { return proto.CompactTextString(m) } +func (*AclAddRecords) ProtoMessage() {} +func (*AclAddRecords) Descriptor() ([]byte, []int) { return fileDescriptor_c8e9f754f34e929b, []int{16} } -func (m *ACLAddRecords) XXX_Unmarshal(b []byte) error { +func (m *AclAddRecords) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *ACLAddRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *AclAddRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_ACLAddRecords.Marshal(b, m, deterministic) + return xxx_messageInfo_AclAddRecords.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1146,19 +1146,19 @@ func (m *ACLAddRecords) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *ACLAddRecords) XXX_Merge(src proto.Message) { - xxx_messageInfo_ACLAddRecords.Merge(m, src) +func (m *AclAddRecords) XXX_Merge(src proto.Message) { + xxx_messageInfo_AclAddRecords.Merge(m, src) } -func (m *ACLAddRecords) XXX_Size() int { +func (m *AclAddRecords) XXX_Size() int { return m.Size() } -func (m *ACLAddRecords) XXX_DiscardUnknown() { - xxx_messageInfo_ACLAddRecords.DiscardUnknown(m) +func (m *AclAddRecords) XXX_DiscardUnknown() { + xxx_messageInfo_AclAddRecords.DiscardUnknown(m) } -var xxx_messageInfo_ACLAddRecords proto.InternalMessageInfo +var xxx_messageInfo_AclAddRecords proto.InternalMessageInfo -func (m *ACLAddRecords) GetRecords() []*RawACLRecordWithId { +func (m *AclAddRecords) GetRecords() []*RawAclRecordWithId { if m != nil { return m.Records } @@ -1166,25 +1166,25 @@ func (m *ACLAddRecords) GetRecords() []*RawACLRecordWithId { } func init() { - proto.RegisterEnum("aclrecord.ACLUserPermissions", ACLUserPermissions_name, ACLUserPermissions_value) - proto.RegisterType((*RawACLRecord)(nil), "aclrecord.RawACLRecord") - proto.RegisterType((*RawACLRecordWithId)(nil), "aclrecord.RawACLRecordWithId") - proto.RegisterType((*ACLRecord)(nil), "aclrecord.ACLRecord") - proto.RegisterType((*ACLRoot)(nil), "aclrecord.ACLRoot") - proto.RegisterType((*ACLContentValue)(nil), "aclrecord.ACLContentValue") - proto.RegisterType((*ACLData)(nil), "aclrecord.ACLData") - proto.RegisterType((*ACLState)(nil), "aclrecord.ACLState") - proto.RegisterMapType((map[string]*ACLUserInvite)(nil), "aclrecord.ACLState.InvitesEntry") - proto.RegisterType((*ACLUserState)(nil), "aclrecord.ACLUserState") - proto.RegisterType((*ACLUserAdd)(nil), "aclrecord.ACLUserAdd") - proto.RegisterType((*ACLUserInvite)(nil), "aclrecord.ACLUserInvite") - proto.RegisterType((*ACLUserJoin)(nil), "aclrecord.ACLUserJoin") - proto.RegisterType((*ACLUserRemove)(nil), "aclrecord.ACLUserRemove") - proto.RegisterType((*ACLReadKeyReplace)(nil), "aclrecord.ACLReadKeyReplace") - proto.RegisterType((*ACLUserPermissionChange)(nil), "aclrecord.ACLUserPermissionChange") - proto.RegisterType((*ACLSyncMessage)(nil), "aclrecord.ACLSyncMessage") - proto.RegisterType((*ACLSyncContentValue)(nil), "aclrecord.ACLSyncContentValue") - proto.RegisterType((*ACLAddRecords)(nil), "aclrecord.ACLAddRecords") + proto.RegisterEnum("aclrecord.AclUserPermissions", AclUserPermissions_name, AclUserPermissions_value) + proto.RegisterType((*RawAclRecord)(nil), "aclrecord.RawAclRecord") + proto.RegisterType((*RawAclRecordWithId)(nil), "aclrecord.RawAclRecordWithId") + proto.RegisterType((*AclRecord)(nil), "aclrecord.AclRecord") + proto.RegisterType((*AclRoot)(nil), "aclrecord.AclRoot") + proto.RegisterType((*AclContentValue)(nil), "aclrecord.AclContentValue") + proto.RegisterType((*AclData)(nil), "aclrecord.AclData") + proto.RegisterType((*AclState)(nil), "aclrecord.AclState") + proto.RegisterMapType((map[string]*AclUserInvite)(nil), "aclrecord.AclState.InvitesEntry") + proto.RegisterType((*AclUserState)(nil), "aclrecord.AclUserState") + proto.RegisterType((*AclUserAdd)(nil), "aclrecord.AclUserAdd") + proto.RegisterType((*AclUserInvite)(nil), "aclrecord.AclUserInvite") + proto.RegisterType((*AclUserJoin)(nil), "aclrecord.AclUserJoin") + proto.RegisterType((*AclUserRemove)(nil), "aclrecord.AclUserRemove") + proto.RegisterType((*AclReadKeyReplace)(nil), "aclrecord.AclReadKeyReplace") + proto.RegisterType((*AclUserPermissionChange)(nil), "aclrecord.AclUserPermissionChange") + proto.RegisterType((*AclSyncMessage)(nil), "aclrecord.AclSyncMessage") + proto.RegisterType((*AclSyncContentValue)(nil), "aclrecord.AclSyncContentValue") + proto.RegisterType((*AclAddRecords)(nil), "aclrecord.AclAddRecords") } func init() { @@ -1192,71 +1192,71 @@ func init() { } var fileDescriptor_c8e9f754f34e929b = []byte{ - // 965 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xac, 0x9d, 0x38, 0x7e, 0x76, 0x13, 0x67, 0x80, 0x76, 0x15, 0x15, 0x2b, 0x5a, 0x81, - 0x14, 0x55, 0x95, 0x23, 0x0c, 0x52, 0xaa, 0x08, 0x51, 0xb9, 0xa6, 0xc8, 0x6e, 0x82, 0x54, 0x4d, - 0x80, 0xa2, 0xde, 0x26, 0xbb, 0xa3, 0x64, 0xc1, 0xfb, 0x47, 0x33, 0x63, 0xa3, 0x3d, 0x72, 0xe6, - 0x02, 0xdf, 0x00, 0x3e, 0x08, 0x77, 0x24, 0x2e, 0xbd, 0x80, 0x38, 0xa2, 0xe4, 0x63, 0x70, 0x41, - 0x33, 0xfb, 0x7f, 0xd7, 0x89, 0x5a, 0xc9, 0xea, 0x21, 0xc9, 0xcc, 0x7b, 0xbf, 0x37, 0xf9, 0xbd, - 0xdf, 0x7b, 0xf3, 0x66, 0xe1, 0x53, 0x3b, 0xf0, 0xbc, 0xc0, 0x17, 0x21, 0xb5, 0xd9, 0x61, 0x70, - 0xfe, 0x1d, 0xb3, 0xe5, 0x21, 0xb5, 0xe7, 0xea, 0x87, 0x33, 0x3b, 0xe0, 0x4e, 0xc8, 0x03, 0x19, - 0x1c, 0xea, 0xdf, 0x22, 0xb7, 0x0e, 0xb5, 0x01, 0x77, 0x32, 0x83, 0xf5, 0x2b, 0x82, 0x1e, 0xa1, - 0x3f, 0x8c, 0x27, 0xa7, 0x44, 0x1b, 0xb0, 0x09, 0xed, 0x90, 0x46, 0xf3, 0x80, 0x3a, 0x26, 0xda, - 0x47, 0x07, 0x3d, 0x92, 0x6e, 0xf1, 0x7d, 0xe8, 0x08, 0xf7, 0xc2, 0xa7, 0x72, 0xc1, 0x99, 0x69, - 0x68, 0x5f, 0x6e, 0xc0, 0x0f, 0xa0, 0x4f, 0x6d, 0x9b, 0x85, 0x32, 0xe0, 0x33, 0x87, 0xf9, 0xd2, - 0x95, 0x91, 0xd9, 0xd4, 0xa0, 0x9a, 0x1d, 0x3f, 0x84, 0xdd, 0xd4, 0x76, 0x96, 0x9d, 0xd8, 0xd2, - 0xe0, 0xba, 0xc3, 0xfa, 0x0c, 0x70, 0x91, 0xe1, 0x0b, 0x57, 0x5e, 0xce, 0x6e, 0xe3, 0xb9, 0x0d, - 0x86, 0xeb, 0x68, 0x82, 0x1d, 0x62, 0xb8, 0x8e, 0xf5, 0x1b, 0x82, 0x4e, 0x9e, 0xdf, 0x5d, 0xd8, - 0x0c, 0x39, 0x5b, 0xce, 0xe2, 0xb0, 0x0e, 0x49, 0x76, 0x78, 0x0f, 0xb6, 0xdc, 0x94, 0x77, 0x9c, - 0x5c, 0xb6, 0xc7, 0x18, 0x5a, 0x0e, 0x95, 0x34, 0xc9, 0x47, 0xaf, 0xf1, 0x10, 0xb0, 0xbd, 0xe0, - 0x9c, 0xf9, 0x92, 0x30, 0xea, 0x9c, 0xb0, 0x68, 0x4a, 0xc5, 0xa5, 0x4e, 0xa2, 0x45, 0x56, 0x78, - 0x94, 0x7a, 0xd2, 0xf5, 0x98, 0x90, 0xd4, 0x0b, 0xcd, 0x8d, 0x7d, 0x74, 0xd0, 0x24, 0xb9, 0xc1, - 0xfa, 0xc9, 0x80, 0xb6, 0xe2, 0x18, 0x04, 0xb2, 0xc4, 0x04, 0x55, 0x98, 0x7c, 0x00, 0x77, 0x98, - 0x6f, 0xf3, 0x28, 0x94, 0x6e, 0xe0, 0x9f, 0xb0, 0x94, 0x6a, 0xd9, 0xa8, 0xb4, 0xd1, 0x9d, 0x31, - 0x73, 0x34, 0xe5, 0x0e, 0x49, 0xb7, 0xaa, 0x4a, 0x09, 0x94, 0x39, 0x09, 0xbb, 0x44, 0xf8, 0x9a, - 0x5d, 0x61, 0x1d, 0xc6, 0xdd, 0x25, 0x55, 0xc7, 0x9e, 0xd9, 0x97, 0xcc, 0x63, 0x9a, 0x78, 0x87, - 0xd4, 0xec, 0x37, 0xa8, 0xb1, 0xf9, 0x7a, 0x6a, 0xb4, 0xab, 0x6a, 0xfc, 0x65, 0xc0, 0xce, 0x78, - 0x72, 0x3a, 0x09, 0x7c, 0xc9, 0x7c, 0xf9, 0x0d, 0x9d, 0x2f, 0x18, 0xfe, 0x08, 0xda, 0x0b, 0xc1, - 0xf8, 0xd8, 0x89, 0x0b, 0xd7, 0x1d, 0xbd, 0x37, 0xcc, 0xdb, 0x7a, 0x3c, 0x39, 0xfd, 0x3a, 0x76, - 0x4e, 0x1b, 0x24, 0xc5, 0xe1, 0x63, 0x00, 0xb5, 0x24, 0xcc, 0x0b, 0x96, 0x71, 0xc7, 0x76, 0x47, - 0x66, 0x3d, 0x2a, 0xf6, 0x4f, 0x1b, 0xa4, 0x80, 0xc6, 0xdf, 0xc2, 0xbb, 0x6a, 0xf7, 0x9c, 0x71, - 0xcf, 0x15, 0xc2, 0x0d, 0xfc, 0xc9, 0x25, 0xf5, 0x2f, 0x98, 0xd6, 0xb3, 0x3b, 0xb2, 0xea, 0xa7, - 0x54, 0x91, 0xd3, 0x06, 0x59, 0x79, 0x42, 0xca, 0x6a, 0xe6, 0x2f, 0x5d, 0x19, 0x77, 0xfd, 0x4a, - 0x56, 0xb1, 0x3f, 0x65, 0x15, 0xef, 0xf0, 0x27, 0xb0, 0xa5, 0x76, 0xcf, 0x02, 0xd7, 0xd7, 0xa5, - 0xe8, 0x8e, 0xee, 0xd6, 0x23, 0x95, 0x77, 0xda, 0x20, 0x19, 0xf2, 0x49, 0x1b, 0x36, 0x96, 0x4a, - 0x43, 0xeb, 0xa9, 0x6e, 0xb2, 0xcf, 0x55, 0xfb, 0x1e, 0x03, 0x50, 0x7b, 0x9e, 0x28, 0x6c, 0xa2, - 0xfd, 0xe6, 0x41, 0x77, 0xb4, 0x57, 0x3e, 0xab, 0x28, 0x3f, 0x29, 0xa0, 0xad, 0xff, 0x10, 0x6c, - 0x8d, 0x27, 0xa7, 0x67, 0x92, 0x4a, 0xa6, 0x3a, 0x92, 0xe7, 0x85, 0x65, 0x42, 0x9f, 0xd5, 0x22, - 0x65, 0x23, 0x3e, 0x8a, 0x93, 0xd6, 0x21, 0xc2, 0x34, 0xf4, 0xbf, 0xbb, 0x57, 0xa7, 0xae, 0xfd, - 0xa4, 0x00, 0xc5, 0xc7, 0xd0, 0x76, 0x75, 0xee, 0xc2, 0x6c, 0xea, 0xa8, 0xfd, 0x72, 0x94, 0x86, - 0x0d, 0x63, 0x79, 0xc4, 0x53, 0x5f, 0xf2, 0x88, 0xa4, 0x01, 0x7b, 0x5f, 0x41, 0xaf, 0xe8, 0xc0, - 0x7d, 0x68, 0x7e, 0xcf, 0xa2, 0xe4, 0xde, 0xab, 0x25, 0x1e, 0x26, 0xca, 0xdc, 0xdc, 0x1c, 0xf1, - 0x01, 0x24, 0x86, 0x1d, 0x1b, 0x8f, 0x90, 0xf5, 0x0b, 0x82, 0x5e, 0x91, 0xee, 0x1a, 0xee, 0xeb, - 0x63, 0xe8, 0x86, 0x59, 0x9b, 0x08, 0xdd, 0x63, 0xdb, 0xa3, 0xf7, 0x6f, 0xeb, 0x31, 0x41, 0x8a, - 0x11, 0xd6, 0xef, 0x08, 0x20, 0xbf, 0x03, 0x6b, 0x60, 0xf4, 0x10, 0x76, 0xab, 0xf3, 0x20, 0x2e, - 0x40, 0x8f, 0xd4, 0x1d, 0x55, 0xfe, 0xad, 0x37, 0xe6, 0xff, 0x37, 0x82, 0x3b, 0x25, 0xc1, 0xf1, - 0x01, 0xec, 0xc4, 0x2f, 0xc1, 0xf3, 0xc5, 0xf9, 0xdc, 0xb5, 0x4f, 0x58, 0x9a, 0x49, 0xd5, 0x5c, - 0xa0, 0x7a, 0x16, 0x79, 0xe9, 0xe4, 0x31, 0xf4, 0xe4, 0xa9, 0x3b, 0xde, 0x76, 0x62, 0x7f, 0x22, - 0xe8, 0x16, 0xae, 0xe5, 0x1a, 0x2a, 0x93, 0x09, 0x93, 0xbf, 0x9c, 0xcd, 0xa2, 0x30, 0x99, 0x19, - 0x5b, 0xd0, 0xcb, 0xb4, 0xca, 0xe7, 0x7c, 0xc9, 0xb6, 0x5a, 0x8e, 0x8d, 0x1b, 0xe4, 0xb0, 0x44, - 0x56, 0xa5, 0x64, 0x4a, 0xde, 0x96, 0xce, 0x17, 0xb0, 0x93, 0xcc, 0x00, 0xc2, 0xc2, 0x39, 0xb5, - 0xb3, 0x7b, 0x7f, 0xbf, 0xac, 0x1f, 0x29, 0x81, 0x48, 0x35, 0xc8, 0xfa, 0x11, 0xc1, 0x6e, 0x0d, - 0xb6, 0x06, 0x21, 0x57, 0x3d, 0x85, 0xcd, 0xd5, 0x4f, 0xa1, 0xb5, 0x84, 0x7b, 0x37, 0x8c, 0xf9, - 0x5b, 0x89, 0x54, 0xda, 0xc7, 0x78, 0xe3, 0xf6, 0x79, 0x06, 0xdb, 0x6a, 0xc6, 0x45, 0xbe, 0xfd, - 0x25, 0x13, 0x82, 0x5e, 0x30, 0xfc, 0x08, 0xda, 0x76, 0x32, 0xb4, 0xe3, 0x99, 0x35, 0xa8, 0xcc, - 0xc3, 0xc8, 0xb7, 0x4b, 0x83, 0x3b, 0x85, 0x5b, 0x2f, 0xe1, 0x9d, 0x15, 0x7e, 0xfd, 0x10, 0x38, - 0x4e, 0xfc, 0x71, 0x24, 0x92, 0xa7, 0xb5, 0x32, 0x07, 0xc7, 0x99, 0x5f, 0x3d, 0x47, 0x39, 0x3a, - 0x7f, 0x58, 0xa6, 0xba, 0x31, 0x72, 0x1c, 0x3e, 0x82, 0x36, 0xcf, 0x8e, 0x54, 0x45, 0x2f, 0x66, - 0x5d, 0xff, 0x9a, 0x23, 0x29, 0xfa, 0xc1, 0x11, 0xe0, 0xba, 0x28, 0xb8, 0x03, 0x1b, 0x63, 0xc7, - 0x73, 0xfd, 0x7e, 0x03, 0x03, 0x6c, 0xbe, 0xe0, 0xae, 0x64, 0xbc, 0x8f, 0xd4, 0x5a, 0x55, 0x88, - 0xf1, 0xbe, 0xf1, 0xe4, 0xf1, 0x1f, 0x57, 0x03, 0xf4, 0xea, 0x6a, 0x80, 0xfe, 0xbd, 0x1a, 0xa0, - 0x9f, 0xaf, 0x07, 0x8d, 0x57, 0xd7, 0x83, 0xc6, 0x3f, 0xd7, 0x83, 0xc6, 0xcb, 0x0f, 0x5f, 0xeb, - 0x5b, 0xf9, 0x7c, 0x53, 0xff, 0xf9, 0xf8, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x03, 0x77, - 0x62, 0x5b, 0x0b, 0x00, 0x00, + // 962 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xf7, 0xac, 0x9d, 0x38, 0x7e, 0x76, 0x13, 0x67, 0xbe, 0x5f, 0x5a, 0x2b, 0x2a, 0x56, 0xb4, + 0x02, 0x29, 0xaa, 0x2a, 0x47, 0x18, 0xa4, 0x54, 0x11, 0xa2, 0x72, 0x4b, 0x91, 0xdd, 0x08, 0xa9, + 0x9a, 0x00, 0x45, 0xbd, 0x4d, 0x66, 0x47, 0xc9, 0xc2, 0xfe, 0xd2, 0xcc, 0xd8, 0x68, 0x8f, 0x9c, + 0xb9, 0xc0, 0x7f, 0x00, 0x7f, 0x08, 0x77, 0x24, 0x2e, 0xbd, 0x80, 0x38, 0xa2, 0xe4, 0xcf, 0xe0, + 0x82, 0x66, 0xf6, 0xf7, 0xae, 0x13, 0xb5, 0x52, 0xc4, 0x21, 0xc9, 0xcc, 0x7b, 0x9f, 0x37, 0xf9, + 0xbc, 0xcf, 0x7b, 0xf3, 0x66, 0xe1, 0x63, 0x16, 0xfa, 0x7e, 0x18, 0xc8, 0x88, 0x32, 0x7e, 0x18, + 0x9e, 0x7d, 0xc3, 0x99, 0x3a, 0xa4, 0xcc, 0xd3, 0x3f, 0x82, 0xb3, 0x50, 0x38, 0x91, 0x08, 0x55, + 0x78, 0x68, 0x7e, 0xcb, 0xc2, 0x3a, 0x31, 0x06, 0xdc, 0xcb, 0x0d, 0xf6, 0xcf, 0x08, 0x06, 0x84, + 0x7e, 0x37, 0x63, 0x1e, 0x31, 0x06, 0x3c, 0x82, 0x6e, 0x44, 0x63, 0x2f, 0xa4, 0xce, 0x08, 0xed, + 0xa3, 0x83, 0x01, 0xc9, 0xb6, 0xf8, 0x3e, 0xf4, 0xa4, 0x7b, 0x1e, 0x50, 0xb5, 0x14, 0x7c, 0x64, + 0x19, 0x5f, 0x61, 0xc0, 0x0f, 0x60, 0x48, 0x19, 0xe3, 0x91, 0x0a, 0xc5, 0xc2, 0xe1, 0x81, 0x72, + 0x55, 0x3c, 0x6a, 0x1b, 0x50, 0xc3, 0x8e, 0x1f, 0xc2, 0x6e, 0x66, 0x3b, 0xcd, 0x4f, 0xec, 0x18, + 0x70, 0xd3, 0x61, 0x7f, 0x02, 0xb8, 0xcc, 0xf0, 0xa5, 0xab, 0x2e, 0x16, 0x37, 0xf1, 0xdc, 0x06, + 0xcb, 0x75, 0x0c, 0xc1, 0x1e, 0xb1, 0x5c, 0xc7, 0xfe, 0x05, 0x41, 0xaf, 0xc8, 0xef, 0x2e, 0x6c, + 0x46, 0x82, 0xaf, 0x16, 0x49, 0x58, 0x8f, 0xa4, 0x3b, 0xbc, 0x07, 0x5b, 0x6e, 0xc6, 0x3b, 0x49, + 0x2e, 0xdf, 0x63, 0x0c, 0x1d, 0x87, 0x2a, 0x9a, 0xe6, 0x63, 0xd6, 0x78, 0x02, 0x98, 0x2d, 0x85, + 0xe0, 0x81, 0x22, 0x9c, 0x3a, 0x27, 0x3c, 0x9e, 0x53, 0x79, 0x61, 0x92, 0xe8, 0x90, 0x35, 0x1e, + 0xad, 0x9e, 0x72, 0x7d, 0x2e, 0x15, 0xf5, 0xa3, 0xd1, 0xc6, 0x3e, 0x3a, 0x68, 0x93, 0xc2, 0x60, + 0xff, 0x60, 0x41, 0x57, 0x73, 0x0c, 0x43, 0x55, 0x61, 0x82, 0x6a, 0x4c, 0xde, 0x83, 0x3b, 0x3c, + 0x60, 0x22, 0x8e, 0x94, 0x1b, 0x06, 0x27, 0x3c, 0xa3, 0x5a, 0x35, 0x6a, 0x6d, 0x4c, 0x67, 0x2c, + 0x1c, 0x43, 0xb9, 0x47, 0xb2, 0xad, 0xae, 0x52, 0x0a, 0xe5, 0x4e, 0xca, 0x2e, 0x15, 0xbe, 0x61, + 0xd7, 0x58, 0x87, 0x0b, 0x77, 0x45, 0xf5, 0xb1, 0xa7, 0xec, 0x82, 0xfb, 0xdc, 0x10, 0xef, 0x91, + 0x86, 0xfd, 0x1a, 0x35, 0x36, 0xdf, 0x4c, 0x8d, 0x6e, 0x5d, 0x8d, 0x3f, 0x2c, 0xd8, 0x99, 0x31, + 0xef, 0x69, 0x18, 0x28, 0x1e, 0xa8, 0xaf, 0xa8, 0xb7, 0xe4, 0xf8, 0x03, 0xe8, 0x2e, 0x25, 0x17, + 0x33, 0x27, 0x29, 0x5c, 0x7f, 0xfa, 0xce, 0xa4, 0x68, 0xeb, 0x19, 0xf3, 0xbe, 0x4c, 0x9c, 0xf3, + 0x16, 0xc9, 0x70, 0xf8, 0x18, 0x40, 0x2f, 0x09, 0xf7, 0xc3, 0x55, 0xd2, 0xb1, 0xfd, 0xe9, 0xa8, + 0x19, 0x95, 0xf8, 0xe7, 0x2d, 0x52, 0x42, 0xe3, 0xaf, 0xe1, 0xff, 0x7a, 0xf7, 0x82, 0x0b, 0xdf, + 0x95, 0xd2, 0x0d, 0x83, 0xa7, 0x17, 0x34, 0x38, 0xe7, 0x46, 0xcf, 0xfe, 0xd4, 0x6e, 0x9e, 0x52, + 0x47, 0xce, 0x5b, 0x64, 0xed, 0x09, 0x19, 0xab, 0x45, 0xb0, 0x72, 0x55, 0xd2, 0xf5, 0x6b, 0x59, + 0x25, 0xfe, 0x8c, 0x55, 0xb2, 0xc3, 0x1f, 0xc1, 0x96, 0xde, 0x3d, 0x0f, 0xdd, 0xc0, 0x94, 0xa2, + 0x3f, 0xbd, 0xdb, 0x8c, 0xd4, 0xde, 0x79, 0x8b, 0xe4, 0xc8, 0x27, 0x5d, 0xd8, 0x58, 0x69, 0x0d, + 0xed, 0x67, 0xa6, 0xc9, 0x3e, 0xd5, 0xed, 0x7b, 0x0c, 0x40, 0x73, 0x85, 0x47, 0x68, 0xbf, 0x7d, + 0xd0, 0x9f, 0xee, 0x55, 0xcf, 0x2a, 0xcb, 0x4f, 0x4a, 0x68, 0xfb, 0x1f, 0x04, 0x5b, 0x33, 0xe6, + 0x9d, 0x2a, 0xaa, 0xb8, 0xee, 0x48, 0x51, 0x14, 0x96, 0x4b, 0x73, 0x56, 0x87, 0x54, 0x8d, 0xf8, + 0x28, 0x49, 0xda, 0x84, 0xc8, 0x91, 0x65, 0xfe, 0xdd, 0xbd, 0x26, 0x75, 0xe3, 0x27, 0x25, 0x28, + 0x3e, 0x86, 0xae, 0x6b, 0x72, 0x97, 0xa3, 0xb6, 0x89, 0xda, 0xaf, 0x46, 0x19, 0xd8, 0x24, 0x91, + 0x47, 0x3e, 0x0b, 0x94, 0x88, 0x49, 0x16, 0xb0, 0xf7, 0x05, 0x0c, 0xca, 0x0e, 0x3c, 0x84, 0xf6, + 0xb7, 0x3c, 0x4e, 0xef, 0xbd, 0x5e, 0xe2, 0x49, 0xaa, 0xcc, 0xf5, 0xcd, 0x91, 0x1c, 0x40, 0x12, + 0xd8, 0xb1, 0xf5, 0x08, 0xd9, 0x3f, 0x21, 0x18, 0x94, 0xe9, 0xde, 0xc2, 0x7d, 0x7d, 0x0c, 0xfd, + 0x28, 0x6f, 0x13, 0x69, 0x7a, 0x6c, 0x7b, 0xfa, 0xee, 0x4d, 0x3d, 0x26, 0x49, 0x39, 0xc2, 0xfe, + 0x15, 0x01, 0x14, 0x77, 0xe0, 0x16, 0x18, 0x3d, 0x84, 0xdd, 0xfa, 0x3c, 0x48, 0x0a, 0x30, 0x20, + 0x4d, 0x47, 0x9d, 0x7f, 0xe7, 0xad, 0xf9, 0xff, 0x89, 0xe0, 0x4e, 0x45, 0x70, 0x7c, 0x00, 0x3b, + 0xc9, 0x4b, 0xf0, 0x62, 0x79, 0xe6, 0xb9, 0xec, 0x84, 0x67, 0x99, 0xd4, 0xcd, 0x25, 0xaa, 0xa7, + 0xb1, 0x9f, 0x4d, 0x1e, 0xcb, 0x4c, 0x9e, 0xa6, 0xe3, 0xbf, 0x4e, 0xec, 0x77, 0x04, 0xfd, 0xd2, + 0xb5, 0xbc, 0x85, 0xca, 0xe4, 0xc2, 0x14, 0x2f, 0x67, 0xbb, 0x2c, 0x4c, 0x6e, 0xc6, 0x36, 0x0c, + 0x72, 0xad, 0x8a, 0x39, 0x5f, 0xb1, 0xad, 0x97, 0x63, 0xe3, 0x1a, 0x39, 0x6c, 0x99, 0x57, 0x29, + 0x9d, 0x92, 0x37, 0xa5, 0xf3, 0x19, 0xec, 0xa4, 0x33, 0x80, 0xf0, 0xc8, 0xa3, 0x2c, 0xbf, 0xf7, + 0xf7, 0xab, 0xfa, 0x91, 0x0a, 0x88, 0xd4, 0x83, 0xec, 0xef, 0x11, 0xec, 0x36, 0x60, 0xb7, 0x20, + 0xe4, 0xba, 0xa7, 0xb0, 0xbd, 0xfe, 0x29, 0xb4, 0x57, 0x70, 0xef, 0x9a, 0x31, 0x7f, 0x23, 0x91, + 0x5a, 0xfb, 0x58, 0x6f, 0xdd, 0x3e, 0xcf, 0x61, 0x5b, 0xcf, 0xb8, 0x38, 0x60, 0x9f, 0x73, 0x29, + 0xe9, 0x39, 0xc7, 0x8f, 0xa0, 0xcb, 0xd2, 0xa1, 0x9d, 0xcc, 0xac, 0x71, 0x6d, 0x1e, 0xc6, 0x01, + 0xab, 0x0c, 0xee, 0x0c, 0x6e, 0xbf, 0x82, 0xff, 0xad, 0xf1, 0x9b, 0x87, 0xc0, 0x71, 0x92, 0x8f, + 0x23, 0x99, 0x3e, 0xad, 0xb5, 0x39, 0x38, 0xcb, 0xfd, 0xfa, 0x39, 0x2a, 0xd0, 0xc5, 0xc3, 0x32, + 0x37, 0x8d, 0x51, 0xe0, 0xf0, 0x11, 0x74, 0x45, 0x7e, 0xa4, 0x2e, 0x7a, 0x39, 0xeb, 0xe6, 0xd7, + 0x1c, 0xc9, 0xd0, 0x0f, 0x8e, 0x00, 0x37, 0x45, 0xc1, 0x3d, 0xd8, 0x98, 0x39, 0xbe, 0x1b, 0x0c, + 0x5b, 0x18, 0x60, 0xf3, 0xa5, 0x70, 0x15, 0x17, 0x43, 0xa4, 0xd7, 0xba, 0x42, 0x5c, 0x0c, 0xad, + 0x27, 0x8f, 0x7f, 0xbb, 0x1c, 0xa3, 0xd7, 0x97, 0x63, 0xf4, 0xf7, 0xe5, 0x18, 0xfd, 0x78, 0x35, + 0x6e, 0xbd, 0xbe, 0x1a, 0xb7, 0xfe, 0xba, 0x1a, 0xb7, 0x5e, 0xbd, 0xff, 0x46, 0xdf, 0xca, 0x67, + 0x9b, 0xe6, 0xcf, 0x87, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xd9, 0x79, 0xd5, 0x5b, 0x0b, + 0x00, 0x00, } -func (m *RawACLRecord) Marshal() (dAtA []byte, err error) { +func (m *RawAclRecord) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1266,12 +1266,12 @@ func (m *RawACLRecord) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RawACLRecord) MarshalTo(dAtA []byte) (int, error) { +func (m *RawAclRecord) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RawACLRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *RawAclRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1307,7 +1307,7 @@ func (m *RawACLRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *RawACLRecordWithId) Marshal() (dAtA []byte, err error) { +func (m *RawAclRecordWithId) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1317,12 +1317,12 @@ func (m *RawACLRecordWithId) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *RawACLRecordWithId) MarshalTo(dAtA []byte) (int, error) { +func (m *RawAclRecordWithId) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *RawACLRecordWithId) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *RawAclRecordWithId) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1344,7 +1344,7 @@ func (m *RawACLRecordWithId) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLRecord) Marshal() (dAtA []byte, err error) { +func (m *AclRecord) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1354,12 +1354,12 @@ func (m *ACLRecord) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLRecord) MarshalTo(dAtA []byte) (int, error) { +func (m *AclRecord) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1398,7 +1398,7 @@ func (m *ACLRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLRoot) Marshal() (dAtA []byte, err error) { +func (m *AclRoot) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1408,12 +1408,12 @@ func (m *ACLRoot) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLRoot) MarshalTo(dAtA []byte) (int, error) { +func (m *AclRoot) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1466,7 +1466,7 @@ func (m *ACLRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLContentValue) Marshal() (dAtA []byte, err error) { +func (m *AclContentValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1476,12 +1476,12 @@ func (m *ACLContentValue) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLContentValue) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1498,12 +1498,12 @@ func (m *ACLContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLContentValue_UserAdd) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue_UserAdd) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue_UserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue_UserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.UserAdd != nil { { @@ -1519,12 +1519,12 @@ func (m *ACLContentValue_UserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) } return len(dAtA) - i, nil } -func (m *ACLContentValue_UserRemove) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue_UserRemove) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue_UserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue_UserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.UserRemove != nil { { @@ -1540,12 +1540,12 @@ func (m *ACLContentValue_UserRemove) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } -func (m *ACLContentValue_UserPermissionChange) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue_UserPermissionChange) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue_UserPermissionChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue_UserPermissionChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.UserPermissionChange != nil { { @@ -1561,12 +1561,12 @@ func (m *ACLContentValue_UserPermissionChange) MarshalToSizedBuffer(dAtA []byte) } return len(dAtA) - i, nil } -func (m *ACLContentValue_UserInvite) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue_UserInvite) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue_UserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue_UserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.UserInvite != nil { { @@ -1582,12 +1582,12 @@ func (m *ACLContentValue_UserInvite) MarshalToSizedBuffer(dAtA []byte) (int, err } return len(dAtA) - i, nil } -func (m *ACLContentValue_UserJoin) MarshalTo(dAtA []byte) (int, error) { +func (m *AclContentValue_UserJoin) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLContentValue_UserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclContentValue_UserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.UserJoin != nil { { @@ -1603,7 +1603,7 @@ func (m *ACLContentValue_UserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error } return len(dAtA) - i, nil } -func (m *ACLData) Marshal() (dAtA []byte, err error) { +func (m *AclData) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1613,12 +1613,12 @@ func (m *ACLData) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLData) MarshalTo(dAtA []byte) (int, error) { +func (m *AclData) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLData) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1640,7 +1640,7 @@ func (m *ACLData) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLState) Marshal() (dAtA []byte, err error) { +func (m *AclState) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1650,12 +1650,12 @@ func (m *ACLState) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLState) MarshalTo(dAtA []byte) (int, error) { +func (m *AclState) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLState) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1721,7 +1721,7 @@ func (m *ACLState) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserState) Marshal() (dAtA []byte, err error) { +func (m *AclUserState) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1731,12 +1731,12 @@ func (m *ACLUserState) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserState) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserState) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserState) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1763,7 +1763,7 @@ func (m *ACLUserState) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserAdd) Marshal() (dAtA []byte, err error) { +func (m *AclUserAdd) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1773,12 +1773,12 @@ func (m *ACLUserAdd) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserAdd) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserAdd) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1814,7 +1814,7 @@ func (m *ACLUserAdd) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserInvite) Marshal() (dAtA []byte, err error) { +func (m *AclUserInvite) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1824,12 +1824,12 @@ func (m *ACLUserInvite) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserInvite) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserInvite) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1863,7 +1863,7 @@ func (m *ACLUserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserJoin) Marshal() (dAtA []byte, err error) { +func (m *AclUserJoin) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1873,12 +1873,12 @@ func (m *ACLUserJoin) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserJoin) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserJoin) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1923,7 +1923,7 @@ func (m *ACLUserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserRemove) Marshal() (dAtA []byte, err error) { +func (m *AclUserRemove) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1933,12 +1933,12 @@ func (m *ACLUserRemove) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserRemove) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserRemove) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1967,7 +1967,7 @@ func (m *ACLUserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLReadKeyReplace) Marshal() (dAtA []byte, err error) { +func (m *AclReadKeyReplace) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1977,12 +1977,12 @@ func (m *ACLReadKeyReplace) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLReadKeyReplace) MarshalTo(dAtA []byte) (int, error) { +func (m *AclReadKeyReplace) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLReadKeyReplace) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclReadKeyReplace) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2011,7 +2011,7 @@ func (m *ACLReadKeyReplace) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLUserPermissionChange) Marshal() (dAtA []byte, err error) { +func (m *AclUserPermissionChange) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2021,12 +2021,12 @@ func (m *ACLUserPermissionChange) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLUserPermissionChange) MarshalTo(dAtA []byte) (int, error) { +func (m *AclUserPermissionChange) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLUserPermissionChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclUserPermissionChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2046,7 +2046,7 @@ func (m *ACLUserPermissionChange) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *ACLSyncMessage) Marshal() (dAtA []byte, err error) { +func (m *AclSyncMessage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2056,12 +2056,12 @@ func (m *ACLSyncMessage) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLSyncMessage) MarshalTo(dAtA []byte) (int, error) { +func (m *AclSyncMessage) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLSyncMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclSyncMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2081,7 +2081,7 @@ func (m *ACLSyncMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLSyncContentValue) Marshal() (dAtA []byte, err error) { +func (m *AclSyncContentValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2091,12 +2091,12 @@ func (m *ACLSyncContentValue) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLSyncContentValue) MarshalTo(dAtA []byte) (int, error) { +func (m *AclSyncContentValue) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLSyncContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclSyncContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2113,12 +2113,12 @@ func (m *ACLSyncContentValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ACLSyncContentValue_AddRecords) MarshalTo(dAtA []byte) (int, error) { +func (m *AclSyncContentValue_AddRecords) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLSyncContentValue_AddRecords) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclSyncContentValue_AddRecords) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.AddRecords != nil { { @@ -2134,7 +2134,7 @@ func (m *ACLSyncContentValue_AddRecords) MarshalToSizedBuffer(dAtA []byte) (int, } return len(dAtA) - i, nil } -func (m *ACLAddRecords) Marshal() (dAtA []byte, err error) { +func (m *AclAddRecords) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2144,12 +2144,12 @@ func (m *ACLAddRecords) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ACLAddRecords) MarshalTo(dAtA []byte) (int, error) { +func (m *AclAddRecords) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ACLAddRecords) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *AclAddRecords) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2182,7 +2182,7 @@ func encodeVarintAclrecord(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *RawACLRecord) Size() (n int) { +func (m *RawAclRecord) Size() (n int) { if m == nil { return 0 } @@ -2207,7 +2207,7 @@ func (m *RawACLRecord) Size() (n int) { return n } -func (m *RawACLRecordWithId) Size() (n int) { +func (m *RawAclRecordWithId) Size() (n int) { if m == nil { return 0 } @@ -2224,7 +2224,7 @@ func (m *RawACLRecordWithId) Size() (n int) { return n } -func (m *ACLRecord) Size() (n int) { +func (m *AclRecord) Size() (n int) { if m == nil { return 0 } @@ -2251,7 +2251,7 @@ func (m *ACLRecord) Size() (n int) { return n } -func (m *ACLRoot) Size() (n int) { +func (m *AclRoot) Size() (n int) { if m == nil { return 0 } @@ -2286,7 +2286,7 @@ func (m *ACLRoot) Size() (n int) { return n } -func (m *ACLContentValue) Size() (n int) { +func (m *AclContentValue) Size() (n int) { if m == nil { return 0 } @@ -2298,7 +2298,7 @@ func (m *ACLContentValue) Size() (n int) { return n } -func (m *ACLContentValue_UserAdd) Size() (n int) { +func (m *AclContentValue_UserAdd) Size() (n int) { if m == nil { return 0 } @@ -2310,7 +2310,7 @@ func (m *ACLContentValue_UserAdd) Size() (n int) { } return n } -func (m *ACLContentValue_UserRemove) Size() (n int) { +func (m *AclContentValue_UserRemove) Size() (n int) { if m == nil { return 0 } @@ -2322,7 +2322,7 @@ func (m *ACLContentValue_UserRemove) Size() (n int) { } return n } -func (m *ACLContentValue_UserPermissionChange) Size() (n int) { +func (m *AclContentValue_UserPermissionChange) Size() (n int) { if m == nil { return 0 } @@ -2334,7 +2334,7 @@ func (m *ACLContentValue_UserPermissionChange) Size() (n int) { } return n } -func (m *ACLContentValue_UserInvite) Size() (n int) { +func (m *AclContentValue_UserInvite) Size() (n int) { if m == nil { return 0 } @@ -2346,7 +2346,7 @@ func (m *ACLContentValue_UserInvite) Size() (n int) { } return n } -func (m *ACLContentValue_UserJoin) Size() (n int) { +func (m *AclContentValue_UserJoin) Size() (n int) { if m == nil { return 0 } @@ -2358,7 +2358,7 @@ func (m *ACLContentValue_UserJoin) Size() (n int) { } return n } -func (m *ACLData) Size() (n int) { +func (m *AclData) Size() (n int) { if m == nil { return 0 } @@ -2373,7 +2373,7 @@ func (m *ACLData) Size() (n int) { return n } -func (m *ACLState) Size() (n int) { +func (m *AclState) Size() (n int) { if m == nil { return 0 } @@ -2408,7 +2408,7 @@ func (m *ACLState) Size() (n int) { return n } -func (m *ACLUserState) Size() (n int) { +func (m *AclUserState) Size() (n int) { if m == nil { return 0 } @@ -2428,7 +2428,7 @@ func (m *ACLUserState) Size() (n int) { return n } -func (m *ACLUserAdd) Size() (n int) { +func (m *AclUserAdd) Size() (n int) { if m == nil { return 0 } @@ -2454,7 +2454,7 @@ func (m *ACLUserAdd) Size() (n int) { return n } -func (m *ACLUserInvite) Size() (n int) { +func (m *AclUserInvite) Size() (n int) { if m == nil { return 0 } @@ -2479,7 +2479,7 @@ func (m *ACLUserInvite) Size() (n int) { return n } -func (m *ACLUserJoin) Size() (n int) { +func (m *AclUserJoin) Size() (n int) { if m == nil { return 0 } @@ -2510,7 +2510,7 @@ func (m *ACLUserJoin) Size() (n int) { return n } -func (m *ACLUserRemove) Size() (n int) { +func (m *AclUserRemove) Size() (n int) { if m == nil { return 0 } @@ -2529,7 +2529,7 @@ func (m *ACLUserRemove) Size() (n int) { return n } -func (m *ACLReadKeyReplace) Size() (n int) { +func (m *AclReadKeyReplace) Size() (n int) { if m == nil { return 0 } @@ -2550,7 +2550,7 @@ func (m *ACLReadKeyReplace) Size() (n int) { return n } -func (m *ACLUserPermissionChange) Size() (n int) { +func (m *AclUserPermissionChange) Size() (n int) { if m == nil { return 0 } @@ -2566,7 +2566,7 @@ func (m *ACLUserPermissionChange) Size() (n int) { return n } -func (m *ACLSyncMessage) Size() (n int) { +func (m *AclSyncMessage) Size() (n int) { if m == nil { return 0 } @@ -2579,7 +2579,7 @@ func (m *ACLSyncMessage) Size() (n int) { return n } -func (m *ACLSyncContentValue) Size() (n int) { +func (m *AclSyncContentValue) Size() (n int) { if m == nil { return 0 } @@ -2591,7 +2591,7 @@ func (m *ACLSyncContentValue) Size() (n int) { return n } -func (m *ACLSyncContentValue_AddRecords) Size() (n int) { +func (m *AclSyncContentValue_AddRecords) Size() (n int) { if m == nil { return 0 } @@ -2603,7 +2603,7 @@ func (m *ACLSyncContentValue_AddRecords) Size() (n int) { } return n } -func (m *ACLAddRecords) Size() (n int) { +func (m *AclAddRecords) Size() (n int) { if m == nil { return 0 } @@ -2624,7 +2624,7 @@ func sovAclrecord(x uint64) (n int) { func sozAclrecord(x uint64) (n int) { return sovAclrecord(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *RawACLRecord) Unmarshal(dAtA []byte) error { +func (m *RawAclRecord) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2647,10 +2647,10 @@ func (m *RawACLRecord) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RawACLRecord: wiretype end group for non-group") + return fmt.Errorf("proto: RawAclRecord: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RawACLRecord: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RawAclRecord: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2810,7 +2810,7 @@ func (m *RawACLRecord) Unmarshal(dAtA []byte) error { } return nil } -func (m *RawACLRecordWithId) Unmarshal(dAtA []byte) error { +func (m *RawAclRecordWithId) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2833,10 +2833,10 @@ func (m *RawACLRecordWithId) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: RawACLRecordWithId: wiretype end group for non-group") + return fmt.Errorf("proto: RawAclRecordWithId: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: RawACLRecordWithId: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: RawAclRecordWithId: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2926,7 +2926,7 @@ func (m *RawACLRecordWithId) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLRecord) Unmarshal(dAtA []byte) error { +func (m *AclRecord) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2949,10 +2949,10 @@ func (m *ACLRecord) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLRecord: wiretype end group for non-group") + return fmt.Errorf("proto: AclRecord: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLRecord: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclRecord: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3114,7 +3114,7 @@ func (m *ACLRecord) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLRoot) Unmarshal(dAtA []byte) error { +func (m *AclRoot) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3137,10 +3137,10 @@ func (m *ACLRoot) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLRoot: wiretype end group for non-group") + return fmt.Errorf("proto: AclRoot: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLRoot: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclRoot: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3368,7 +3368,7 @@ func (m *ACLRoot) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLContentValue) Unmarshal(dAtA []byte) error { +func (m *AclContentValue) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3391,10 +3391,10 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLContentValue: wiretype end group for non-group") + return fmt.Errorf("proto: AclContentValue: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLContentValue: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclContentValue: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3426,11 +3426,11 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLUserAdd{} + v := &AclUserAdd{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLContentValue_UserAdd{v} + m.Value = &AclContentValue_UserAdd{v} iNdEx = postIndex case 2: if wireType != 2 { @@ -3461,11 +3461,11 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLUserRemove{} + v := &AclUserRemove{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLContentValue_UserRemove{v} + m.Value = &AclContentValue_UserRemove{v} iNdEx = postIndex case 3: if wireType != 2 { @@ -3496,11 +3496,11 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLUserPermissionChange{} + v := &AclUserPermissionChange{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLContentValue_UserPermissionChange{v} + m.Value = &AclContentValue_UserPermissionChange{v} iNdEx = postIndex case 4: if wireType != 2 { @@ -3531,11 +3531,11 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLUserInvite{} + v := &AclUserInvite{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLContentValue_UserInvite{v} + m.Value = &AclContentValue_UserInvite{v} iNdEx = postIndex case 5: if wireType != 2 { @@ -3566,11 +3566,11 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLUserJoin{} + v := &AclUserJoin{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLContentValue_UserJoin{v} + m.Value = &AclContentValue_UserJoin{v} iNdEx = postIndex default: iNdEx = preIndex @@ -3593,7 +3593,7 @@ func (m *ACLContentValue) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLData) Unmarshal(dAtA []byte) error { +func (m *AclData) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3616,10 +3616,10 @@ func (m *ACLData) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLData: wiretype end group for non-group") + return fmt.Errorf("proto: AclData: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLData: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclData: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3651,7 +3651,7 @@ func (m *ACLData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AclContent = append(m.AclContent, &ACLContentValue{}) + m.AclContent = append(m.AclContent, &AclContentValue{}) if err := m.AclContent[len(m.AclContent)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3677,7 +3677,7 @@ func (m *ACLData) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLState) Unmarshal(dAtA []byte) error { +func (m *AclState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3700,10 +3700,10 @@ func (m *ACLState) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLState: wiretype end group for non-group") + return fmt.Errorf("proto: AclState: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLState: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclState: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -3811,7 +3811,7 @@ func (m *ACLState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.UserStates = append(m.UserStates, &ACLUserState{}) + m.UserStates = append(m.UserStates, &AclUserState{}) if err := m.UserStates[len(m.UserStates)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -3846,10 +3846,10 @@ func (m *ACLState) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Invites == nil { - m.Invites = make(map[string]*ACLUserInvite) + m.Invites = make(map[string]*AclUserInvite) } var mapkey string - var mapvalue *ACLUserInvite + var mapvalue *AclUserInvite for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -3923,7 +3923,7 @@ func (m *ACLState) Unmarshal(dAtA []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue = &ACLUserInvite{} + mapvalue = &AclUserInvite{} if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { return err } @@ -3966,7 +3966,7 @@ func (m *ACLState) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserState) Unmarshal(dAtA []byte) error { +func (m *AclUserState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3989,10 +3989,10 @@ func (m *ACLUserState) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserState: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserState: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserState: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserState: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4077,7 +4077,7 @@ func (m *ACLUserState) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Permissions |= ACLUserPermissions(b&0x7F) << shift + m.Permissions |= AclUserPermissions(b&0x7F) << shift if b < 0x80 { break } @@ -4103,7 +4103,7 @@ func (m *ACLUserState) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserAdd) Unmarshal(dAtA []byte) error { +func (m *AclUserAdd) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4126,10 +4126,10 @@ func (m *ACLUserAdd) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserAdd: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserAdd: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserAdd: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserAdd: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4246,7 +4246,7 @@ func (m *ACLUserAdd) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Permissions |= ACLUserPermissions(b&0x7F) << shift + m.Permissions |= AclUserPermissions(b&0x7F) << shift if b < 0x80 { break } @@ -4272,7 +4272,7 @@ func (m *ACLUserAdd) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserInvite) Unmarshal(dAtA []byte) error { +func (m *AclUserInvite) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4295,10 +4295,10 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserInvite: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserInvite: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserInvite: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserInvite: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4400,7 +4400,7 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Permissions |= ACLUserPermissions(b&0x7F) << shift + m.Permissions |= AclUserPermissions(b&0x7F) << shift if b < 0x80 { break } @@ -4426,7 +4426,7 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserJoin) Unmarshal(dAtA []byte) error { +func (m *AclUserJoin) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4449,10 +4449,10 @@ func (m *ACLUserJoin) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserJoin: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserJoin: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserJoin: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserJoin: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4644,7 +4644,7 @@ func (m *ACLUserJoin) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserRemove) Unmarshal(dAtA []byte) error { +func (m *AclUserRemove) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4667,10 +4667,10 @@ func (m *ACLUserRemove) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserRemove: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserRemove: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserRemove: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserRemove: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4736,7 +4736,7 @@ func (m *ACLUserRemove) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ReadKeyReplaces = append(m.ReadKeyReplaces, &ACLReadKeyReplace{}) + m.ReadKeyReplaces = append(m.ReadKeyReplaces, &AclReadKeyReplace{}) if err := m.ReadKeyReplaces[len(m.ReadKeyReplaces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4762,7 +4762,7 @@ func (m *ACLUserRemove) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLReadKeyReplace) Unmarshal(dAtA []byte) error { +func (m *AclReadKeyReplace) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4785,10 +4785,10 @@ func (m *ACLReadKeyReplace) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLReadKeyReplace: wiretype end group for non-group") + return fmt.Errorf("proto: AclReadKeyReplace: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLReadKeyReplace: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclReadKeyReplace: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4914,7 +4914,7 @@ func (m *ACLReadKeyReplace) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLUserPermissionChange) Unmarshal(dAtA []byte) error { +func (m *AclUserPermissionChange) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4937,10 +4937,10 @@ func (m *ACLUserPermissionChange) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLUserPermissionChange: wiretype end group for non-group") + return fmt.Errorf("proto: AclUserPermissionChange: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLUserPermissionChange: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclUserPermissionChange: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4991,7 +4991,7 @@ func (m *ACLUserPermissionChange) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Permissions |= ACLUserPermissions(b&0x7F) << shift + m.Permissions |= AclUserPermissions(b&0x7F) << shift if b < 0x80 { break } @@ -5017,7 +5017,7 @@ func (m *ACLUserPermissionChange) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLSyncMessage) Unmarshal(dAtA []byte) error { +func (m *AclSyncMessage) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5040,10 +5040,10 @@ func (m *ACLSyncMessage) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLSyncMessage: wiretype end group for non-group") + return fmt.Errorf("proto: AclSyncMessage: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLSyncMessage: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclSyncMessage: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 2: @@ -5076,7 +5076,7 @@ func (m *ACLSyncMessage) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Content == nil { - m.Content = &ACLSyncContentValue{} + m.Content = &AclSyncContentValue{} } if err := m.Content.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5103,7 +5103,7 @@ func (m *ACLSyncMessage) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLSyncContentValue) Unmarshal(dAtA []byte) error { +func (m *AclSyncContentValue) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5126,10 +5126,10 @@ func (m *ACLSyncContentValue) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLSyncContentValue: wiretype end group for non-group") + return fmt.Errorf("proto: AclSyncContentValue: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLSyncContentValue: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclSyncContentValue: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5161,11 +5161,11 @@ func (m *ACLSyncContentValue) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &ACLAddRecords{} + v := &AclAddRecords{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Value = &ACLSyncContentValue_AddRecords{v} + m.Value = &AclSyncContentValue_AddRecords{v} iNdEx = postIndex default: iNdEx = preIndex @@ -5188,7 +5188,7 @@ func (m *ACLSyncContentValue) Unmarshal(dAtA []byte) error { } return nil } -func (m *ACLAddRecords) Unmarshal(dAtA []byte) error { +func (m *AclAddRecords) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5211,10 +5211,10 @@ func (m *ACLAddRecords) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ACLAddRecords: wiretype end group for non-group") + return fmt.Errorf("proto: AclAddRecords: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ACLAddRecords: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AclAddRecords: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5246,7 +5246,7 @@ func (m *ACLAddRecords) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Records = append(m.Records, &RawACLRecordWithId{}) + m.Records = append(m.Records, &RawAclRecordWithId{}) if err := m.Records[len(m.Records)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto b/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto index 2eff7074..56cc2c28 100644 --- a/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto +++ b/common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto @@ -2,19 +2,19 @@ syntax = "proto3"; package aclrecord; option go_package = "commonspace/object/acl/aclrecordproto"; -message RawACLRecord { +message RawAclRecord { bytes payload = 1; bytes signature = 2; bytes acceptorIdentity = 3; bytes acceptorSignature = 4; } -message RawACLRecordWithId { +message RawAclRecordWithId { bytes payload = 1; string id = 2; } -message ACLRecord { +message AclRecord { string prevId = 1; bytes identity = 2; bytes data = 3; @@ -22,7 +22,7 @@ message ACLRecord { int64 timestamp = 5; } -message ACLRoot { +message AclRoot { bytes identity = 1; bytes encryptionKey = 2; string spaceId = 3; @@ -32,47 +32,47 @@ message ACLRoot { int64 timestamp = 7; } -message ACLContentValue { +message AclContentValue { oneof value { - ACLUserAdd userAdd = 1; - ACLUserRemove userRemove = 2; - ACLUserPermissionChange userPermissionChange = 3; - ACLUserInvite userInvite = 4; - ACLUserJoin userJoin = 5; + AclUserAdd userAdd = 1; + AclUserRemove userRemove = 2; + AclUserPermissionChange userPermissionChange = 3; + AclUserInvite userInvite = 4; + AclUserJoin userJoin = 5; } } -message ACLData { - repeated ACLContentValue aclContent = 1; +message AclData { + repeated AclContentValue aclContent = 1; } -message ACLState { +message AclState { repeated uint64 readKeyHashes = 1; - repeated ACLUserState userStates = 2; - map invites = 3; + repeated AclUserState userStates = 2; + map invites = 3; } -message ACLUserState { +message AclUserState { bytes identity = 1; bytes encryptionKey = 2; - ACLUserPermissions permissions = 3; + AclUserPermissions permissions = 3; } -message ACLUserAdd { +message AclUserAdd { bytes identity = 1; bytes encryptionKey = 2; repeated bytes encryptedReadKeys = 3; - ACLUserPermissions permissions = 4; + AclUserPermissions permissions = 4; } -message ACLUserInvite { +message AclUserInvite { bytes acceptPublicKey = 1; uint64 encryptSymKeyHash = 2; repeated bytes encryptedReadKeys = 3; - ACLUserPermissions permissions = 4; + AclUserPermissions permissions = 4; } -message ACLUserJoin { +message AclUserJoin { bytes identity = 1; bytes encryptionKey = 2; bytes acceptSignature = 3; @@ -80,39 +80,39 @@ message ACLUserJoin { repeated bytes encryptedReadKeys = 5; } -message ACLUserRemove { +message AclUserRemove { bytes identity = 1; - repeated ACLReadKeyReplace readKeyReplaces = 2; + repeated AclReadKeyReplace readKeyReplaces = 2; } -message ACLReadKeyReplace { +message AclReadKeyReplace { bytes identity = 1; bytes encryptionKey = 2; bytes encryptedReadKey = 3; } -message ACLUserPermissionChange { +message AclUserPermissionChange { bytes identity = 1; - ACLUserPermissions permissions = 2; + AclUserPermissions permissions = 2; } -enum ACLUserPermissions { +enum AclUserPermissions { Admin = 0; Writer = 1; Reader = 2; } -message ACLSyncMessage { - ACLSyncContentValue content = 2; +message AclSyncMessage { + AclSyncContentValue content = 2; } -// ACLSyncContentValue provides different types for acl sync -message ACLSyncContentValue { +// AclSyncContentValue provides different types for acl sync +message AclSyncContentValue { oneof value { - ACLAddRecords addRecords = 1; + AclAddRecords addRecords = 1; } } -message ACLAddRecords { - repeated RawACLRecordWithId records = 1; +message AclAddRecords { + repeated RawAclRecordWithId records = 1; } \ No newline at end of file diff --git a/common/commonspace/object/acl/list/aclrecordbuilder.go b/common/commonspace/object/acl/list/aclrecordbuilder.go index cfd8cfac..28549ca7 100644 --- a/common/commonspace/object/acl/list/aclrecordbuilder.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder.go @@ -11,9 +11,9 @@ import ( ) // remove interface -type ACLRecordBuilder interface { - ConvertFromRaw(rawIdRecord *aclrecordproto.RawACLRecordWithId) (rec *ACLRecord, err error) - BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyBytes []byte, state *ACLState) (rec *aclrecordproto.RawACLRecord, err error) +type AclRecordBuilder interface { + ConvertFromRaw(rawIdRecord *aclrecordproto.RawAclRecordWithId) (rec *AclRecord, err error) + BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyBytes []byte, state *AclState) (rec *aclrecordproto.RawAclRecord, err error) } type aclRecordBuilder struct { @@ -21,14 +21,14 @@ type aclRecordBuilder struct { keychain *keychain.Keychain } -func newACLRecordBuilder(id string, keychain *keychain.Keychain) ACLRecordBuilder { +func newAclRecordBuilder(id string, keychain *keychain.Keychain) AclRecordBuilder { return &aclRecordBuilder{ id: id, keychain: keychain, } } -func (a *aclRecordBuilder) BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyBytes []byte, state *ACLState) (rec *aclrecordproto.RawACLRecord, err error) { +func (a *aclRecordBuilder) BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyBytes []byte, state *AclState) (rec *aclrecordproto.RawAclRecord, err error) { acceptPrivKey, err := signingkey.NewSigningEd25519PrivKeyFromBytes(acceptPrivKeyBytes) if err != nil { return @@ -69,21 +69,21 @@ func (a *aclRecordBuilder) BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyByt return } - userJoin := &aclrecordproto.ACLUserJoin{ + userJoin := &aclrecordproto.AclUserJoin{ Identity: state.Identity(), EncryptionKey: encPubKeyBytes, AcceptSignature: idSignature, AcceptPubKey: acceptPubKeyBytes, EncryptedReadKeys: symKeys, } - aclData := &aclrecordproto.ACLData{AclContent: []*aclrecordproto.ACLContentValue{ - {Value: &aclrecordproto.ACLContentValue_UserJoin{UserJoin: userJoin}}, + aclData := &aclrecordproto.AclData{AclContent: []*aclrecordproto.AclContentValue{ + {Value: &aclrecordproto.AclContentValue_UserJoin{UserJoin: userJoin}}, }} marshalledJoin, err := aclData.Marshal() if err != nil { return } - aclRecord := &aclrecordproto.ACLRecord{ + aclRecord := &aclrecordproto.AclRecord{ PrevId: state.LastRecordId(), Identity: state.Identity(), Data: marshalledJoin, @@ -98,28 +98,28 @@ func (a *aclRecordBuilder) BuildUserJoin(acceptPrivKeyBytes []byte, encSymKeyByt if err != nil { return } - rec = &aclrecordproto.RawACLRecord{ + rec = &aclrecordproto.RawAclRecord{ Payload: marshalledRecord, Signature: recSignature, } return } -func (a *aclRecordBuilder) ConvertFromRaw(rawIdRecord *aclrecordproto.RawACLRecordWithId) (rec *ACLRecord, err error) { - rawRec := &aclrecordproto.RawACLRecord{} +func (a *aclRecordBuilder) ConvertFromRaw(rawIdRecord *aclrecordproto.RawAclRecordWithId) (rec *AclRecord, err error) { + rawRec := &aclrecordproto.RawAclRecord{} err = proto.Unmarshal(rawIdRecord.Payload, rawRec) if err != nil { return } if rawIdRecord.Id == a.id { - aclRoot := &aclrecordproto.ACLRoot{} + aclRoot := &aclrecordproto.AclRoot{} err = proto.Unmarshal(rawRec.Payload, aclRoot) if err != nil { return } - rec = &ACLRecord{ + rec = &AclRecord{ Id: rawIdRecord.Id, CurrentReadKeyHash: aclRoot.CurrentReadKeyHash, Timestamp: aclRoot.Timestamp, @@ -128,13 +128,13 @@ func (a *aclRecordBuilder) ConvertFromRaw(rawIdRecord *aclrecordproto.RawACLReco Model: aclRoot, } } else { - aclRecord := &aclrecordproto.ACLRecord{} + aclRecord := &aclrecordproto.AclRecord{} err = proto.Unmarshal(rawRec.Payload, aclRecord) if err != nil { return } - rec = &ACLRecord{ + rec = &AclRecord{ Id: rawIdRecord.Id, PrevId: aclRecord.PrevId, CurrentReadKeyHash: aclRecord.CurrentReadKeyHash, @@ -151,8 +151,8 @@ func (a *aclRecordBuilder) ConvertFromRaw(rawIdRecord *aclrecordproto.RawACLReco func verifyRaw( keychain *keychain.Keychain, - rawRec *aclrecordproto.RawACLRecord, - recWithId *aclrecordproto.RawACLRecordWithId, + rawRec *aclrecordproto.RawAclRecord, + recWithId *aclrecordproto.RawAclRecordWithId, identity []byte) (err error) { identityKey, err := keychain.GetOrAdd(string(identity)) if err != nil { diff --git a/common/commonspace/object/acl/list/aclrecordbuilder_test.go b/common/commonspace/object/acl/list/aclrecordbuilder_test.go index 2094db82..8c7408e3 100644 --- a/common/commonspace/object/acl/list/aclrecordbuilder_test.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder_test.go @@ -15,7 +15,7 @@ func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { st, err := acllistbuilder2.NewListStorageWithTestName("userjoinexample.yml") require.NoError(t, err, "building storage should not result in error") - testKeychain := st.(*acllistbuilder2.ACLListStorageBuilder).GetKeychain() + testKeychain := st.(*acllistbuilder2.AclListStorageBuilder).GetKeychain() identity := testKeychain.GeneratedIdentities["D"] signPrivKey := testKeychain.SigningKeysByYAMLName["D"] encPrivKey := testKeychain.EncryptionKeysByYAMLName["D"] @@ -25,26 +25,26 @@ func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { EncKey: encPrivKey, } - aclList, err := BuildACLListWithIdentity(acc, st) + aclList, err := BuildAclListWithIdentity(acc, st) require.NoError(t, err, "building acl list should be without error") - recordBuilder := newACLRecordBuilder(aclList.ID(), keychain.NewKeychain()) + recordBuilder := newAclRecordBuilder(aclList.ID(), keychain.NewKeychain()) rk, err := testKeychain.GetKey("key.Read.EncKey").(*acllistbuilder2.SymKey).Key.Raw() require.NoError(t, err) privKey, err := testKeychain.GetKey("key.Sign.Onetime1").(signingkey.PrivKey).Raw() require.NoError(t, err) - userJoin, err := recordBuilder.BuildUserJoin(privKey, rk, aclList.ACLState()) + userJoin, err := recordBuilder.BuildUserJoin(privKey, rk, aclList.AclState()) require.NoError(t, err) marshalledJoin, err := userJoin.Marshal() require.NoError(t, err) id, err := cidutil.NewCIDFromBytes(marshalledJoin) require.NoError(t, err) - rawRec := &aclrecordproto.RawACLRecordWithId{ + rawRec := &aclrecordproto.RawAclRecordWithId{ Payload: marshalledJoin, Id: id, } res, err := aclList.AddRawRecord(rawRec) require.True(t, res) require.NoError(t, err) - require.Equal(t, aclrecordproto.ACLUserPermissions_Writer, aclList.ACLState().UserStates()[identity].Permissions) + require.Equal(t, aclrecordproto.AclUserPermissions_Writer, aclList.AclState().UserStates()[identity].Permissions) } diff --git a/common/commonspace/object/acl/list/aclstate.go b/common/commonspace/object/acl/list/aclstate.go index 527d829a..c38f0921 100644 --- a/common/commonspace/object/acl/list/aclstate.go +++ b/common/commonspace/object/acl/list/aclstate.go @@ -36,15 +36,15 @@ var ( type UserPermissionPair struct { Identity string - Permission aclrecordproto2.ACLUserPermissions + Permission aclrecordproto2.AclUserPermissions } -type ACLState struct { +type AclState struct { id string currentReadKeyHash uint64 userReadKeys map[uint64]*symmetric.Key - userStates map[string]*aclrecordproto2.ACLUserState - userInvites map[string]*aclrecordproto2.ACLUserInvite + userStates map[string]*aclrecordproto2.AclUserState + userInvites map[string]*aclrecordproto2.AclUserInvite encryptionKey encryptionkey.PrivKey signingKey signingkey.PrivKey totalReadKeys int @@ -56,41 +56,41 @@ type ACLState struct { keychain *keychain.Keychain } -func newACLStateWithKeys( +func newAclStateWithKeys( id string, signingKey signingkey.PrivKey, - encryptionKey encryptionkey.PrivKey) (*ACLState, error) { + encryptionKey encryptionkey.PrivKey) (*AclState, error) { identity, err := signingKey.GetPublic().Raw() if err != nil { return nil, err } - return &ACLState{ + return &AclState{ id: id, identity: string(identity), signingKey: signingKey, encryptionKey: encryptionKey, userReadKeys: make(map[uint64]*symmetric.Key), - userStates: make(map[string]*aclrecordproto2.ACLUserState), - userInvites: make(map[string]*aclrecordproto2.ACLUserInvite), + userStates: make(map[string]*aclrecordproto2.AclUserState), + userInvites: make(map[string]*aclrecordproto2.AclUserInvite), permissionsAtRecord: make(map[string][]UserPermissionPair), }, nil } -func newACLState(id string) *ACLState { - return &ACLState{ +func newAclState(id string) *AclState { + return &AclState{ id: id, userReadKeys: make(map[uint64]*symmetric.Key), - userStates: make(map[string]*aclrecordproto2.ACLUserState), - userInvites: make(map[string]*aclrecordproto2.ACLUserInvite), + userStates: make(map[string]*aclrecordproto2.AclUserState), + userInvites: make(map[string]*aclrecordproto2.AclUserInvite), permissionsAtRecord: make(map[string][]UserPermissionPair), } } -func (st *ACLState) CurrentReadKeyHash() uint64 { +func (st *AclState) CurrentReadKeyHash() uint64 { return st.currentReadKeyHash } -func (st *ACLState) CurrentReadKey() (*symmetric.Key, error) { +func (st *AclState) CurrentReadKey() (*symmetric.Key, error) { key, exists := st.userReadKeys[st.currentReadKeyHash] if !exists { return nil, ErrNoReadKey @@ -98,11 +98,11 @@ func (st *ACLState) CurrentReadKey() (*symmetric.Key, error) { return key, nil } -func (st *ACLState) UserReadKeys() map[uint64]*symmetric.Key { +func (st *AclState) UserReadKeys() map[uint64]*symmetric.Key { return st.userReadKeys } -func (st *ACLState) PermissionsAtRecord(id string, identity string) (UserPermissionPair, error) { +func (st *AclState) PermissionsAtRecord(id string, identity string) (UserPermissionPair, error) { permissions, ok := st.permissionsAtRecord[id] if !ok { log.Errorf("missing record at id %s", id) @@ -117,7 +117,7 @@ func (st *ACLState) PermissionsAtRecord(id string, identity string) (UserPermiss return UserPermissionPair{}, ErrNoSuchUser } -func (st *ACLState) applyRecord(record *ACLRecord) (err error) { +func (st *AclState) applyRecord(record *AclRecord) (err error) { defer func() { if err == nil { st.lastRecordId = record.Id @@ -128,7 +128,7 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } if record.Id == st.id { - root, ok := record.Model.(*aclrecordproto2.ACLRoot) + root, ok := record.Model.(*aclrecordproto2.AclRoot) if !ok { return ErrIncorrectRoot } @@ -137,14 +137,14 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } st.permissionsAtRecord[record.Id] = []UserPermissionPair{ - {Identity: string(root.Identity), Permission: aclrecordproto2.ACLUserPermissions_Admin}, + {Identity: string(root.Identity), Permission: aclrecordproto2.AclUserPermissions_Admin}, } return } - aclData := &aclrecordproto2.ACLData{} + aclData := &aclrecordproto2.AclData{} if record.Model != nil { - aclData = record.Model.(*aclrecordproto2.ACLData) + aclData = record.Model.(*aclrecordproto2.AclData) } else { err = proto.Unmarshal(record.Data, aclData) if err != nil { @@ -172,7 +172,7 @@ func (st *ACLState) applyRecord(record *ACLRecord) (err error) { return } -func (st *ACLState) applyRoot(root *aclrecordproto2.ACLRoot) (err error) { +func (st *AclState) applyRoot(root *aclrecordproto2.AclRoot) (err error) { if st.signingKey != nil && st.encryptionKey != nil && st.identity == string(root.Identity) { err = st.saveReadKeyFromRoot(root) if err != nil { @@ -181,10 +181,10 @@ func (st *ACLState) applyRoot(root *aclrecordproto2.ACLRoot) (err error) { } // adding user to the list - userState := &aclrecordproto2.ACLUserState{ + userState := &aclrecordproto2.AclUserState{ Identity: root.Identity, EncryptionKey: root.EncryptionKey, - Permissions: aclrecordproto2.ACLUserPermissions_Admin, + Permissions: aclrecordproto2.AclUserPermissions_Admin, } st.currentReadKeyHash = root.CurrentReadKeyHash st.userStates[string(root.Identity)] = userState @@ -192,7 +192,7 @@ func (st *ACLState) applyRoot(root *aclrecordproto2.ACLRoot) (err error) { return } -func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto2.ACLRoot) (err error) { +func (st *AclState) saveReadKeyFromRoot(root *aclrecordproto2.AclRoot) (err error) { var readKey *symmetric.Key if len(root.GetDerivationScheme()) != 0 { var encPrivKey []byte @@ -206,7 +206,7 @@ func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto2.ACLRoot) (err erro return } - readKey, err = aclrecordproto2.ACLReadKeyDerive(signPrivKey, encPrivKey) + readKey, err = aclrecordproto2.AclReadKeyDerive(signPrivKey, encPrivKey) if err != nil { return } @@ -230,7 +230,7 @@ func (st *ACLState) saveReadKeyFromRoot(root *aclrecordproto2.ACLRoot) (err erro return } -func (st *ACLState) applyChangeData(changeData *aclrecordproto2.ACLData, hash uint64, identity []byte) (err error) { +func (st *AclState) applyChangeData(changeData *aclrecordproto2.AclData, hash uint64, identity []byte) (err error) { defer func() { if err != nil { return @@ -248,7 +248,7 @@ func (st *ACLState) applyChangeData(changeData *aclrecordproto2.ACLData, hash ui return } - if !st.HasPermission(identity, aclrecordproto2.ACLUserPermissions_Admin) { + if !st.HasPermission(identity, aclrecordproto2.AclUserPermissions_Admin) { err = fmt.Errorf("user %s must have admin permissions", identity) return } @@ -264,7 +264,7 @@ func (st *ACLState) applyChangeData(changeData *aclrecordproto2.ACLData, hash ui return nil } -func (st *ACLState) applyChangeContent(ch *aclrecordproto2.ACLContentValue) error { +func (st *AclState) applyChangeContent(ch *aclrecordproto2.AclContentValue) error { switch { case ch.GetUserPermissionChange() != nil: return st.applyUserPermissionChange(ch.GetUserPermissionChange()) @@ -281,7 +281,7 @@ func (st *ACLState) applyChangeContent(ch *aclrecordproto2.ACLContentValue) erro } } -func (st *ACLState) applyUserPermissionChange(ch *aclrecordproto2.ACLUserPermissionChange) error { +func (st *AclState) applyUserPermissionChange(ch *aclrecordproto2.AclUserPermissionChange) error { chIdentity := string(ch.Identity) state, exists := st.userStates[chIdentity] if !exists { @@ -292,12 +292,12 @@ func (st *ACLState) applyUserPermissionChange(ch *aclrecordproto2.ACLUserPermiss return nil } -func (st *ACLState) applyUserInvite(ch *aclrecordproto2.ACLUserInvite) error { +func (st *AclState) applyUserInvite(ch *aclrecordproto2.AclUserInvite) error { st.userInvites[string(ch.AcceptPublicKey)] = ch return nil } -func (st *ACLState) applyUserJoin(ch *aclrecordproto2.ACLUserJoin) error { +func (st *AclState) applyUserJoin(ch *aclrecordproto2.AclUserJoin) error { invite, exists := st.userInvites[string(ch.AcceptPubKey)] if !exists { return fmt.Errorf("no such invite with such public key %s", keys.EncodeBytesToString(ch.AcceptPubKey)) @@ -336,7 +336,7 @@ func (st *ACLState) applyUserJoin(ch *aclrecordproto2.ACLUserJoin) error { } // adding user to the list - userState := &aclrecordproto2.ACLUserState{ + userState := &aclrecordproto2.AclUserState{ Identity: ch.Identity, EncryptionKey: ch.EncryptionKey, Permissions: invite.Permissions, @@ -345,13 +345,13 @@ func (st *ACLState) applyUserJoin(ch *aclrecordproto2.ACLUserJoin) error { return nil } -func (st *ACLState) applyUserAdd(ch *aclrecordproto2.ACLUserAdd) error { +func (st *AclState) applyUserAdd(ch *aclrecordproto2.AclUserAdd) error { chIdentity := string(ch.Identity) if _, exists := st.userStates[chIdentity]; exists { return ErrUserAlreadyExists } - st.userStates[chIdentity] = &aclrecordproto2.ACLUserState{ + st.userStates[chIdentity] = &aclrecordproto2.AclUserState{ Identity: ch.Identity, EncryptionKey: ch.EncryptionKey, Permissions: ch.Permissions, @@ -371,7 +371,7 @@ func (st *ACLState) applyUserAdd(ch *aclrecordproto2.ACLUserAdd) error { return nil } -func (st *ACLState) applyUserRemove(ch *aclrecordproto2.ACLUserRemove) error { +func (st *AclState) applyUserRemove(ch *aclrecordproto2.AclUserRemove) error { chIdentity := string(ch.Identity) if chIdentity == st.identity { return ErrDocumentForbidden @@ -399,7 +399,7 @@ func (st *ACLState) applyUserRemove(ch *aclrecordproto2.ACLUserRemove) error { return nil } -func (st *ACLState) decryptReadKeyAndHash(msg []byte) (*symmetric.Key, uint64, error) { +func (st *AclState) decryptReadKeyAndHash(msg []byte) (*symmetric.Key, uint64, error) { decrypted, err := st.encryptionKey.Decrypt(msg) if err != nil { return nil, 0, ErrFailedToDecrypt @@ -415,7 +415,7 @@ func (st *ACLState) decryptReadKeyAndHash(msg []byte) (*symmetric.Key, uint64, e return key, hasher.Sum64(), nil } -func (st *ACLState) HasPermission(identity []byte, permission aclrecordproto2.ACLUserPermissions) bool { +func (st *AclState) HasPermission(identity []byte, permission aclrecordproto2.AclUserPermissions) bool { state, exists := st.userStates[string(identity)] if !exists { return false @@ -424,22 +424,22 @@ func (st *ACLState) HasPermission(identity []byte, permission aclrecordproto2.AC return state.Permissions == permission } -func (st *ACLState) isUserJoin(data *aclrecordproto2.ACLData) bool { +func (st *AclState) isUserJoin(data *aclrecordproto2.AclData) bool { // if we have a UserJoin, then it should always be the first one applied return data.GetAclContent() != nil && data.GetAclContent()[0].GetUserJoin() != nil } -func (st *ACLState) isUserAdd(data *aclrecordproto2.ACLData, identity []byte) bool { +func (st *AclState) isUserAdd(data *aclrecordproto2.AclData, identity []byte) bool { // if we have a UserAdd, then it should always be the first one applied userAdd := data.GetAclContent()[0].GetUserAdd() return data.GetAclContent() != nil && userAdd != nil && bytes.Compare(userAdd.GetIdentity(), identity) == 0 } -func (st *ACLState) UserStates() map[string]*aclrecordproto2.ACLUserState { +func (st *AclState) UserStates() map[string]*aclrecordproto2.AclUserState { return st.userStates } -func (st *ACLState) Invite(acceptPubKey []byte) (invite *aclrecordproto2.ACLUserInvite, err error) { +func (st *AclState) Invite(acceptPubKey []byte) (invite *aclrecordproto2.AclUserInvite, err error) { invite, exists := st.userInvites[string(acceptPubKey)] if !exists { err = ErrNoSuchInvite @@ -451,14 +451,14 @@ func (st *ACLState) Invite(acceptPubKey []byte) (invite *aclrecordproto2.ACLUser return } -func (st *ACLState) UserKeys() (encKey encryptionkey.PrivKey, signKey signingkey.PrivKey) { +func (st *AclState) UserKeys() (encKey encryptionkey.PrivKey, signKey signingkey.PrivKey) { return st.encryptionKey, st.signingKey } -func (st *ACLState) Identity() []byte { +func (st *AclState) Identity() []byte { return []byte(st.identity) } -func (st *ACLState) LastRecordId() string { +func (st *AclState) LastRecordId() string { return st.lastRecordId } diff --git a/common/commonspace/object/acl/list/aclstatebuilder.go b/common/commonspace/object/acl/list/aclstatebuilder.go index d501ab1d..41603a44 100644 --- a/common/commonspace/object/acl/list/aclstatebuilder.go +++ b/common/commonspace/object/acl/list/aclstatebuilder.go @@ -12,14 +12,14 @@ type aclStateBuilder struct { id string } -func newACLStateBuilderWithIdentity(accountData *accountdata.AccountData) *aclStateBuilder { +func newAclStateBuilderWithIdentity(accountData *accountdata.AccountData) *aclStateBuilder { return &aclStateBuilder{ signPrivKey: accountData.SignKey, encPrivKey: accountData.EncKey, } } -func newACLStateBuilder() *aclStateBuilder { +func newAclStateBuilder() *aclStateBuilder { return &aclStateBuilder{} } @@ -27,14 +27,14 @@ func (sb *aclStateBuilder) Init(id string) { sb.id = id } -func (sb *aclStateBuilder) Build(records []*ACLRecord) (state *ACLState, err error) { +func (sb *aclStateBuilder) Build(records []*AclRecord) (state *AclState, err error) { if sb.encPrivKey != nil && sb.signPrivKey != nil { - state, err = newACLStateWithKeys(sb.id, sb.signPrivKey, sb.encPrivKey) + state, err = newAclStateWithKeys(sb.id, sb.signPrivKey, sb.encPrivKey) if err != nil { return } } else { - state = newACLState(sb.id) + state = newAclState(sb.id) } for _, rec := range records { err = state.applyRecord(rec) @@ -46,7 +46,7 @@ func (sb *aclStateBuilder) Build(records []*ACLRecord) (state *ACLState, err err return state, err } -func (sb *aclStateBuilder) Append(state *ACLState, records []*ACLRecord) (err error) { +func (sb *aclStateBuilder) Append(state *AclState, records []*AclRecord) (err error) { for _, rec := range records { err = state.applyRecord(rec) if err != nil { diff --git a/common/commonspace/object/acl/list/list.go b/common/commonspace/object/acl/list/list.go index e67ef2cd..dcbfeeed 100644 --- a/common/commonspace/object/acl/list/list.go +++ b/common/commonspace/object/acl/list/list.go @@ -1,4 +1,4 @@ -//go:generate mockgen -destination mock_list/mock_list.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list ACLList +//go:generate mockgen -destination mock_list/mock_list.go github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list AclList package list import ( @@ -12,7 +12,7 @@ import ( "sync" ) -type IterFunc = func(record *ACLRecord) (IsContinue bool) +type IterFunc = func(record *AclRecord) (IsContinue bool) var ErrIncorrectCID = errors.New("incorrect CID") @@ -22,48 +22,48 @@ type RWLocker interface { RUnlock() } -type ACLList interface { +type AclList interface { RWLocker ID() string - Root() *aclrecordproto.RawACLRecordWithId - Records() []*ACLRecord - ACLState() *ACLState + Root() *aclrecordproto.RawAclRecordWithId + Records() []*AclRecord + AclState() *AclState IsAfter(first string, second string) (bool, error) - Head() *ACLRecord - Get(id string) (*ACLRecord, error) + Head() *AclRecord + Get(id string) (*AclRecord, error) Iterate(iterFunc IterFunc) IterateFrom(startId string, iterFunc IterFunc) - AddRawRecord(rawRec *aclrecordproto.RawACLRecordWithId) (added bool, err error) + AddRawRecord(rawRec *aclrecordproto.RawAclRecordWithId) (added bool, err error) Close() (err error) } type aclList struct { - root *aclrecordproto.RawACLRecordWithId - records []*ACLRecord + root *aclrecordproto.RawAclRecordWithId + records []*AclRecord indexes map[string]int id string stateBuilder *aclStateBuilder - recordBuilder ACLRecordBuilder - aclState *ACLState + recordBuilder AclRecordBuilder + aclState *AclState keychain *keychain.Keychain storage liststorage.ListStorage sync.RWMutex } -func BuildACLListWithIdentity(acc *accountdata.AccountData, storage liststorage.ListStorage) (ACLList, error) { - builder := newACLStateBuilderWithIdentity(acc) - return build(storage.Id(), builder, newACLRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) +func BuildAclListWithIdentity(acc *accountdata.AccountData, storage liststorage.ListStorage) (AclList, error) { + builder := newAclStateBuilderWithIdentity(acc) + return build(storage.Id(), builder, newAclRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) } -func BuildACLList(storage liststorage.ListStorage) (ACLList, error) { - return build(storage.Id(), newACLStateBuilder(), newACLRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) +func BuildAclList(storage liststorage.ListStorage) (AclList, error) { + return build(storage.Id(), newAclStateBuilder(), newAclRecordBuilder(storage.Id(), keychain.NewKeychain()), storage) } -func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder, storage liststorage.ListStorage) (list ACLList, err error) { +func build(id string, stateBuilder *aclStateBuilder, recBuilder AclRecordBuilder, storage liststorage.ListStorage) (list AclList, err error) { head, err := storage.Head() if err != nil { return @@ -78,7 +78,7 @@ func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder if err != nil { return } - records := []*ACLRecord{record} + records := []*AclRecord{record} for record.PrevId != "" { rawRecordWithId, err = storage.GetRawRecord(context.Background(), record.PrevId) @@ -129,11 +129,11 @@ func build(id string, stateBuilder *aclStateBuilder, recBuilder ACLRecordBuilder return } -func (a *aclList) Records() []*ACLRecord { +func (a *aclList) Records() []*AclRecord { return a.records } -func (a *aclList) AddRawRecord(rawRec *aclrecordproto.RawACLRecordWithId) (added bool, err error) { +func (a *aclList) AddRawRecord(rawRec *aclrecordproto.RawAclRecordWithId) (added bool, err error) { if _, ok := a.indexes[rawRec.Id]; ok { return } @@ -155,7 +155,7 @@ func (a *aclList) AddRawRecord(rawRec *aclrecordproto.RawACLRecordWithId) (added return true, nil } -func (a *aclList) IsValidNext(rawRec *aclrecordproto.RawACLRecordWithId) (err error) { +func (a *aclList) IsValidNext(rawRec *aclrecordproto.RawAclRecordWithId) (err error) { _, err = a.recordBuilder.ConvertFromRaw(rawRec) if err != nil { return @@ -168,11 +168,11 @@ func (a *aclList) ID() string { return a.id } -func (a *aclList) Root() *aclrecordproto.RawACLRecordWithId { +func (a *aclList) Root() *aclrecordproto.RawAclRecordWithId { return a.root } -func (a *aclList) ACLState() *ACLState { +func (a *aclList) AclState() *AclState { return a.aclState } @@ -185,11 +185,11 @@ func (a *aclList) IsAfter(first string, second string) (bool, error) { return firstRec >= secondRec, nil } -func (a *aclList) Head() *ACLRecord { +func (a *aclList) Head() *AclRecord { return a.records[len(a.records)-1] } -func (a *aclList) Get(id string) (*ACLRecord, error) { +func (a *aclList) Get(id string) (*AclRecord, error) { recIdx, ok := a.indexes[id] if !ok { return nil, fmt.Errorf("no such record") diff --git a/common/commonspace/object/acl/list/list_test.go b/common/commonspace/object/acl/list/list_test.go index 79698db5..da50db03 100644 --- a/common/commonspace/object/acl/list/list_test.go +++ b/common/commonspace/object/acl/list/list_test.go @@ -8,13 +8,13 @@ import ( "testing" ) -func TestAclList_ACLState_UserInviteAndJoin(t *testing.T) { +func TestAclList_AclState_UserInviteAndJoin(t *testing.T) { st, err := acllistbuilder.NewListStorageWithTestName("userjoinexample.yml") require.NoError(t, err, "building storage should not result in error") - keychain := st.(*acllistbuilder.ACLListStorageBuilder).GetKeychain() + keychain := st.(*acllistbuilder.AclListStorageBuilder).GetKeychain() - aclList, err := BuildACLList(st) + aclList, err := BuildAclList(st) require.NoError(t, err, "building acl list should be without error") idA := keychain.GetIdentity("A") @@ -22,13 +22,13 @@ func TestAclList_ACLState_UserInviteAndJoin(t *testing.T) { idC := keychain.GetIdentity("C") // checking final state - assert.Equal(t, aclrecordproto.ACLUserPermissions_Admin, aclList.ACLState().UserStates()[idA].Permissions) - assert.Equal(t, aclrecordproto.ACLUserPermissions_Writer, aclList.ACLState().UserStates()[idB].Permissions) - assert.Equal(t, aclrecordproto.ACLUserPermissions_Reader, aclList.ACLState().UserStates()[idC].Permissions) - assert.Equal(t, aclList.Head().CurrentReadKeyHash, aclList.ACLState().CurrentReadKeyHash()) + assert.Equal(t, aclrecordproto.AclUserPermissions_Admin, aclList.AclState().UserStates()[idA].Permissions) + assert.Equal(t, aclrecordproto.AclUserPermissions_Writer, aclList.AclState().UserStates()[idB].Permissions) + assert.Equal(t, aclrecordproto.AclUserPermissions_Reader, aclList.AclState().UserStates()[idC].Permissions) + assert.Equal(t, aclList.Head().CurrentReadKeyHash, aclList.AclState().CurrentReadKeyHash()) - var records []*ACLRecord - aclList.Iterate(func(record *ACLRecord) (IsContinue bool) { + var records []*AclRecord + aclList.Iterate(func(record *AclRecord) (IsContinue bool) { records = append(records, record) return true }) @@ -36,24 +36,24 @@ func TestAclList_ACLState_UserInviteAndJoin(t *testing.T) { // checking permissions at specific records assert.Equal(t, 3, len(records)) - _, err = aclList.ACLState().PermissionsAtRecord(records[1].Id, idB) + _, err = aclList.AclState().PermissionsAtRecord(records[1].Id, idB) assert.Error(t, err, "B should have no permissions at record 1") - perm, err := aclList.ACLState().PermissionsAtRecord(records[2].Id, idB) + perm, err := aclList.AclState().PermissionsAtRecord(records[2].Id, idB) assert.NoError(t, err, "should have no error with permissions of B in the record 2") assert.Equal(t, UserPermissionPair{ Identity: idB, - Permission: aclrecordproto.ACLUserPermissions_Writer, + Permission: aclrecordproto.AclUserPermissions_Writer, }, perm) } -func TestAclList_ACLState_UserJoinAndRemove(t *testing.T) { +func TestAclList_AclState_UserJoinAndRemove(t *testing.T) { st, err := acllistbuilder.NewListStorageWithTestName("userremoveexample.yml") require.NoError(t, err, "building storage should not result in error") - keychain := st.(*acllistbuilder.ACLListStorageBuilder).GetKeychain() + keychain := st.(*acllistbuilder.AclListStorageBuilder).GetKeychain() - aclList, err := BuildACLList(st) + aclList, err := BuildAclList(st) require.NoError(t, err, "building acl list should be without error") idA := keychain.GetIdentity("A") @@ -61,15 +61,15 @@ func TestAclList_ACLState_UserJoinAndRemove(t *testing.T) { idC := keychain.GetIdentity("C") // checking final state - assert.Equal(t, aclrecordproto.ACLUserPermissions_Admin, aclList.ACLState().UserStates()[idA].Permissions) - assert.Equal(t, aclrecordproto.ACLUserPermissions_Reader, aclList.ACLState().UserStates()[idC].Permissions) - assert.Equal(t, aclList.Head().CurrentReadKeyHash, aclList.ACLState().CurrentReadKeyHash()) + assert.Equal(t, aclrecordproto.AclUserPermissions_Admin, aclList.AclState().UserStates()[idA].Permissions) + assert.Equal(t, aclrecordproto.AclUserPermissions_Reader, aclList.AclState().UserStates()[idC].Permissions) + assert.Equal(t, aclList.Head().CurrentReadKeyHash, aclList.AclState().CurrentReadKeyHash()) - _, exists := aclList.ACLState().UserStates()[idB] + _, exists := aclList.AclState().UserStates()[idB] assert.Equal(t, false, exists) - var records []*ACLRecord - aclList.Iterate(func(record *ACLRecord) (IsContinue bool) { + var records []*AclRecord + aclList.Iterate(func(record *AclRecord) (IsContinue bool) { records = append(records, record) return true }) @@ -77,15 +77,15 @@ func TestAclList_ACLState_UserJoinAndRemove(t *testing.T) { // checking permissions at specific records assert.Equal(t, 4, len(records)) - assert.NotEqual(t, records[2].CurrentReadKeyHash, aclList.ACLState().CurrentReadKeyHash()) + assert.NotEqual(t, records[2].CurrentReadKeyHash, aclList.AclState().CurrentReadKeyHash()) - perm, err := aclList.ACLState().PermissionsAtRecord(records[2].Id, idB) + perm, err := aclList.AclState().PermissionsAtRecord(records[2].Id, idB) assert.NoError(t, err, "should have no error with permissions of B in the record 2") assert.Equal(t, UserPermissionPair{ Identity: idB, - Permission: aclrecordproto.ACLUserPermissions_Writer, + Permission: aclrecordproto.AclUserPermissions_Writer, }, perm) - _, err = aclList.ACLState().PermissionsAtRecord(records[3].Id, idB) + _, err = aclList.AclState().PermissionsAtRecord(records[3].Id, idB) assert.Error(t, err, "B should have no permissions at record 3, because user should be removed") } diff --git a/common/commonspace/object/acl/list/mock_list/mock_list.go b/common/commonspace/object/acl/list/mock_list/mock_list.go index ef9d4551..5a5f57b9 100644 --- a/common/commonspace/object/acl/list/mock_list/mock_list.go +++ b/common/commonspace/object/acl/list/mock_list/mock_list.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list (interfaces: ACLList) +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/list (interfaces: AclList) // Package mock_list is a generated GoMock package. package mock_list @@ -12,45 +12,45 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockACLList is a mock of ACLList interface. -type MockACLList struct { +// MockAclList is a mock of AclList interface. +type MockAclList struct { ctrl *gomock.Controller - recorder *MockACLListMockRecorder + recorder *MockAclListMockRecorder } -// MockACLListMockRecorder is the mock recorder for MockACLList. -type MockACLListMockRecorder struct { - mock *MockACLList +// MockAclListMockRecorder is the mock recorder for MockAclList. +type MockAclListMockRecorder struct { + mock *MockAclList } -// NewMockACLList creates a new mock instance. -func NewMockACLList(ctrl *gomock.Controller) *MockACLList { - mock := &MockACLList{ctrl: ctrl} - mock.recorder = &MockACLListMockRecorder{mock} +// NewMockAclList creates a new mock instance. +func NewMockAclList(ctrl *gomock.Controller) *MockAclList { + mock := &MockAclList{ctrl: ctrl} + mock.recorder = &MockAclListMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockACLList) EXPECT() *MockACLListMockRecorder { +func (m *MockAclList) EXPECT() *MockAclListMockRecorder { return m.recorder } -// ACLState mocks base method. -func (m *MockACLList) ACLState() *list.ACLState { +// AclState mocks base method. +func (m *MockAclList) AclState() *list.AclState { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ACLState") - ret0, _ := ret[0].(*list.ACLState) + ret := m.ctrl.Call(m, "AclState") + ret0, _ := ret[0].(*list.AclState) return ret0 } -// ACLState indicates an expected call of ACLState. -func (mr *MockACLListMockRecorder) ACLState() *gomock.Call { +// AclState indicates an expected call of AclState. +func (mr *MockAclListMockRecorder) AclState() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ACLState", reflect.TypeOf((*MockACLList)(nil).ACLState)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AclState", reflect.TypeOf((*MockAclList)(nil).AclState)) } // AddRawRecord mocks base method. -func (m *MockACLList) AddRawRecord(arg0 *aclrecordproto.RawACLRecordWithId) (bool, error) { +func (m *MockAclList) AddRawRecord(arg0 *aclrecordproto.RawAclRecordWithId) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawRecord", arg0) ret0, _ := ret[0].(bool) @@ -59,13 +59,13 @@ func (m *MockACLList) AddRawRecord(arg0 *aclrecordproto.RawACLRecordWithId) (boo } // AddRawRecord indicates an expected call of AddRawRecord. -func (mr *MockACLListMockRecorder) AddRawRecord(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) AddRawRecord(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockACLList)(nil).AddRawRecord), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawRecord", reflect.TypeOf((*MockAclList)(nil).AddRawRecord), arg0) } // Close mocks base method. -func (m *MockACLList) Close() error { +func (m *MockAclList) Close() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Close") ret0, _ := ret[0].(error) @@ -73,42 +73,42 @@ func (m *MockACLList) Close() error { } // Close indicates an expected call of Close. -func (mr *MockACLListMockRecorder) Close() *gomock.Call { +func (mr *MockAclListMockRecorder) Close() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockACLList)(nil).Close)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockAclList)(nil).Close)) } // Get mocks base method. -func (m *MockACLList) Get(arg0 string) (*list.ACLRecord, error) { +func (m *MockAclList) Get(arg0 string) (*list.AclRecord, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Get", arg0) - ret0, _ := ret[0].(*list.ACLRecord) + ret0, _ := ret[0].(*list.AclRecord) ret1, _ := ret[1].(error) return ret0, ret1 } // Get indicates an expected call of Get. -func (mr *MockACLListMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) Get(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockACLList)(nil).Get), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockAclList)(nil).Get), arg0) } // Head mocks base method. -func (m *MockACLList) Head() *list.ACLRecord { +func (m *MockAclList) Head() *list.AclRecord { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Head") - ret0, _ := ret[0].(*list.ACLRecord) + ret0, _ := ret[0].(*list.AclRecord) return ret0 } // Head indicates an expected call of Head. -func (mr *MockACLListMockRecorder) Head() *gomock.Call { +func (mr *MockAclListMockRecorder) Head() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Head", reflect.TypeOf((*MockACLList)(nil).Head)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Head", reflect.TypeOf((*MockAclList)(nil).Head)) } // ID mocks base method. -func (m *MockACLList) ID() string { +func (m *MockAclList) ID() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ID") ret0, _ := ret[0].(string) @@ -116,13 +116,13 @@ func (m *MockACLList) ID() string { } // ID indicates an expected call of ID. -func (mr *MockACLListMockRecorder) ID() *gomock.Call { +func (mr *MockAclListMockRecorder) ID() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockACLList)(nil).ID)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockAclList)(nil).ID)) } // IsAfter mocks base method. -func (m *MockACLList) IsAfter(arg0, arg1 string) (bool, error) { +func (m *MockAclList) IsAfter(arg0, arg1 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsAfter", arg0, arg1) ret0, _ := ret[0].(bool) @@ -131,107 +131,107 @@ func (m *MockACLList) IsAfter(arg0, arg1 string) (bool, error) { } // IsAfter indicates an expected call of IsAfter. -func (mr *MockACLListMockRecorder) IsAfter(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) IsAfter(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAfter", reflect.TypeOf((*MockACLList)(nil).IsAfter), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsAfter", reflect.TypeOf((*MockAclList)(nil).IsAfter), arg0, arg1) } // Iterate mocks base method. -func (m *MockACLList) Iterate(arg0 func(*list.ACLRecord) bool) { +func (m *MockAclList) Iterate(arg0 func(*list.AclRecord) bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "Iterate", arg0) } // Iterate indicates an expected call of Iterate. -func (mr *MockACLListMockRecorder) Iterate(arg0 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) Iterate(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockACLList)(nil).Iterate), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Iterate", reflect.TypeOf((*MockAclList)(nil).Iterate), arg0) } // IterateFrom mocks base method. -func (m *MockACLList) IterateFrom(arg0 string, arg1 func(*list.ACLRecord) bool) { +func (m *MockAclList) IterateFrom(arg0 string, arg1 func(*list.AclRecord) bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "IterateFrom", arg0, arg1) } // IterateFrom indicates an expected call of IterateFrom. -func (mr *MockACLListMockRecorder) IterateFrom(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockAclListMockRecorder) IterateFrom(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockACLList)(nil).IterateFrom), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockAclList)(nil).IterateFrom), arg0, arg1) } // Lock mocks base method. -func (m *MockACLList) Lock() { +func (m *MockAclList) Lock() { m.ctrl.T.Helper() m.ctrl.Call(m, "Lock") } // Lock indicates an expected call of Lock. -func (mr *MockACLListMockRecorder) Lock() *gomock.Call { +func (mr *MockAclListMockRecorder) Lock() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Lock", reflect.TypeOf((*MockACLList)(nil).Lock)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Lock", reflect.TypeOf((*MockAclList)(nil).Lock)) } // RLock mocks base method. -func (m *MockACLList) RLock() { +func (m *MockAclList) RLock() { m.ctrl.T.Helper() m.ctrl.Call(m, "RLock") } // RLock indicates an expected call of RLock. -func (mr *MockACLListMockRecorder) RLock() *gomock.Call { +func (mr *MockAclListMockRecorder) RLock() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RLock", reflect.TypeOf((*MockACLList)(nil).RLock)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RLock", reflect.TypeOf((*MockAclList)(nil).RLock)) } // RUnlock mocks base method. -func (m *MockACLList) RUnlock() { +func (m *MockAclList) RUnlock() { m.ctrl.T.Helper() m.ctrl.Call(m, "RUnlock") } // RUnlock indicates an expected call of RUnlock. -func (mr *MockACLListMockRecorder) RUnlock() *gomock.Call { +func (mr *MockAclListMockRecorder) RUnlock() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RUnlock", reflect.TypeOf((*MockACLList)(nil).RUnlock)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RUnlock", reflect.TypeOf((*MockAclList)(nil).RUnlock)) } // Records mocks base method. -func (m *MockACLList) Records() []*list.ACLRecord { +func (m *MockAclList) Records() []*list.AclRecord { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Records") - ret0, _ := ret[0].([]*list.ACLRecord) + ret0, _ := ret[0].([]*list.AclRecord) return ret0 } // Records indicates an expected call of Records. -func (mr *MockACLListMockRecorder) Records() *gomock.Call { +func (mr *MockAclListMockRecorder) Records() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Records", reflect.TypeOf((*MockACLList)(nil).Records)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Records", reflect.TypeOf((*MockAclList)(nil).Records)) } // Root mocks base method. -func (m *MockACLList) Root() *aclrecordproto.RawACLRecordWithId { +func (m *MockAclList) Root() *aclrecordproto.RawAclRecordWithId { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Root") - ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret0, _ := ret[0].(*aclrecordproto.RawAclRecordWithId) return ret0 } // Root indicates an expected call of Root. -func (mr *MockACLListMockRecorder) Root() *gomock.Call { +func (mr *MockAclListMockRecorder) Root() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Root", reflect.TypeOf((*MockACLList)(nil).Root)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Root", reflect.TypeOf((*MockAclList)(nil).Root)) } // Unlock mocks base method. -func (m *MockACLList) Unlock() { +func (m *MockAclList) Unlock() { m.ctrl.T.Helper() m.ctrl.Call(m, "Unlock") } // Unlock indicates an expected call of Unlock. -func (mr *MockACLListMockRecorder) Unlock() *gomock.Call { +func (mr *MockAclListMockRecorder) Unlock() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockACLList)(nil).Unlock)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockAclList)(nil).Unlock)) } diff --git a/common/commonspace/object/acl/list/record.go b/common/commonspace/object/acl/list/record.go index abb37736..b6ad5391 100644 --- a/common/commonspace/object/acl/list/record.go +++ b/common/commonspace/object/acl/list/record.go @@ -1,6 +1,6 @@ package list -type ACLRecord struct { +type AclRecord struct { Id string PrevId string CurrentReadKeyHash uint64 diff --git a/common/commonspace/object/acl/liststorage/inmemory.go b/common/commonspace/object/acl/liststorage/inmemory.go index a0efa1ba..ab896479 100644 --- a/common/commonspace/object/acl/liststorage/inmemory.go +++ b/common/commonspace/object/acl/liststorage/inmemory.go @@ -7,27 +7,27 @@ import ( "sync" ) -type inMemoryACLListStorage struct { +type inMemoryAclListStorage struct { id string - root *aclrecordproto.RawACLRecordWithId + root *aclrecordproto.RawAclRecordWithId head string - records map[string]*aclrecordproto.RawACLRecordWithId + records map[string]*aclrecordproto.RawAclRecordWithId sync.RWMutex } -func NewInMemoryACLListStorage( +func NewInMemoryAclListStorage( id string, - records []*aclrecordproto.RawACLRecordWithId) (ListStorage, error) { + records []*aclrecordproto.RawAclRecordWithId) (ListStorage, error) { - allRecords := make(map[string]*aclrecordproto.RawACLRecordWithId) + allRecords := make(map[string]*aclrecordproto.RawAclRecordWithId) for _, ch := range records { allRecords[ch.Id] = ch } root := records[0] head := records[len(records)-1] - return &inMemoryACLListStorage{ + return &inMemoryAclListStorage{ id: root.Id, root: root, head: head.Id, @@ -35,32 +35,32 @@ func NewInMemoryACLListStorage( }, nil } -func (t *inMemoryACLListStorage) Id() string { +func (t *inMemoryAclListStorage) Id() string { t.RLock() defer t.RUnlock() return t.id } -func (t *inMemoryACLListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { +func (t *inMemoryAclListStorage) Root() (*aclrecordproto.RawAclRecordWithId, error) { t.RLock() defer t.RUnlock() return t.root, nil } -func (t *inMemoryACLListStorage) Head() (string, error) { +func (t *inMemoryAclListStorage) Head() (string, error) { t.RLock() defer t.RUnlock() return t.head, nil } -func (t *inMemoryACLListStorage) SetHead(head string) error { +func (t *inMemoryAclListStorage) SetHead(head string) error { t.Lock() defer t.Unlock() t.head = head return nil } -func (t *inMemoryACLListStorage) AddRawRecord(ctx context.Context, record *aclrecordproto.RawACLRecordWithId) error { +func (t *inMemoryAclListStorage) AddRawRecord(ctx context.Context, record *aclrecordproto.RawAclRecordWithId) error { t.Lock() defer t.Unlock() // TODO: better to do deep copy @@ -68,7 +68,7 @@ func (t *inMemoryACLListStorage) AddRawRecord(ctx context.Context, record *aclre return nil } -func (t *inMemoryACLListStorage) GetRawRecord(ctx context.Context, recordId string) (*aclrecordproto.RawACLRecordWithId, error) { +func (t *inMemoryAclListStorage) GetRawRecord(ctx context.Context, recordId string) (*aclrecordproto.RawAclRecordWithId, error) { t.RLock() defer t.RUnlock() if res, exists := t.records[recordId]; exists { diff --git a/common/commonspace/object/acl/liststorage/liststorage.go b/common/commonspace/object/acl/liststorage/liststorage.go index abc14cbd..59ea13c1 100644 --- a/common/commonspace/object/acl/liststorage/liststorage.go +++ b/common/commonspace/object/acl/liststorage/liststorage.go @@ -8,17 +8,17 @@ import ( ) var ( - ErrUnknownACLId = errors.New("acl does not exist") - ErrACLExists = errors.New("acl already exists") + ErrUnknownAclId = errors.New("acl does not exist") + ErrAclExists = errors.New("acl already exists") ErrUnknownRecord = errors.New("record doesn't exist") ) type ListStorage interface { Id() string - Root() (*aclrecordproto.RawACLRecordWithId, error) + Root() (*aclrecordproto.RawAclRecordWithId, error) Head() (string, error) SetHead(headId string) error - GetRawRecord(ctx context.Context, id string) (*aclrecordproto.RawACLRecordWithId, error) - AddRawRecord(ctx context.Context, rec *aclrecordproto.RawACLRecordWithId) error + GetRawRecord(ctx context.Context, id string) (*aclrecordproto.RawAclRecordWithId, error) + AddRawRecord(ctx context.Context, rec *aclrecordproto.RawAclRecordWithId) error } diff --git a/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go b/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go index 6000454e..214ad01c 100644 --- a/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go +++ b/common/commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go @@ -36,7 +36,7 @@ func (m *MockListStorage) EXPECT() *MockListStorageMockRecorder { } // AddRawRecord mocks base method. -func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *aclrecordproto.RawACLRecordWithId) error { +func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *aclrecordproto.RawAclRecordWithId) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawRecord", arg0, arg1) ret0, _ := ret[0].(error) @@ -50,10 +50,10 @@ func (mr *MockListStorageMockRecorder) AddRawRecord(arg0, arg1 interface{}) *gom } // GetRawRecord mocks base method. -func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*aclrecordproto.RawACLRecordWithId, error) { +func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*aclrecordproto.RawAclRecordWithId, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetRawRecord", arg0, arg1) - ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret0, _ := ret[0].(*aclrecordproto.RawAclRecordWithId) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -94,10 +94,10 @@ func (mr *MockListStorageMockRecorder) Id() *gomock.Call { } // Root mocks base method. -func (m *MockListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { +func (m *MockListStorage) Root() (*aclrecordproto.RawAclRecordWithId, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Root") - ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret0, _ := ret[0].(*aclrecordproto.RawAclRecordWithId) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/common/commonspace/object/acl/syncacl/syncacl.go b/common/commonspace/object/acl/syncacl/syncacl.go index cc84fdb7..89e17871 100644 --- a/common/commonspace/object/acl/syncacl/syncacl.go +++ b/common/commonspace/object/acl/syncacl/syncacl.go @@ -6,15 +6,15 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" ) -type SyncACL struct { - list.ACLList +type SyncAcl struct { + list.AclList synchandler.SyncHandler streamPool objectsync.StreamPool } -func NewSyncACL(aclList list.ACLList, streamPool objectsync.StreamPool) *SyncACL { - return &SyncACL{ - ACLList: aclList, +func NewSyncAcl(aclList list.AclList, streamPool objectsync.StreamPool) *SyncAcl { + return &SyncAcl{ + AclList: aclList, SyncHandler: nil, streamPool: streamPool, } diff --git a/common/commonspace/object/acl/syncacl/syncaclhandler.go b/common/commonspace/object/acl/syncacl/syncaclhandler.go index 8aa70722..13c31bd8 100644 --- a/common/commonspace/object/acl/syncacl/syncaclhandler.go +++ b/common/commonspace/object/acl/syncacl/syncaclhandler.go @@ -9,11 +9,11 @@ import ( ) type syncAclHandler struct { - acl list.ACLList + acl list.AclList } func (s *syncAclHandler) HandleMessage(ctx context.Context, senderId string, req *spacesyncproto.ObjectSyncMessage) (err error) { - aclMsg := &aclrecordproto.ACLSyncMessage{} + aclMsg := &aclrecordproto.AclSyncMessage{} if err = aclMsg.Unmarshal(req.Payload); err != nil { return } @@ -26,6 +26,6 @@ func (s *syncAclHandler) HandleMessage(ctx context.Context, senderId string, req } } -func (s *syncAclHandler) handleAddRecords(ctx context.Context, senderId string, addRecord *aclrecordproto.ACLAddRecords) (err error) { +func (s *syncAclHandler) handleAddRecords(ctx context.Context, senderId string, addRecord *aclrecordproto.AclAddRecords) (err error) { return } diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go b/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go index ba129ace..dd513509 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/keychain.go @@ -121,7 +121,7 @@ func (k *YAMLKeychain) AddReadKey(key *Key) { } else if key.Value == "derived" { signKey, _ := k.SigningKeysByYAMLName[key.Name].Raw() encKey, _ := k.EncryptionKeysByYAMLName[key.Name].Raw() - rkey, err = aclrecordproto.ACLReadKeyDerive(signKey, encKey) + rkey, err = aclrecordproto.AclReadKeyDerive(signKey, encKey) if err != nil { panic("should be able to derive symmetric key") } diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go index 4a8b0620..b3f050aa 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go @@ -18,23 +18,23 @@ import ( "gopkg.in/yaml.v3" ) -type ACLListStorageBuilder struct { +type AclListStorageBuilder struct { liststorage.ListStorage keychain *YAMLKeychain } -func NewACLListStorageBuilder(keychain *YAMLKeychain) *ACLListStorageBuilder { - return &ACLListStorageBuilder{ +func NewAclListStorageBuilder(keychain *YAMLKeychain) *AclListStorageBuilder { + return &AclListStorageBuilder{ keychain: keychain, } } func NewListStorageWithTestName(name string) (liststorage.ListStorage, error) { filePath := path.Join(yamltests.Path(), name) - return NewACLListStorageBuilderFromFile(filePath) + return NewAclListStorageBuilderFromFile(filePath) } -func NewACLListStorageBuilderFromFile(file string) (*ACLListStorageBuilder, error) { +func NewAclListStorageBuilderFromFile(file string) (*AclListStorageBuilder, error) { content, err := ioutil.ReadFile(file) if err != nil { return nil, err @@ -46,13 +46,13 @@ func NewACLListStorageBuilderFromFile(file string) (*ACLListStorageBuilder, erro return nil, err } - tb := NewACLListStorageBuilder(NewKeychain()) + tb := NewAclListStorageBuilder(NewKeychain()) tb.Parse(&ymlTree) return tb, nil } -func (t *ACLListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) *aclrecordproto.RawACLRecordWithId { +func (t *AclListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) *aclrecordproto.RawAclRecordWithId { protoMarshalled, err := rec.Marshal() if err != nil { panic("should be able to marshal final acl message!") @@ -63,7 +63,7 @@ func (t *ACLListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) panic("should be able to sign final acl message!") } - rawRec := &aclrecordproto.RawACLRecord{ + rawRec := &aclrecordproto.RawAclRecord{ Payload: protoMarshalled, Signature: signature, } @@ -75,24 +75,24 @@ func (t *ACLListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) id, _ := cidutil.NewCIDFromBytes(rawMarshalled) - return &aclrecordproto.RawACLRecordWithId{ + return &aclrecordproto.RawAclRecordWithId{ Payload: rawMarshalled, Id: id, } } -func (t *ACLListStorageBuilder) GetKeychain() *YAMLKeychain { +func (t *AclListStorageBuilder) GetKeychain() *YAMLKeychain { return t.keychain } -func (t *ACLListStorageBuilder) Parse(l *YMLList) { +func (t *AclListStorageBuilder) Parse(l *YMLList) { // Just to clarify - we are generating new identities for the ones that // are specified in the yml file, because our identities should be Ed25519 // the same thing is happening for the encryption keys t.keychain.ParseKeys(&l.Keys) rawRoot := t.parseRoot(l.Root) var err error - t.ListStorage, err = liststorage.NewInMemoryACLListStorage(rawRoot.Id, []*aclrecordproto.RawACLRecordWithId{rawRoot}) + t.ListStorage, err = liststorage.NewInMemoryAclListStorage(rawRoot.Id, []*aclrecordproto.RawAclRecordWithId{rawRoot}) if err != nil { panic(err) } @@ -109,19 +109,19 @@ func (t *ACLListStorageBuilder) Parse(l *YMLList) { t.SetHead(prevId) } -func (t *ACLListStorageBuilder) parseRecord(rec *Record, prevId string) *aclrecordproto.ACLRecord { +func (t *AclListStorageBuilder) parseRecord(rec *Record, prevId string) *aclrecordproto.AclRecord { k := t.keychain.GetKey(rec.ReadKey).(*SymKey) - var aclChangeContents []*aclrecordproto.ACLContentValue + var aclChangeContents []*aclrecordproto.AclContentValue for _, ch := range rec.AclChanges { - aclChangeContent := t.parseACLChange(ch) + aclChangeContent := t.parseAclChange(ch) aclChangeContents = append(aclChangeContents, aclChangeContent) } - data := &aclrecordproto.ACLData{ + data := &aclrecordproto.AclData{ AclContent: aclChangeContents, } bytes, _ := data.Marshal() - return &aclrecordproto.ACLRecord{ + return &aclrecordproto.AclRecord{ PrevId: prevId, Identity: []byte(t.keychain.GetIdentity(rec.Identity)), Data: bytes, @@ -130,7 +130,7 @@ func (t *ACLListStorageBuilder) parseRecord(rec *Record, prevId string) *aclreco } } -func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecordproto.ACLContentValue) { +func (t *AclListStorageBuilder) parseAclChange(ch *AclChange) (convCh *aclrecordproto.AclContentValue) { switch { case ch.UserAdd != nil: add := ch.UserAdd @@ -138,9 +138,9 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord encKey := t.keychain.GetKey(add.EncryptionKey).(encryptionkey.PrivKey) rawKey, _ := encKey.GetPublic().Raw() - convCh = &aclrecordproto.ACLContentValue{ - Value: &aclrecordproto.ACLContentValue_UserAdd{ - UserAdd: &aclrecordproto.ACLUserAdd{ + convCh = &aclrecordproto.AclContentValue{ + Value: &aclrecordproto.AclContentValue_UserAdd{ + UserAdd: &aclrecordproto.AclUserAdd{ Identity: []byte(t.keychain.GetIdentity(add.Identity)), EncryptionKey: rawKey, EncryptedReadKeys: t.encryptReadKeysWithPubKey(add.EncryptedReadKeys, encKey), @@ -162,9 +162,9 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord } acceptPubKey, _ := signKey.GetPublic().Raw() - convCh = &aclrecordproto.ACLContentValue{ - Value: &aclrecordproto.ACLContentValue_UserJoin{ - UserJoin: &aclrecordproto.ACLUserJoin{ + convCh = &aclrecordproto.AclContentValue{ + Value: &aclrecordproto.AclContentValue_UserJoin{ + UserJoin: &aclrecordproto.AclUserJoin{ Identity: []byte(t.keychain.GetIdentity(join.Identity)), EncryptionKey: rawKey, AcceptSignature: signature, @@ -179,9 +179,9 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord hash := t.keychain.GetKey(invite.EncryptionKey).(*SymKey).Hash encKey := t.keychain.ReadKeysByHash[hash] - convCh = &aclrecordproto.ACLContentValue{ - Value: &aclrecordproto.ACLContentValue_UserInvite{ - UserInvite: &aclrecordproto.ACLUserInvite{ + convCh = &aclrecordproto.AclContentValue{ + Value: &aclrecordproto.AclContentValue_UserInvite{ + UserInvite: &aclrecordproto.AclUserInvite{ AcceptPublicKey: rawAcceptKey, EncryptSymKeyHash: hash, EncryptedReadKeys: t.encryptReadKeysWithSymKey(invite.EncryptedReadKeys, encKey.Key), @@ -192,9 +192,9 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord case ch.UserPermissionChange != nil: permissionChange := ch.UserPermissionChange - convCh = &aclrecordproto.ACLContentValue{ - Value: &aclrecordproto.ACLContentValue_UserPermissionChange{ - UserPermissionChange: &aclrecordproto.ACLUserPermissionChange{ + convCh = &aclrecordproto.AclContentValue{ + Value: &aclrecordproto.AclContentValue_UserPermissionChange{ + UserPermissionChange: &aclrecordproto.AclUserPermissionChange{ Identity: []byte(t.keychain.GetIdentity(permissionChange.Identity)), Permissions: t.convertPermission(permissionChange.Permission), }, @@ -205,7 +205,7 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord newReadKey := t.keychain.GetKey(remove.NewReadKey).(*SymKey) - var replaces []*aclrecordproto.ACLReadKeyReplace + var replaces []*aclrecordproto.AclReadKeyReplace for _, id := range remove.IdentitiesLeft { encKey := t.keychain.EncryptionKeysByYAMLName[id] rawEncKey, _ := encKey.GetPublic().Raw() @@ -213,16 +213,16 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord if err != nil { panic(err) } - replaces = append(replaces, &aclrecordproto.ACLReadKeyReplace{ + replaces = append(replaces, &aclrecordproto.AclReadKeyReplace{ Identity: []byte(t.keychain.GetIdentity(id)), EncryptionKey: rawEncKey, EncryptedReadKey: encReadKey, }) } - convCh = &aclrecordproto.ACLContentValue{ - Value: &aclrecordproto.ACLContentValue_UserRemove{ - UserRemove: &aclrecordproto.ACLUserRemove{ + convCh = &aclrecordproto.AclContentValue{ + Value: &aclrecordproto.AclContentValue_UserRemove{ + UserRemove: &aclrecordproto.AclUserRemove{ Identity: []byte(t.keychain.GetIdentity(remove.RemovedIdentity)), ReadKeyReplaces: replaces, }, @@ -236,7 +236,7 @@ func (t *ACLListStorageBuilder) parseACLChange(ch *ACLChange) (convCh *aclrecord return convCh } -func (t *ACLListStorageBuilder) encryptReadKeysWithPubKey(keys []string, encKey encryptionkey.PrivKey) (enc [][]byte) { +func (t *AclListStorageBuilder) encryptReadKeysWithPubKey(keys []string, encKey encryptionkey.PrivKey) (enc [][]byte) { for _, k := range keys { realKey := t.keychain.GetKey(k).(*SymKey).Key.Bytes() res, err := encKey.GetPublic().Encrypt(realKey) @@ -249,7 +249,7 @@ func (t *ACLListStorageBuilder) encryptReadKeysWithPubKey(keys []string, encKey return } -func (t *ACLListStorageBuilder) encryptReadKeysWithSymKey(keys []string, key *symmetric.Key) (enc [][]byte) { +func (t *AclListStorageBuilder) encryptReadKeysWithSymKey(keys []string, key *symmetric.Key) (enc [][]byte) { for _, k := range keys { realKey := t.keychain.GetKey(k).(*SymKey).Key.Bytes() res, err := key.Encrypt(realKey) @@ -262,28 +262,28 @@ func (t *ACLListStorageBuilder) encryptReadKeysWithSymKey(keys []string, key *sy return } -func (t *ACLListStorageBuilder) convertPermission(perm string) aclrecordproto.ACLUserPermissions { +func (t *AclListStorageBuilder) convertPermission(perm string) aclrecordproto.AclUserPermissions { switch perm { case "admin": - return aclrecordproto.ACLUserPermissions_Admin + return aclrecordproto.AclUserPermissions_Admin case "writer": - return aclrecordproto.ACLUserPermissions_Writer + return aclrecordproto.AclUserPermissions_Writer case "reader": - return aclrecordproto.ACLUserPermissions_Reader + return aclrecordproto.AclUserPermissions_Reader default: panic(fmt.Sprintf("incorrect permission: %s", perm)) } } -func (t *ACLListStorageBuilder) traverseFromHead(f func(rec *aclrecordproto.ACLRecord, id string) error) (err error) { +func (t *AclListStorageBuilder) traverseFromHead(f func(rec *aclrecordproto.AclRecord, id string) error) (err error) { panic("this was removed, add if needed") } -func (t *ACLListStorageBuilder) parseRoot(root *Root) (rawRoot *aclrecordproto.RawACLRecordWithId) { +func (t *AclListStorageBuilder) parseRoot(root *Root) (rawRoot *aclrecordproto.RawAclRecordWithId) { rawSignKey, _ := t.keychain.SigningKeysByYAMLName[root.Identity].GetPublic().Raw() rawEncKey, _ := t.keychain.EncryptionKeysByYAMLName[root.Identity].GetPublic().Raw() readKey := t.keychain.ReadKeysByYAMLName[root.Identity] - aclRoot := &aclrecordproto.ACLRoot{ + aclRoot := &aclrecordproto.AclRoot{ Identity: rawSignKey, EncryptionKey: rawEncKey, SpaceId: root.SpaceId, diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go index ae4f1027..75b72f3b 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph.go @@ -6,6 +6,6 @@ package acllistbuilder import "fmt" -func (t *ACLListStorageBuilder) Graph() (string, error) { +func (t *AclListStorageBuilder) Graph() (string, error) { return "", fmt.Errorf("building graphs is not supported") } diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go index 2185b4f2..81505e7f 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuildergraph_nix.go @@ -25,18 +25,18 @@ type EdgeParameters struct { label string } -func (t *ACLListStorageBuilder) Graph() (string, error) { +func (t *AclListStorageBuilder) Graph() (string, error) { // TODO: check updates on https://github.com/goccy/go-graphviz/issues/52 or make a fix yourself to use better library here graph := gographviz.NewGraph() graph.SetName("G") graph.SetDir(true) var nodes = make(map[string]struct{}) - var addNodes = func(r *aclrecordproto.ACLRecord, id string) error { + var addNodes = func(r *aclrecordproto.AclRecord, id string) error { style := "solid" var chSymbs []string - aclData := &aclrecordproto.ACLData{} + aclData := &aclrecordproto.AclData{} err := proto.Unmarshal(r.GetData(), aclData) if err != nil { return err @@ -44,7 +44,7 @@ func (t *ACLListStorageBuilder) Graph() (string, error) { for _, chc := range aclData.AclContent { tp := fmt.Sprintf("%T", chc.Value) - tp = strings.Replace(tp, "ACLChangeACLContentValueValueOf", "", 1) + tp = strings.Replace(tp, "AclChangeAclContentValueValueOf", "", 1) res := "" for _, ts := range tp { if unicode.IsUpper(ts) { @@ -91,7 +91,7 @@ func (t *ACLListStorageBuilder) Graph() (string, error) { return nil } - var addLinks = func(r *aclrecordproto.ACLRecord, id string) error { + var addLinks = func(r *aclrecordproto.AclRecord, id string) error { if r.PrevId == "" { return nil } diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go b/common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go index ccdfd295..c50f0e30 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/ymlentities.go @@ -12,7 +12,7 @@ type Keys struct { Read []*Key `yaml:"Read"` } -type ACLChange struct { +type AclChange struct { UserAdd *struct { Identity string `yaml:"identity"` EncryptionKey string `yaml:"encryptionKey"` @@ -48,7 +48,7 @@ type ACLChange struct { type Record struct { Identity string `yaml:"identity"` - AclChanges []*ACLChange `yaml:"aclChanges"` + AclChanges []*AclChange `yaml:"aclChanges"` ReadKey string `yaml:"readKey"` } diff --git a/common/commonspace/object/tree/objecttree/changevalidator.go b/common/commonspace/object/tree/objecttree/changevalidator.go index 7aaa5a7e..f3d59fa6 100644 --- a/common/commonspace/object/tree/objecttree/changevalidator.go +++ b/common/commonspace/object/tree/objecttree/changevalidator.go @@ -7,10 +7,10 @@ import ( ) type ObjectTreeValidator interface { - // ValidateFullTree should always be entered while holding a read lock on ACLList - ValidateFullTree(tree *Tree, aclList list.ACLList) error - // ValidateNewChanges should always be entered while holding a read lock on ACLList - ValidateNewChanges(tree *Tree, aclList list.ACLList, newChanges []*Change) error + // ValidateFullTree should always be entered while holding a read lock on AclList + ValidateFullTree(tree *Tree, aclList list.AclList) error + // ValidateNewChanges should always be entered while holding a read lock on AclList + ValidateNewChanges(tree *Tree, aclList list.AclList, newChanges []*Change) error } type objectTreeValidator struct{} @@ -19,7 +19,7 @@ func newTreeValidator() ObjectTreeValidator { return &objectTreeValidator{} } -func (v *objectTreeValidator) ValidateFullTree(tree *Tree, aclList list.ACLList) (err error) { +func (v *objectTreeValidator) ValidateFullTree(tree *Tree, aclList list.AclList) (err error) { tree.Iterate(tree.RootId(), func(c *Change) (isContinue bool) { err = v.validateChange(tree, aclList, c) return err == nil @@ -27,7 +27,7 @@ func (v *objectTreeValidator) ValidateFullTree(tree *Tree, aclList list.ACLList) return err } -func (v *objectTreeValidator) ValidateNewChanges(tree *Tree, aclList list.ACLList, newChanges []*Change) (err error) { +func (v *objectTreeValidator) ValidateNewChanges(tree *Tree, aclList list.AclList, newChanges []*Change) (err error) { for _, c := range newChanges { err = v.validateChange(tree, aclList, c) if err != nil { @@ -37,10 +37,10 @@ func (v *objectTreeValidator) ValidateNewChanges(tree *Tree, aclList list.ACLLis return } -func (v *objectTreeValidator) validateChange(tree *Tree, aclList list.ACLList, c *Change) (err error) { +func (v *objectTreeValidator) validateChange(tree *Tree, aclList list.AclList, c *Change) (err error) { var ( perm list.UserPermissionPair - state = aclList.ACLState() + state = aclList.AclState() ) // checking if the user could write perm, err = state.PermissionsAtRecord(c.AclHeadId, c.Identity) @@ -48,7 +48,7 @@ func (v *objectTreeValidator) validateChange(tree *Tree, aclList list.ACLList, c return } - if perm.Permission != aclrecordproto.ACLUserPermissions_Writer && perm.Permission != aclrecordproto.ACLUserPermissions_Admin { + if perm.Permission != aclrecordproto.AclUserPermissions_Writer && perm.Permission != aclrecordproto.AclUserPermissions_Admin { err = list.ErrInsufficientPermissions return } diff --git a/common/commonspace/object/tree/objecttree/objecttree.go b/common/commonspace/object/tree/objecttree/objecttree.go index 6b8d26fa..7ce6fc61 100644 --- a/common/commonspace/object/tree/objecttree/objecttree.go +++ b/common/commonspace/object/tree/objecttree/objecttree.go @@ -74,7 +74,7 @@ type objectTree struct { validator ObjectTreeValidator rawChangeLoader *rawChangeLoader treeBuilder *treeBuilder - aclList list2.ACLList + aclList list2.AclList id string root *treechangeproto.RawTreeChangeWithId @@ -99,13 +99,13 @@ type objectTreeDeps struct { treeStorage treestorage.TreeStorage validator ObjectTreeValidator rawChangeLoader *rawChangeLoader - aclList list2.ACLList + aclList list2.AclList } func defaultObjectTreeDeps( rootChange *treechangeproto.RawTreeChangeWithId, treeStorage treestorage.TreeStorage, - aclList list2.ACLList) objectTreeDeps { + aclList list2.AclList) objectTreeDeps { keychain := keychain.NewKeychain() changeBuilder := NewChangeBuilder(keychain, rootChange) @@ -195,12 +195,12 @@ func (ot *objectTree) prepareBuilderContent(content SignableChangeContent) (cnt defer ot.aclList.RUnlock() var ( - state = ot.aclList.ACLState() // special method for own keys + state = ot.aclList.AclState() // special method for own keys readKey *symmetric.Key readKeyHash uint64 ) - canWrite := state.HasPermission(content.Identity, aclrecordproto.ACLUserPermissions_Writer) || - state.HasPermission(content.Identity, aclrecordproto.ACLUserPermissions_Admin) + canWrite := state.HasPermission(content.Identity, aclrecordproto.AclUserPermissions_Writer) || + state.HasPermission(content.Identity, aclrecordproto.AclUserPermissions_Admin) if !canWrite { err = list2.ErrInsufficientPermissions return @@ -606,7 +606,7 @@ func (ot *objectTree) snapshotPathIsActual() bool { func (ot *objectTree) validateTree(newChanges []*Change) error { ot.aclList.RLock() defer ot.aclList.RUnlock() - state := ot.aclList.ACLState() + state := ot.aclList.AclState() // just not to take lock many times, updating the key map from aclList if len(ot.keys) != len(state.UserReadKeys()) { diff --git a/common/commonspace/object/tree/objecttree/objecttree_test.go b/common/commonspace/object/tree/objecttree/objecttree_test.go index 4eaafa57..41d4d98f 100644 --- a/common/commonspace/object/tree/objecttree/objecttree_test.go +++ b/common/commonspace/object/tree/objecttree/objecttree_test.go @@ -85,33 +85,33 @@ func (c *mockChangeBuilder) BuildRaw(ch *Change) (raw *treechangeproto.RawTreeCh type mockChangeValidator struct{} -func (m *mockChangeValidator) ValidateNewChanges(tree *Tree, aclList list.ACLList, newChanges []*Change) error { +func (m *mockChangeValidator) ValidateNewChanges(tree *Tree, aclList list.AclList, newChanges []*Change) error { return nil } -func (m *mockChangeValidator) ValidateFullTree(tree *Tree, aclList list.ACLList) error { +func (m *mockChangeValidator) ValidateFullTree(tree *Tree, aclList list.AclList) error { return nil } type testTreeContext struct { - aclList list.ACLList + aclList list.AclList treeStorage treestorage.TreeStorage changeBuilder *mockChangeBuilder changeCreator *mockChangeCreator objTree ObjectTree } -func prepareACLList(t *testing.T) list.ACLList { +func prepareAclList(t *testing.T) list.AclList { st, err := acllistbuilder.NewListStorageWithTestName("userjoinexample.yml") require.NoError(t, err, "building storage should not result in error") - aclList, err := list.BuildACLList(st) + aclList, err := list.BuildAclList(st) require.NoError(t, err, "building acl list should be without error") return aclList } -func prepareTreeContext(t *testing.T, aclList list.ACLList) testTreeContext { +func prepareTreeContext(t *testing.T, aclList list.AclList) testTreeContext { changeCreator := &mockChangeCreator{} treeStorage := changeCreator.createNewTreeStorage("0", aclList.Head().Id) root, _ := treeStorage.Root() @@ -149,7 +149,7 @@ func prepareTreeContext(t *testing.T, aclList list.ACLList) testTreeContext { } func TestObjectTree(t *testing.T) { - aclList := prepareACLList(t) + aclList := prepareAclList(t) t.Run("add simple", func(t *testing.T) { ctx := prepareTreeContext(t, aclList) diff --git a/common/commonspace/object/tree/objecttree/objecttreefactory.go b/common/commonspace/object/tree/objecttree/objecttreefactory.go index dba7ba8b..81f138d6 100644 --- a/common/commonspace/object/tree/objecttree/objecttreefactory.go +++ b/common/commonspace/object/tree/objecttree/objecttreefactory.go @@ -21,7 +21,7 @@ type ObjectTreeCreatePayload struct { IsEncrypted bool } -func BuildObjectTree(treeStorage treestorage.TreeStorage, aclList list.ACLList) (ObjectTree, error) { +func BuildObjectTree(treeStorage treestorage.TreeStorage, aclList list.AclList) (ObjectTree, error) { rootChange, err := treeStorage.Root() if err != nil { return nil, err @@ -32,14 +32,14 @@ func BuildObjectTree(treeStorage treestorage.TreeStorage, aclList list.ACLList) func CreateDerivedObjectTree( payload ObjectTreeCreatePayload, - aclList list.ACLList, + aclList list.AclList, createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { return createObjectTree(payload, 0, nil, aclList, createStorage) } func CreateObjectTree( payload ObjectTreeCreatePayload, - aclList list.ACLList, + aclList list.AclList, createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { bytes := make([]byte, 32) _, err = rand.Read(bytes) @@ -53,7 +53,7 @@ func createObjectTree( payload ObjectTreeCreatePayload, timestamp int64, seed []byte, - aclList list.ACLList, + aclList list.AclList, createStorage treestorage.TreeStorageCreatorFunc) (objTree ObjectTree, err error) { aclList.RLock() aclHeadId := aclList.Head().Id diff --git a/common/commonspace/object/tree/objecttree/rawtreevalidator.go b/common/commonspace/object/tree/objecttree/rawtreevalidator.go index f6cc93e9..d2dcebbb 100644 --- a/common/commonspace/object/tree/objecttree/rawtreevalidator.go +++ b/common/commonspace/object/tree/objecttree/rawtreevalidator.go @@ -5,7 +5,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" ) -func ValidateRawTree(payload treestorage.TreeStorageCreatePayload, aclList list.ACLList) (err error) { +func ValidateRawTree(payload treestorage.TreeStorageCreatePayload, aclList list.AclList) (err error) { provider := treestorage.NewInMemoryTreeStorageProvider() treeStorage, err := provider.CreateTreeStorage(payload) if err != nil { diff --git a/common/commonspace/object/tree/synctree/synctree.go b/common/commonspace/object/tree/synctree/synctree.go index 3c9e57a5..02d21b06 100644 --- a/common/commonspace/object/tree/synctree/synctree.go +++ b/common/commonspace/object/tree/synctree/synctree.go @@ -61,7 +61,7 @@ type CreateDeps struct { Payload objecttree.ObjectTreeCreatePayload Configuration nodeconf.Configuration ObjectSync objectsync.ObjectSync - AclList list.ACLList + AclList list.AclList SpaceStorage spacestorage.SpaceStorage SyncStatus syncstatus.StatusUpdater HeadNotifiable HeadNotifiable @@ -73,7 +73,7 @@ type BuildDeps struct { Configuration nodeconf.Configuration HeadNotifiable HeadNotifiable Listener updatelistener.UpdateListener - AclList list.ACLList + AclList list.AclList SpaceStorage spacestorage.SpaceStorage TreeStorage treestorage.TreeStorage TreeUsage *atomic.Int32 diff --git a/common/commonspace/object/tree/synctree/synctree_test.go b/common/commonspace/object/tree/synctree/synctree_test.go index b283fb72..b8c4bfe5 100644 --- a/common/commonspace/object/tree/synctree/synctree_test.go +++ b/common/commonspace/object/tree/synctree/synctree_test.go @@ -50,13 +50,13 @@ func Test_DeriveSyncTree(t *testing.T) { defer ctrl.Finish() syncClientMock := mock_synctree.NewMockSyncClient(ctrl) - aclListMock := mock_list.NewMockACLList(ctrl) + aclListMock := mock_list.NewMockAclList(ctrl) objTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) spaceStorageMock := mock_spacestorage.NewMockSpaceStorage(ctrl) headNotifiableMock := mock_synctree.NewMockHeadNotifiable(ctrl) spaceId := "spaceId" expectedPayload := objecttree.ObjectTreeCreatePayload{SpaceId: spaceId} - createDerivedObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.ACLList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { + createDerivedObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.AclList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { require.Equal(t, l, aclListMock) require.Equal(t, expectedPayload, payload) return objTreeMock, nil @@ -87,13 +87,13 @@ func Test_CreateSyncTree(t *testing.T) { defer ctrl.Finish() syncClientMock := mock_synctree.NewMockSyncClient(ctrl) - aclListMock := mock_list.NewMockACLList(ctrl) + aclListMock := mock_list.NewMockAclList(ctrl) objTreeMock := newTestObjMock(mock_objecttree.NewMockObjectTree(ctrl)) spaceStorageMock := mock_spacestorage.NewMockSpaceStorage(ctrl) headNotifiableMock := mock_synctree.NewMockHeadNotifiable(ctrl) spaceId := "spaceId" expectedPayload := objecttree.ObjectTreeCreatePayload{SpaceId: spaceId} - createObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.ACLList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { + createObjectTree = func(payload objecttree.ObjectTreeCreatePayload, l list.AclList, create treestorage.TreeStorageCreatorFunc) (objTree objecttree.ObjectTree, err error) { require.Equal(t, l, aclListMock) require.Equal(t, expectedPayload, payload) return objTreeMock, nil diff --git a/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go b/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go index e612ff99..c9d3c8d4 100644 --- a/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go +++ b/common/commonspace/object/tree/treestorage/mock_treestorage/mock_storage.go @@ -37,7 +37,7 @@ func (m *MockListStorage) EXPECT() *MockListStorageMockRecorder { } // AddRawRecord mocks base method. -func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *aclrecordproto.RawACLRecordWithId) error { +func (m *MockListStorage) AddRawRecord(arg0 context.Context, arg1 *aclrecordproto.RawAclRecordWithId) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRawRecord", arg0, arg1) ret0, _ := ret[0].(error) @@ -51,10 +51,10 @@ func (mr *MockListStorageMockRecorder) AddRawRecord(arg0, arg1 interface{}) *gom } // GetRawRecord mocks base method. -func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*aclrecordproto.RawACLRecordWithId, error) { +func (m *MockListStorage) GetRawRecord(arg0 context.Context, arg1 string) (*aclrecordproto.RawAclRecordWithId, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetRawRecord", arg0, arg1) - ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret0, _ := ret[0].(*aclrecordproto.RawAclRecordWithId) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -95,10 +95,10 @@ func (mr *MockListStorageMockRecorder) Id() *gomock.Call { } // Root mocks base method. -func (m *MockListStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { +func (m *MockListStorage) Root() (*aclrecordproto.RawAclRecordWithId, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Root") - ret0, _ := ret[0].(*aclrecordproto.RawACLRecordWithId) + ret0, _ := ret[0].(*aclrecordproto.RawAclRecordWithId) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/common/commonspace/payloads.go b/common/commonspace/payloads.go index 117df889..f711445b 100644 --- a/common/commonspace/payloads.go +++ b/common/commonspace/payloads.go @@ -75,7 +75,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp } // preparing acl - aclRoot := &aclrecordproto2.ACLRoot{ + aclRoot := &aclrecordproto2.AclRoot{ Identity: identity, EncryptionKey: encPubKey, SpaceId: spaceId, @@ -83,7 +83,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp CurrentReadKeyHash: readKeyHash, Timestamp: time.Now().UnixNano(), } - rawWithId, err := marshalACLRoot(aclRoot, payload.SigningKey) + rawWithId, err := marshalAclRoot(aclRoot, payload.SigningKey) if err != nil { return } @@ -171,7 +171,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload sp } // deriving and encrypting read key - readKey, err := aclrecordproto2.ACLReadKeyDerive(signPrivKey, encPrivKey) + readKey, err := aclrecordproto2.AclReadKeyDerive(signPrivKey, encPrivKey) if err != nil { return } @@ -187,7 +187,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload sp } // preparing acl - aclRoot := &aclrecordproto2.ACLRoot{ + aclRoot := &aclrecordproto2.AclRoot{ Identity: identity, EncryptionKey: encPubKey, SpaceId: spaceId, @@ -195,7 +195,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload sp DerivationScheme: SpaceDerivationScheme, CurrentReadKeyHash: readKeyHash, } - rawWithId, err := marshalACLRoot(aclRoot, payload.SigningKey) + rawWithId, err := marshalAclRoot(aclRoot, payload.SigningKey) if err != nil { return } @@ -221,7 +221,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload sp return } -func marshalACLRoot(aclRoot *aclrecordproto2.ACLRoot, key signingkey.PrivKey) (rawWithId *aclrecordproto2.RawACLRecordWithId, err error) { +func marshalAclRoot(aclRoot *aclrecordproto2.AclRoot, key signingkey.PrivKey) (rawWithId *aclrecordproto2.RawAclRecordWithId, err error) { marshalledRoot, err := aclRoot.Marshal() if err != nil { return @@ -230,7 +230,7 @@ func marshalACLRoot(aclRoot *aclrecordproto2.ACLRoot, key signingkey.PrivKey) (r if err != nil { return } - raw := &aclrecordproto2.RawACLRecord{ + raw := &aclrecordproto2.RawAclRecord{ Payload: marshalledRoot, Signature: signature, } @@ -242,7 +242,7 @@ func marshalACLRoot(aclRoot *aclrecordproto2.ACLRoot, key signingkey.PrivKey) (r if err != nil { return } - rawWithId = &aclrecordproto2.RawACLRecordWithId{ + rawWithId = &aclrecordproto2.RawAclRecordWithId{ Payload: marshalledRaw, Id: aclHeadId, } diff --git a/common/commonspace/space.go b/common/commonspace/space.go index f9ece8d6..ae57398a 100644 --- a/common/commonspace/space.go +++ b/common/commonspace/space.go @@ -99,7 +99,7 @@ type space struct { storage spacestorage.SpaceStorage cache treegetter.TreeGetter account accountservice.Service - aclList *syncacl.SyncACL + aclList *syncacl.SyncAcl configuration nodeconf.Configuration settingsObject settings.SettingsObject @@ -156,15 +156,15 @@ func (s *space) Init(ctx context.Context) (err error) { if err != nil { return } - aclStorage, err := s.storage.ACLStorage() + aclStorage, err := s.storage.AclStorage() if err != nil { return } - aclList, err := list.BuildACLListWithIdentity(s.account.Account(), aclStorage) + aclList, err := list.BuildAclListWithIdentity(s.account.Account(), aclStorage) if err != nil { return } - s.aclList = syncacl.NewSyncACL(aclList, s.objectSync.StreamPool()) + s.aclList = syncacl.NewSyncAcl(aclList, s.objectSync.StreamPool()) deletionState := deletionstate.NewDeletionState(s.storage) deps := settings.Deps{ diff --git a/common/commonspace/spaceservice.go b/common/commonspace/spaceservice.go index 6a066a98..1af201aa 100644 --- a/common/commonspace/spaceservice.go +++ b/common/commonspace/spaceservice.go @@ -134,7 +134,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { func (s *spaceService) addSpaceStorage(ctx context.Context, spaceDescription SpaceDescription) (st spacestorage.SpaceStorage, err error) { payload := spacestorage.SpaceStorageCreatePayload{ - AclWithId: &aclrecordproto.RawACLRecordWithId{ + AclWithId: &aclrecordproto.RawAclRecordWithId{ Payload: spaceDescription.AclPayload, Id: spaceDescription.AclId, }, @@ -176,7 +176,7 @@ func (s *spaceService) getSpaceStorageFromRemote(ctx context.Context, id string) } st, err = s.storageProvider.CreateSpaceStorage(spacestorage.SpaceStorageCreatePayload{ - AclWithId: &aclrecordproto.RawACLRecordWithId{ + AclWithId: &aclrecordproto.RawAclRecordWithId{ Payload: res.Payload.AclPayload, Id: res.Payload.AclPayloadId, }, diff --git a/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go b/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go index 9ce586a8..e9ed76cc 100644 --- a/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go +++ b/common/commonspace/spacestorage/mock_spacestorage/mock_storage.go @@ -119,19 +119,19 @@ func (m *MockSpaceStorage) EXPECT() *MockSpaceStorageMockRecorder { return m.recorder } -// ACLStorage mocks base method. -func (m *MockSpaceStorage) ACLStorage() (liststorage.ListStorage, error) { +// AclStorage mocks base method. +func (m *MockSpaceStorage) AclStorage() (liststorage.ListStorage, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ACLStorage") + ret := m.ctrl.Call(m, "AclStorage") ret0, _ := ret[0].(liststorage.ListStorage) ret1, _ := ret[1].(error) return ret0, ret1 } -// ACLStorage indicates an expected call of ACLStorage. -func (mr *MockSpaceStorageMockRecorder) ACLStorage() *gomock.Call { +// AclStorage indicates an expected call of AclStorage. +func (mr *MockSpaceStorageMockRecorder) AclStorage() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ACLStorage", reflect.TypeOf((*MockSpaceStorage)(nil).ACLStorage)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AclStorage", reflect.TypeOf((*MockSpaceStorage)(nil).AclStorage)) } // Close mocks base method. diff --git a/common/commonspace/spacestorage/storage.go b/common/commonspace/spacestorage/storage.go index 843aa009..c0207935 100644 --- a/common/commonspace/spacestorage/storage.go +++ b/common/commonspace/spacestorage/storage.go @@ -32,14 +32,14 @@ type SpaceStorage interface { SetTreeDeletedStatus(id, state string) error TreeDeletedStatus(id string) (string, error) SpaceSettingsId() string - ACLStorage() (liststorage.ListStorage, error) + AclStorage() (liststorage.ListStorage, error) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) StoredIds() ([]string, error) Close() error } type SpaceStorageCreatePayload struct { - AclWithId *aclrecordproto.RawACLRecordWithId + AclWithId *aclrecordproto.RawAclRecordWithId SpaceHeaderWithId *spacesyncproto.RawSpaceHeaderWithId SpaceSettingsWithId *treechangeproto.RawTreeChangeWithId } diff --git a/node/acl/service.go b/node/acl/service.go index 8eaf7322..b71ecebe 100644 --- a/node/acl/service.go +++ b/node/acl/service.go @@ -22,8 +22,8 @@ func New() Service { } type Service interface { - CreateLog(ctx context.Context, aclId string, rawRec *aclrecordproto.RawACLRecord) (firstRecId string, err error) - AddRecord(ctx context.Context, aclId string, rawRec *aclrecordproto.RawACLRecord) (id string, err error) + CreateLog(ctx context.Context, aclId string, rawRec *aclrecordproto.RawAclRecord) (firstRecId string, err error) + AddRecord(ctx context.Context, aclId string, rawRec *aclrecordproto.RawAclRecord) (id string, err error) Watch(ctx context.Context, spaceId, aclId string, h synchandler.SyncHandler) (err error) UnWatch(aclId string) (err error) app.Component @@ -44,7 +44,7 @@ func (s *service) Name() (name string) { return CName } -func (s *service) CreateLog(ctx context.Context, aclId string, rawRec *aclrecordproto.RawACLRecord) (firstRecId string, err error) { +func (s *service) CreateLog(ctx context.Context, aclId string, rawRec *aclrecordproto.RawAclRecord) (firstRecId string, err error) { logId, err := cidToByte(aclId) if err != nil { return @@ -68,7 +68,7 @@ func (s *service) CreateLog(ctx context.Context, aclId string, rawRec *aclrecord return cidToString(recId) } -func (s *service) AddRecord(ctx context.Context, aclId string, rawRec *aclrecordproto.RawACLRecord) (id string, err error) { +func (s *service) AddRecord(ctx context.Context, aclId string, rawRec *aclrecordproto.RawAclRecord) (id string, err error) { logId, err := cidToByte(aclId) if err != nil { return @@ -108,8 +108,8 @@ func (s *service) UnWatch(aclId string) (err error) { return s.consService.UnWatch(logId) } -func (s *service) signAndMarshal(rawRec *aclrecordproto.RawACLRecord) (recId, prevId, payload []byte, err error) { - var rec = &aclrecordproto.ACLRecord{} +func (s *service) signAndMarshal(rawRec *aclrecordproto.RawAclRecord) (recId, prevId, payload []byte, err error) { + var rec = &aclrecordproto.AclRecord{} if err = rec.Unmarshal(rawRec.Payload); err != nil { return } diff --git a/node/acl/service_test.go b/node/acl/service_test.go index ed2df63a..a9741975 100644 --- a/node/acl/service_test.go +++ b/node/acl/service_test.go @@ -30,7 +30,7 @@ func TestService_CreateLog(t *testing.T) { aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) - rec := &aclrecordproto.ACLRecord{ + rec := &aclrecordproto.AclRecord{ PrevId: "", Identity: fx.account.Account().Identity, Data: []byte{'1', '2', '3'}, @@ -38,7 +38,7 @@ func TestService_CreateLog(t *testing.T) { } pl, _ := rec.Marshal() - firstRecId, err := fx.CreateLog(ctx, aclId, &aclrecordproto.RawACLRecord{ + firstRecId, err := fx.CreateLog(ctx, aclId, &aclrecordproto.RawAclRecord{ Payload: pl, }) require.NoError(t, err) @@ -48,7 +48,7 @@ func TestService_CreateLog(t *testing.T) { assert.NotEmpty(t, firstRecIdBytes) require.Len(t, clog.Records, 1) - var resultRawAcl = &aclrecordproto.RawACLRecord{} + var resultRawAcl = &aclrecordproto.RawAclRecord{} require.NoError(t, resultRawAcl.Unmarshal(clog.Records[0].Payload)) valid, err := fx.account.Account().SignKey.GetPublic().Verify(resultRawAcl.Payload, resultRawAcl.AcceptorSignature) require.NoError(t, err) @@ -65,7 +65,7 @@ func TestService_AddRecord(t *testing.T) { aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) - rec := &aclrecordproto.ACLRecord{ + rec := &aclrecordproto.AclRecord{ PrevId: "", Identity: fx.account.Account().Identity, Data: []byte{'1', '2', '3'}, @@ -73,7 +73,7 @@ func TestService_AddRecord(t *testing.T) { } pl, _ := rec.Marshal() - firstRecId, err := fx.CreateLog(ctx, aclId, &aclrecordproto.RawACLRecord{ + firstRecId, err := fx.CreateLog(ctx, aclId, &aclrecordproto.RawAclRecord{ Payload: pl, }) require.NoError(t, err) @@ -85,7 +85,7 @@ func TestService_AddRecord(t *testing.T) { fx.mockClient.EXPECT().AddRecord(ctx, aclIdBytes, gomock.Any()).Do(func(ctx context.Context, logId []byte, rec *consensusproto.Record) { addRec = rec }) - rec = &aclrecordproto.ACLRecord{ + rec = &aclrecordproto.AclRecord{ PrevId: firstRecId, Identity: fx.account.Account().Identity, Data: []byte{'1', '2', '3', '4'}, @@ -93,7 +93,7 @@ func TestService_AddRecord(t *testing.T) { } pl, _ = rec.Marshal() - newRecId, err := fx.AddRecord(ctx, aclId, &aclrecordproto.RawACLRecord{ + newRecId, err := fx.AddRecord(ctx, aclId, &aclrecordproto.RawAclRecord{ Payload: pl, }) require.NoError(t, err) diff --git a/node/acl/watcher.go b/node/acl/watcher.go index 1f5cbe60..b1f9084c 100644 --- a/node/acl/watcher.go +++ b/node/acl/watcher.go @@ -37,7 +37,7 @@ func (w *watcher) AddConsensusRecords(recs []*consensusproto.Record) { w.isReady.Do(func() { close(w.ready) }) - records := make([]*aclrecordproto.RawACLRecordWithId, 0, len(recs)) + records := make([]*aclrecordproto.RawAclRecordWithId, 0, len(recs)) for _, rec := range recs { recId, err := cidToString(rec.Id) @@ -45,16 +45,16 @@ func (w *watcher) AddConsensusRecords(recs []*consensusproto.Record) { log.Error("received invalid id from consensus node", zap.Error(err)) continue } - records = append(records, &aclrecordproto.RawACLRecordWithId{ + records = append(records, &aclrecordproto.RawAclRecordWithId{ Payload: rec.Payload, Id: recId, }) } - aclReq := &aclrecordproto.ACLSyncMessage{ - Content: &aclrecordproto.ACLSyncContentValue{ - Value: &aclrecordproto.ACLSyncContentValue_AddRecords{ - AddRecords: &aclrecordproto.ACLAddRecords{ + aclReq := &aclrecordproto.AclSyncMessage{ + Content: &aclrecordproto.AclSyncContentValue{ + Value: &aclrecordproto.AclSyncContentValue_AddRecords{ + AddRecords: &aclrecordproto.AclAddRecords{ Records: records, }, }, diff --git a/node/storage/liststorage.go b/node/storage/liststorage.go index d83150da..f89875ec 100644 --- a/node/storage/liststorage.go +++ b/node/storage/liststorage.go @@ -11,7 +11,7 @@ type listStorage struct { db *pogreb.DB keys aclKeys id string - root *aclrecordproto.RawACLRecordWithId + root *aclrecordproto.RawAclRecordWithId } func newListStorage(db *pogreb.DB) (ls liststorage.ListStorage, err error) { @@ -21,7 +21,7 @@ func newListStorage(db *pogreb.DB) (ls liststorage.ListStorage, err error) { return } if rootId == nil { - err = liststorage.ErrUnknownACLId + err = liststorage.ErrUnknownAclId return } @@ -30,11 +30,11 @@ func newListStorage(db *pogreb.DB) (ls liststorage.ListStorage, err error) { return } if root == nil { - err = liststorage.ErrUnknownACLId + err = liststorage.ErrUnknownAclId return } - rootWithId := &aclrecordproto.RawACLRecordWithId{ + rootWithId := &aclrecordproto.RawAclRecordWithId{ Payload: root, Id: string(rootId), } @@ -48,7 +48,7 @@ func newListStorage(db *pogreb.DB) (ls liststorage.ListStorage, err error) { return } -func createListStorage(db *pogreb.DB, root *aclrecordproto.RawACLRecordWithId) (ls liststorage.ListStorage, err error) { +func createListStorage(db *pogreb.DB, root *aclrecordproto.RawAclRecordWithId) (ls liststorage.ListStorage, err error) { keys := aclKeys{} has, err := db.Has(keys.RootIdKey()) if err != nil { @@ -86,7 +86,7 @@ func (l *listStorage) Id() string { return l.id } -func (l *listStorage) Root() (*aclrecordproto.RawACLRecordWithId, error) { +func (l *listStorage) Root() (*aclrecordproto.RawAclRecordWithId, error) { return l.root, nil } @@ -96,14 +96,14 @@ func (l *listStorage) Head() (head string, err error) { return } if bytes == nil { - err = liststorage.ErrUnknownACLId + err = liststorage.ErrUnknownAclId return } head = string(bytes) return } -func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclrecordproto.RawACLRecordWithId, err error) { +func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclrecordproto.RawAclRecordWithId, err error) { res, err := l.db.Get(l.keys.RawRecordKey(id)) if err != nil { return @@ -113,7 +113,7 @@ func (l *listStorage) GetRawRecord(ctx context.Context, id string) (raw *aclreco return } - raw = &aclrecordproto.RawACLRecordWithId{ + raw = &aclrecordproto.RawAclRecordWithId{ Payload: res, Id: id, } @@ -124,6 +124,6 @@ func (l *listStorage) SetHead(headId string) (err error) { return l.db.Put(l.keys.HeadIdKey(), []byte(headId)) } -func (l *listStorage) AddRawRecord(ctx context.Context, rec *aclrecordproto.RawACLRecordWithId) error { +func (l *listStorage) AddRawRecord(ctx context.Context, rec *aclrecordproto.RawAclRecordWithId) error { return l.db.Put(l.keys.RawRecordKey(rec.Id), rec.Payload) } diff --git a/node/storage/liststorage_test.go b/node/storage/liststorage_test.go index a84cde5d..303accf4 100644 --- a/node/storage/liststorage_test.go +++ b/node/storage/liststorage_test.go @@ -8,7 +8,7 @@ import ( "testing" ) -func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawACLRecordWithId, head string) { +func testList(t *testing.T, store liststorage.ListStorage, root *aclrecordproto.RawAclRecordWithId, head string) { require.Equal(t, store.Id(), root.Id) aclRoot, err := store.Root() @@ -25,7 +25,7 @@ func TestListStorage_Create(t *testing.T) { fx.open(t) defer fx.stop(t) - aclRoot := &aclrecordproto.RawACLRecordWithId{Payload: []byte("root"), Id: "someRootId"} + aclRoot := &aclrecordproto.RawAclRecordWithId{Payload: []byte("root"), Id: "someRootId"} listStore, err := createListStorage(fx.db, aclRoot) require.NoError(t, err) testList(t, listStore, aclRoot, aclRoot.Id) @@ -41,7 +41,7 @@ func TestListStorage_Create(t *testing.T) { func TestListStorage_Methods(t *testing.T) { fx := newFixture(t) fx.open(t) - aclRoot := &aclrecordproto.RawACLRecordWithId{Payload: []byte("root"), Id: "someRootId"} + aclRoot := &aclrecordproto.RawAclRecordWithId{Payload: []byte("root"), Id: "someRootId"} _, err := createListStorage(fx.db, aclRoot) require.NoError(t, err) fx.stop(t) @@ -61,7 +61,7 @@ func TestListStorage_Methods(t *testing.T) { }) t.Run("add raw record and get raw record", func(t *testing.T) { - newRec := &aclrecordproto.RawACLRecordWithId{Payload: []byte("rec"), Id: "someRecId"} + newRec := &aclrecordproto.RawAclRecordWithId{Payload: []byte("rec"), Id: "someRecId"} require.NoError(t, listStore.AddRawRecord(context.Background(), newRec)) aclRec, err := listStore.GetRawRecord(context.Background(), newRec.Id) require.NoError(t, err) diff --git a/node/storage/spacestorage.go b/node/storage/spacestorage.go index e24a14c2..c5ba6bcc 100644 --- a/node/storage/spacestorage.go +++ b/node/storage/spacestorage.go @@ -182,7 +182,7 @@ func (s *spaceStorage) CreateTreeStorage(payload treestorage.TreeStorageCreatePa return createTreeStorage(s.objDb, payload) } -func (s *spaceStorage) ACLStorage() (liststorage.ListStorage, error) { +func (s *spaceStorage) AclStorage() (liststorage.ListStorage, error) { return s.aclStorage, nil } diff --git a/node/storage/spacestorage_test.go b/node/storage/spacestorage_test.go index 52be2e12..92c68894 100644 --- a/node/storage/spacestorage_test.go +++ b/node/storage/spacestorage_test.go @@ -17,7 +17,7 @@ func spaceTestPayload() spacestorage.SpaceStorageCreatePayload { RawHeader: []byte("header"), Id: "headerId", } - aclRoot := &aclrecordproto.RawACLRecordWithId{ + aclRoot := &aclrecordproto.RawAclRecordWithId{ Payload: []byte("aclRoot"), Id: "aclRootId", } @@ -37,7 +37,7 @@ func testSpace(t *testing.T, store spacestorage.SpaceStorage, payload spacestora require.NoError(t, err) require.Equal(t, payload.SpaceHeaderWithId, header) - aclStorage, err := store.ACLStorage() + aclStorage, err := store.AclStorage() require.NoError(t, err) testList(t, aclStorage, payload.AclWithId, payload.AclWithId.Id) } From 0a24886ce6468941a0d5e1f21fbc9f8ac956191f Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 26 Dec 2022 18:01:18 +0100 Subject: [PATCH 07/17] Change ID to Id --- client/clientspace/clientcache/treecache.go | 4 +- common/commonspace/commongetter.go | 4 +- .../object/acl/list/aclrecordbuilder.go | 2 +- .../object/acl/list/aclrecordbuilder_test.go | 4 +- common/commonspace/object/acl/list/list.go | 4 +- .../object/acl/list/mock_list/mock_list.go | 12 +- .../acllistbuilder/liststoragebuilder.go | 2 +- .../object/tree/objecttree/change.go | 4 +- .../object/tree/objecttree/changebuilder.go | 8 +- .../mock_objecttree/mock_objecttree.go | 12 +- .../object/tree/objecttree/objecttree.go | 4 +- .../synctree/mock_synctree/mock_synctree.go | 12 +- .../object/tree/synctree/synctree.go | 16 +- .../object/tree/synctree/synctree_test.go | 6 +- .../object/tree/synctree/synctreehandler.go | 8 +- .../tree/synctree/synctreehandler_test.go | 22 +- common/commonspace/payloads.go | 6 +- common/commonspace/settings/idprovider.go | 2 +- .../commonspace/settings/idprovider_test.go | 2 +- common/commonspace/settings/settings.go | 2 +- common/commonspace/settings/settings_test.go | 2 +- .../spacestorage/mock_storage/mock_storage.go | 266 ++++++++++++++++++ common/util/cidutil/cid.go | 4 +- common/util/peer/peer.go | 2 +- node/acl/service.go | 2 +- node/acl/service_test.go | 12 +- node/acl/util_test.go | 2 +- util/cmd/nodesgen/gen.go | 8 +- 28 files changed, 350 insertions(+), 84 deletions(-) create mode 100644 common/commonspace/spacestorage/mock_storage/mock_storage.go diff --git a/client/clientspace/clientcache/treecache.go b/client/clientspace/clientcache/treecache.go index 4dffd9e1..5d512f23 100644 --- a/client/clientspace/clientcache/treecache.go +++ b/client/clientspace/clientcache/treecache.go @@ -40,14 +40,14 @@ type updateListener struct { func (u *updateListener) Update(tree objecttree.ObjectTree) { log.With( zap.Strings("heads", tree.Heads()), - zap.String("tree id", tree.ID())). + zap.String("tree id", tree.Id())). Debug("updating tree") } func (u *updateListener) Rebuild(tree objecttree.ObjectTree) { log.With( zap.Strings("heads", tree.Heads()), - zap.String("tree id", tree.ID())). + zap.String("tree id", tree.Id())). Debug("rebuilding tree") } diff --git a/common/commonspace/commongetter.go b/common/commonspace/commongetter.go index 70f799c3..a7bcb2c5 100644 --- a/common/commonspace/commongetter.go +++ b/common/commonspace/commongetter.go @@ -25,11 +25,11 @@ func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncAcl, treeGetter t } func (c *commonSpaceGetter) GetObject(ctx context.Context, objectId string) (obj syncobjectgetter.SyncObject, err error) { - if c.aclList.ID() == objectId { + if c.aclList.Id() == objectId { obj = c.aclList return } - if c.settings.ID() == objectId { + if c.settings.Id() == objectId { obj = c.settings.(syncobjectgetter.SyncObject) return } diff --git a/common/commonspace/object/acl/list/aclrecordbuilder.go b/common/commonspace/object/acl/list/aclrecordbuilder.go index 28549ca7..ceee382b 100644 --- a/common/commonspace/object/acl/list/aclrecordbuilder.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder.go @@ -170,7 +170,7 @@ func verifyRaw( } // verifying ID - if !cidutil.VerifyCID(recWithId.Payload, recWithId.Id) { + if !cidutil.VerifyCid(recWithId.Payload, recWithId.Id) { err = ErrIncorrectCID } return diff --git a/common/commonspace/object/acl/list/aclrecordbuilder_test.go b/common/commonspace/object/acl/list/aclrecordbuilder_test.go index 8c7408e3..32e5258b 100644 --- a/common/commonspace/object/acl/list/aclrecordbuilder_test.go +++ b/common/commonspace/object/acl/list/aclrecordbuilder_test.go @@ -27,7 +27,7 @@ func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { aclList, err := BuildAclListWithIdentity(acc, st) require.NoError(t, err, "building acl list should be without error") - recordBuilder := newAclRecordBuilder(aclList.ID(), keychain.NewKeychain()) + recordBuilder := newAclRecordBuilder(aclList.Id(), keychain.NewKeychain()) rk, err := testKeychain.GetKey("key.Read.EncKey").(*acllistbuilder2.SymKey).Key.Raw() require.NoError(t, err) privKey, err := testKeychain.GetKey("key.Sign.Onetime1").(signingkey.PrivKey).Raw() @@ -37,7 +37,7 @@ func TestAclRecordBuilder_BuildUserJoin(t *testing.T) { require.NoError(t, err) marshalledJoin, err := userJoin.Marshal() require.NoError(t, err) - id, err := cidutil.NewCIDFromBytes(marshalledJoin) + id, err := cidutil.NewCidFromBytes(marshalledJoin) require.NoError(t, err) rawRec := &aclrecordproto.RawAclRecordWithId{ Payload: marshalledJoin, diff --git a/common/commonspace/object/acl/list/list.go b/common/commonspace/object/acl/list/list.go index dcbfeeed..cc452a51 100644 --- a/common/commonspace/object/acl/list/list.go +++ b/common/commonspace/object/acl/list/list.go @@ -24,7 +24,7 @@ type RWLocker interface { type AclList interface { RWLocker - ID() string + Id() string Root() *aclrecordproto.RawAclRecordWithId Records() []*AclRecord AclState() *AclState @@ -164,7 +164,7 @@ func (a *aclList) IsValidNext(rawRec *aclrecordproto.RawAclRecordWithId) (err er return } -func (a *aclList) ID() string { +func (a *aclList) Id() string { return a.id } diff --git a/common/commonspace/object/acl/list/mock_list/mock_list.go b/common/commonspace/object/acl/list/mock_list/mock_list.go index 5a5f57b9..f843217e 100644 --- a/common/commonspace/object/acl/list/mock_list/mock_list.go +++ b/common/commonspace/object/acl/list/mock_list/mock_list.go @@ -107,18 +107,18 @@ func (mr *MockAclListMockRecorder) Head() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Head", reflect.TypeOf((*MockAclList)(nil).Head)) } -// ID mocks base method. -func (m *MockAclList) ID() string { +// Id mocks base method. +func (m *MockAclList) Id() string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ID") + ret := m.ctrl.Call(m, "Id") ret0, _ := ret[0].(string) return ret0 } -// ID indicates an expected call of ID. -func (mr *MockAclListMockRecorder) ID() *gomock.Call { +// Id indicates an expected call of Id. +func (mr *MockAclListMockRecorder) Id() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockAclList)(nil).ID)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockAclList)(nil).Id)) } // IsAfter mocks base method. diff --git a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go index b3f050aa..083867f0 100644 --- a/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go +++ b/common/commonspace/object/acl/testutils/acllistbuilder/liststoragebuilder.go @@ -73,7 +73,7 @@ func (t *AclListStorageBuilder) createRaw(rec proto.Marshaler, identity []byte) panic(err) } - id, _ := cidutil.NewCIDFromBytes(rawMarshalled) + id, _ := cidutil.NewCidFromBytes(rawMarshalled) return &aclrecordproto.RawAclRecordWithId{ Payload: rawMarshalled, diff --git a/common/commonspace/object/tree/objecttree/change.go b/common/commonspace/object/tree/objecttree/change.go index 9638a3dc..5b115a0f 100644 --- a/common/commonspace/object/tree/objecttree/change.go +++ b/common/commonspace/object/tree/objecttree/change.go @@ -7,7 +7,7 @@ import ( var ( ErrIncorrectSignature = errors.New("change has incorrect signature") - ErrIncorrectCID = errors.New("change has incorrect CID") + ErrIncorrectCid = errors.New("change has incorrect CID") ) // Change is an abstract type for all types of changes @@ -58,6 +58,6 @@ func NewChangeFromRoot(id string, ch *treechangeproto.RootChange, signature []by } } -func (ch *Change) CID() string { +func (ch *Change) Cid() string { return ch.Id } diff --git a/common/commonspace/object/tree/objecttree/changebuilder.go b/common/commonspace/object/tree/objecttree/changebuilder.go index a829522c..56d98d94 100644 --- a/common/commonspace/object/tree/objecttree/changebuilder.go +++ b/common/commonspace/object/tree/objecttree/changebuilder.go @@ -60,8 +60,8 @@ func (c *changeBuilder) ConvertFromRaw(rawIdChange *treechangeproto.RawTreeChang if verify { // verifying ID - if !cidutil.VerifyCID(rawIdChange.RawChange, rawIdChange.Id) { - err = ErrIncorrectCID + if !cidutil.VerifyCid(rawIdChange.RawChange, rawIdChange.Id) { + err = ErrIncorrectCid return } } @@ -131,7 +131,7 @@ func (c *changeBuilder) BuildInitialContent(payload InitialContent) (ch *Change, return } - id, err := cidutil.NewCIDFromBytes(marshalledRawChange) + id, err := cidutil.NewCidFromBytes(marshalledRawChange) if err != nil { return } @@ -186,7 +186,7 @@ func (c *changeBuilder) BuildContent(payload BuilderContent) (ch *Change, rawIdC return } - id, err := cidutil.NewCIDFromBytes(marshalledRawChange) + id, err := cidutil.NewCidFromBytes(marshalledRawChange) if err != nil { return } diff --git a/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go index a377f19b..571cdf91 100644 --- a/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go +++ b/common/commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go @@ -171,18 +171,18 @@ func (mr *MockObjectTreeMockRecorder) Heads() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Heads", reflect.TypeOf((*MockObjectTree)(nil).Heads)) } -// ID mocks base method. -func (m *MockObjectTree) ID() string { +// Id mocks base method. +func (m *MockObjectTree) Id() string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ID") + ret := m.ctrl.Call(m, "Id") ret0, _ := ret[0].(string) return ret0 } -// ID indicates an expected call of ID. -func (mr *MockObjectTreeMockRecorder) ID() *gomock.Call { +// Id indicates an expected call of Id. +func (mr *MockObjectTreeMockRecorder) Id() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockObjectTree)(nil).ID)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockObjectTree)(nil).Id)) } // Iterate mocks base method. diff --git a/common/commonspace/object/tree/objecttree/objecttree.go b/common/commonspace/object/tree/objecttree/objecttree.go index 7ce6fc61..09a3012c 100644 --- a/common/commonspace/object/tree/objecttree/objecttree.go +++ b/common/commonspace/object/tree/objecttree/objecttree.go @@ -46,7 +46,7 @@ type ChangeConvertFunc = func(decrypted []byte) (any, error) type ObjectTree interface { RWLocker - ID() string + Id() string Header() *treechangeproto.RawTreeChangeWithId Heads() []string Root() *Change @@ -137,7 +137,7 @@ func (ot *objectTree) rebuildFromStorage(theirHeads []string, newChanges []*Chan return ot.validateTree(nil) } -func (ot *objectTree) ID() string { +func (ot *objectTree) Id() string { return ot.id } diff --git a/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go index 88a371d9..99a8e11c 100644 --- a/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go +++ b/common/commonspace/object/tree/synctree/mock_synctree/mock_synctree.go @@ -309,18 +309,18 @@ func (mr *MockSyncTreeMockRecorder) Heads() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Heads", reflect.TypeOf((*MockSyncTree)(nil).Heads)) } -// ID mocks base method. -func (m *MockSyncTree) ID() string { +// Id mocks base method. +func (m *MockSyncTree) Id() string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ID") + ret := m.ctrl.Call(m, "Id") ret0, _ := ret[0].(string) return ret0 } -// ID indicates an expected call of ID. -func (mr *MockSyncTreeMockRecorder) ID() *gomock.Call { +// Id indicates an expected call of Id. +func (mr *MockSyncTreeMockRecorder) Id() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockSyncTree)(nil).ID)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSyncTree)(nil).Id)) } // Iterate mocks base method. diff --git a/common/commonspace/object/tree/synctree/synctree.go b/common/commonspace/object/tree/synctree/synctree.go index 02d21b06..4afd23e6 100644 --- a/common/commonspace/object/tree/synctree/synctree.go +++ b/common/commonspace/object/tree/synctree/synctree.go @@ -101,7 +101,7 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.ObjectSync, deps.Configuration) - id = objTree.ID() + id = objTree.Id() heads := objTree.Heads() deps.HeadNotifiable.UpdateHeads(id, heads) @@ -122,7 +122,7 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (id string, err error) deps.ObjectSync, deps.Configuration) - id = objTree.ID() + id = objTree.Id() heads := objTree.Heads() deps.HeadNotifiable.UpdateHeads(id, heads) @@ -264,9 +264,9 @@ func (s *syncTree) AddContent(ctx context.Context, content objecttree.SignableCh return } if s.notifiable != nil { - s.notifiable.UpdateHeads(s.ID(), res.Heads) + s.notifiable.UpdateHeads(s.Id(), res.Heads) } - s.syncStatus.HeadsChange(s.ID(), res.Heads) + s.syncStatus.HeadsChange(s.Id(), res.Heads) headUpdate := s.syncClient.CreateHeadUpdate(s, res.Added) err = s.syncClient.BroadcastAsync(headUpdate) return @@ -292,7 +292,7 @@ func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload objecttree. } if res.Mode != objecttree.Nothing { if s.notifiable != nil { - s.notifiable.UpdateHeads(s.ID(), res.Heads) + s.notifiable.UpdateHeads(s.Id(), res.Heads) } headUpdate := s.syncClient.CreateHeadUpdate(s, res.Added) err = s.syncClient.BroadcastAsync(headUpdate) @@ -301,7 +301,7 @@ func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload objecttree. } func (s *syncTree) Delete() (err error) { - log.With("id", s.ID()).Debug("deleting sync tree") + log.With("id", s.Id()).Debug("deleting sync tree") s.Lock() defer s.Unlock() if err = s.checkAlive(); err != nil { @@ -316,7 +316,7 @@ func (s *syncTree) Delete() (err error) { } func (s *syncTree) Close() (err error) { - log.With("id", s.ID()).Debug("closing sync tree") + log.With("id", s.Id()).Debug("closing sync tree") s.Lock() defer s.Unlock() if s.isClosed { @@ -350,6 +350,6 @@ func (s *syncTree) afterBuild() { } s.treeUsage.Add(1) if s.notifiable != nil { - s.notifiable.UpdateHeads(s.ID(), s.Heads()) + s.notifiable.UpdateHeads(s.Id(), s.Heads()) } } diff --git a/common/commonspace/object/tree/synctree/synctree_test.go b/common/commonspace/object/tree/synctree/synctree_test.go index b8c4bfe5..a160b726 100644 --- a/common/commonspace/object/tree/synctree/synctree_test.go +++ b/common/commonspace/object/tree/synctree/synctree_test.go @@ -75,7 +75,7 @@ func Test_DeriveSyncTree(t *testing.T) { SyncStatus: syncstatus.NewNoOpSyncStatus(), HeadNotifiable: headNotifiableMock, } - objTreeMock.EXPECT().ID().Return("id") + objTreeMock.EXPECT().Id().Return("id") _, err := DeriveSyncTree(ctx, deps) require.NoError(t, err) @@ -105,7 +105,7 @@ func Test_CreateSyncTree(t *testing.T) { headNotifiableMock.EXPECT().UpdateHeads("id", []string{"h1"}) syncClientMock.EXPECT().CreateHeadUpdate(gomock.Any(), gomock.Nil()).Return(headUpdate) syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil) - objTreeMock.EXPECT().ID().Return("id") + objTreeMock.EXPECT().Id().Return("id") deps := CreateDeps{ AclList: aclListMock, SpaceId: spaceId, @@ -207,7 +207,7 @@ func Test_BuildSyncTree(t *testing.T) { Mode: objecttree.Append, Added: changes, } - objTreeMock.EXPECT().ID().Return("id").AnyTimes() + objTreeMock.EXPECT().Id().Return("id").AnyTimes() objTreeMock.EXPECT().AddContent(gomock.Any(), gomock.Eq(content)). Return(expectedRes, nil) diff --git a/common/commonspace/object/tree/synctree/synctreehandler.go b/common/commonspace/object/tree/synctree/synctreehandler.go index 501ef5a7..b66ba45f 100644 --- a/common/commonspace/object/tree/synctree/synctreehandler.go +++ b/common/commonspace/object/tree/synctree/synctreehandler.go @@ -84,7 +84,7 @@ func (s *syncTreeHandler) handleHeadUpdate( log := log.With("senderId", senderId). With("heads", objTree.Heads()). - With("treeId", objTree.ID()) + With("treeId", objTree.Id()) log.Debug("received head update message") defer func() { @@ -101,7 +101,7 @@ func (s *syncTreeHandler) handleHeadUpdate( // isEmptyUpdate is sent when the tree is brought up from cache if isEmptyUpdate { - log.With("treeId", objTree.ID()).Debug("is empty update") + log.With("treeId", objTree.Id()).Debug("is empty update") if slice.UnsortedEquals(objTree.Heads(), update.Heads) { return } @@ -151,7 +151,7 @@ func (s *syncTreeHandler) handleFullSyncRequest( log := log.With("senderId", senderId). With("heads", request.Heads). - With("treeId", s.objTree.ID()). + With("treeId", s.objTree.Id()). With("replyId", replyId) log.Debug("received full sync request message") @@ -192,7 +192,7 @@ func (s *syncTreeHandler) handleFullSyncResponse( ) log := log.With("senderId", senderId). With("heads", response.Heads). - With("treeId", s.objTree.ID()) + With("treeId", s.objTree.Id()) log.Debug("received full sync response message") defer func() { diff --git a/common/commonspace/object/tree/synctree/synctreehandler_test.go b/common/commonspace/object/tree/synctree/synctreehandler_test.go index 3840d9f5..1781b09a 100644 --- a/common/commonspace/object/tree/synctree/synctreehandler_test.go +++ b/common/commonspace/object/tree/synctree/synctreehandler_test.go @@ -89,7 +89,7 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).Times(2) fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.objectTreeMock.EXPECT(). @@ -123,7 +123,7 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).AnyTimes() fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) fx.objectTreeMock.EXPECT(). @@ -159,7 +159,7 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h1"}).AnyTimes() fx.receiveQueueMock.EXPECT().ClearQueue(senderId) @@ -184,7 +184,7 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).AnyTimes() fx.syncClientMock.EXPECT(). CreateFullSyncRequest(gomock.Eq(fx.objectTreeMock), gomock.Eq([]string{"h1"}), gomock.Eq([]string{"h1"})). @@ -212,7 +212,7 @@ func TestSyncHandler_HandleHeadUpdate(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h1"}).AnyTimes() fx.receiveQueueMock.EXPECT().ClearQueue(senderId) @@ -242,7 +242,7 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), "").Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Header().Return(nil) fx.objectTreeMock.EXPECT().Heads().Return([]string{"h2"}).AnyTimes() fx.objectTreeMock.EXPECT().HasChanges(gomock.Eq([]string{"h1"})).Return(false) @@ -280,7 +280,7 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) fx.objectTreeMock.EXPECT(). - ID().AnyTimes().Return(treeId) + Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Header().Return(nil) fx.objectTreeMock.EXPECT(). Heads(). @@ -313,7 +313,7 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, replyId, nil) fx.objectTreeMock.EXPECT(). - ID().AnyTimes().Return(treeId) + Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Header().Return(nil) fx.syncClientMock.EXPECT(). CreateFullSyncResponse(gomock.Eq(fx.objectTreeMock), gomock.Eq([]string{"h1"}), gomock.Eq([]string{"h1"})). @@ -342,7 +342,7 @@ func TestSyncHandler_HandleFullSyncRequest(t *testing.T) { fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, "", nil) fx.objectTreeMock.EXPECT(). - ID().AnyTimes().Return(treeId) + Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT().Header().Return(nil) fx.objectTreeMock.EXPECT(). Heads(). @@ -385,7 +385,7 @@ func TestSyncHandler_HandleFullSyncResponse(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), replyId).Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, replyId, nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT(). Heads(). Return([]string{"h2"}).AnyTimes() @@ -421,7 +421,7 @@ func TestSyncHandler_HandleFullSyncResponse(t *testing.T) { fx.receiveQueueMock.EXPECT().AddMessage(senderId, gomock.Eq(treeMsg), replyId).Return(false) fx.receiveQueueMock.EXPECT().GetMessage(senderId).Return(treeMsg, replyId, nil) - fx.objectTreeMock.EXPECT().ID().AnyTimes().Return(treeId) + fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(treeId) fx.objectTreeMock.EXPECT(). Heads(). Return([]string{"h1"}).AnyTimes() diff --git a/common/commonspace/payloads.go b/common/commonspace/payloads.go index f711445b..c844e030 100644 --- a/common/commonspace/payloads.go +++ b/common/commonspace/payloads.go @@ -55,7 +55,7 @@ func storagePayloadForSpaceCreate(payload SpaceCreatePayload) (storagePayload sp if err != nil { return } - id, err := cidutil.NewCIDFromBytes(marshalled) + id, err := cidutil.NewCidFromBytes(marshalled) spaceId := NewSpaceId(id, payload.ReplicationKey) rawHeaderWithId := &spacesyncproto.RawSpaceHeaderWithId{ RawHeader: marshalled, @@ -163,7 +163,7 @@ func storagePayloadForSpaceDerive(payload SpaceDerivePayload) (storagePayload sp if err != nil { return } - id, err := cidutil.NewCIDFromBytes(marshalled) + id, err := cidutil.NewCidFromBytes(marshalled) spaceId := NewSpaceId(id, repKey) rawHeaderWithId := &spacesyncproto.RawSpaceHeaderWithId{ RawHeader: marshalled, @@ -238,7 +238,7 @@ func marshalAclRoot(aclRoot *aclrecordproto2.AclRoot, key signingkey.PrivKey) (r if err != nil { return } - aclHeadId, err := cidutil.NewCIDFromBytes(marshalledRaw) + aclHeadId, err := cidutil.NewCidFromBytes(marshalledRaw) if err != nil { return } diff --git a/common/commonspace/settings/idprovider.go b/common/commonspace/settings/idprovider.go index 7af4067b..980b6aa1 100644 --- a/common/commonspace/settings/idprovider.go +++ b/common/commonspace/settings/idprovider.go @@ -51,7 +51,7 @@ func (p *provider) ProvideIds(tr objecttree.ObjectTree, startId string) (ids []s } if startId == "" { - err = tr.IterateFrom(tr.ID(), convert, process) + err = tr.IterateFrom(tr.Id(), convert, process) } else { err = tr.IterateFrom(startId, convert, process) } diff --git a/common/commonspace/settings/idprovider_test.go b/common/commonspace/settings/idprovider_test.go index 7f52f051..5968ce04 100644 --- a/common/commonspace/settings/idprovider_test.go +++ b/common/commonspace/settings/idprovider_test.go @@ -78,7 +78,7 @@ func TestProvider_ProvideIds(t *testing.T) { t.Run("startId is empty", func(t *testing.T) { ch := &objecttree.Change{Id: "rootId"} objTree.EXPECT().Root().Return(ch) - objTree.EXPECT().ID().Return("id") + objTree.EXPECT().Id().Return("id") objTree.EXPECT().IterateFrom("id", gomock.Any(), gomock.Any()).Return(nil) _, _, err := prov.ProvideIds(objTree, "") require.NoError(t, err) diff --git a/common/commonspace/settings/settings.go b/common/commonspace/settings/settings.go index ac35cafa..68fe1628 100644 --- a/common/commonspace/settings/settings.go +++ b/common/commonspace/settings/settings.go @@ -136,7 +136,7 @@ func (s *settingsObject) Close() error { func (s *settingsObject) DeleteObject(id string) (err error) { s.Lock() defer s.Unlock() - if s.ID() == id { + if s.Id() == id { err = ErrDeleteSelf return } diff --git a/common/commonspace/settings/settings_test.go b/common/commonspace/settings/settings_test.go index 45e4e90a..f3f87be8 100644 --- a/common/commonspace/settings/settings_test.go +++ b/common/commonspace/settings/settings_test.go @@ -129,7 +129,7 @@ func TestSettingsObject_DeleteObject(t *testing.T) { delId := "delId" - fx.syncTree.EXPECT().ID().Return("syncId") + fx.syncTree.EXPECT().Id().Return("syncId") fx.delState.EXPECT().Exists(delId).Return(false) fx.spaceStorage.EXPECT().TreeStorage(delId).Return(nil, nil) res := []byte("settingsData") diff --git a/common/commonspace/spacestorage/mock_storage/mock_storage.go b/common/commonspace/spacestorage/mock_storage/mock_storage.go new file mode 100644 index 00000000..0d44e018 --- /dev/null +++ b/common/commonspace/spacestorage/mock_storage/mock_storage.go @@ -0,0 +1,266 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage (interfaces: SpaceStorageProvider,SpaceStorage) + +// Package mock_spacestorage is a generated GoMock package. +package mock_spacestorage + +import ( + reflect "reflect" + + app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + liststorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + treestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" + spacesyncproto "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" + gomock "github.com/golang/mock/gomock" +) + +// MockSpaceStorageProvider is a mock of SpaceStorageProvider interface. +type MockSpaceStorageProvider struct { + ctrl *gomock.Controller + recorder *MockSpaceStorageProviderMockRecorder +} + +// MockSpaceStorageProviderMockRecorder is the mock recorder for MockSpaceStorageProvider. +type MockSpaceStorageProviderMockRecorder struct { + mock *MockSpaceStorageProvider +} + +// NewMockSpaceStorageProvider creates a new mock instance. +func NewMockSpaceStorageProvider(ctrl *gomock.Controller) *MockSpaceStorageProvider { + mock := &MockSpaceStorageProvider{ctrl: ctrl} + mock.recorder = &MockSpaceStorageProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockSpaceStorageProvider) EXPECT() *MockSpaceStorageProviderMockRecorder { + return m.recorder +} + +// CreateSpaceStorage mocks base method. +func (m *MockSpaceStorageProvider) CreateSpaceStorage(arg0 spacestorage.SpaceStorageCreatePayload) (spacestorage.SpaceStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateSpaceStorage", arg0) + ret0, _ := ret[0].(spacestorage.SpaceStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateSpaceStorage indicates an expected call of CreateSpaceStorage. +func (mr *MockSpaceStorageProviderMockRecorder) CreateSpaceStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).CreateSpaceStorage), arg0) +} + +// Init mocks base method. +func (m *MockSpaceStorageProvider) Init(arg0 *app.App) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Init", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Init indicates an expected call of Init. +func (mr *MockSpaceStorageProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Init), arg0) +} + +// Name mocks base method. +func (m *MockSpaceStorageProvider) Name() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Name") + ret0, _ := ret[0].(string) + return ret0 +} + +// Name indicates an expected call of Name. +func (mr *MockSpaceStorageProviderMockRecorder) Name() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockSpaceStorageProvider)(nil).Name)) +} + +// SpaceStorage mocks base method. +func (m *MockSpaceStorageProvider) SpaceStorage(arg0 string) (spacestorage.SpaceStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceStorage", arg0) + ret0, _ := ret[0].(spacestorage.SpaceStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SpaceStorage indicates an expected call of SpaceStorage. +func (mr *MockSpaceStorageProviderMockRecorder) SpaceStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceStorage", reflect.TypeOf((*MockSpaceStorageProvider)(nil).SpaceStorage), arg0) +} + +// MockSpaceStorage is a mock of SpaceStorage interface. +type MockSpaceStorage struct { + ctrl *gomock.Controller + recorder *MockSpaceStorageMockRecorder +} + +// MockSpaceStorageMockRecorder is the mock recorder for MockSpaceStorage. +type MockSpaceStorageMockRecorder struct { + mock *MockSpaceStorage +} + +// NewMockSpaceStorage creates a new mock instance. +func NewMockSpaceStorage(ctrl *gomock.Controller) *MockSpaceStorage { + mock := &MockSpaceStorage{ctrl: ctrl} + mock.recorder = &MockSpaceStorageMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockSpaceStorage) EXPECT() *MockSpaceStorageMockRecorder { + return m.recorder +} + +// AclStorage mocks base method. +func (m *MockSpaceStorage) AclStorage() (liststorage.ListStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "AclStorage") + ret0, _ := ret[0].(liststorage.ListStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// AclStorage indicates an expected call of AclStorage. +func (mr *MockSpaceStorageMockRecorder) AclStorage() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AclStorage", reflect.TypeOf((*MockSpaceStorage)(nil).AclStorage)) +} + +// Close mocks base method. +func (m *MockSpaceStorage) Close() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Close") + ret0, _ := ret[0].(error) + return ret0 +} + +// Close indicates an expected call of Close. +func (mr *MockSpaceStorageMockRecorder) Close() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockSpaceStorage)(nil).Close)) +} + +// CreateTreeStorage mocks base method. +func (m *MockSpaceStorage) CreateTreeStorage(arg0 treestorage.TreeStorageCreatePayload) (treestorage.TreeStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateTreeStorage", arg0) + ret0, _ := ret[0].(treestorage.TreeStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateTreeStorage indicates an expected call of CreateTreeStorage. +func (mr *MockSpaceStorageMockRecorder) CreateTreeStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateTreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).CreateTreeStorage), arg0) +} + +// Id mocks base method. +func (m *MockSpaceStorage) Id() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Id") + ret0, _ := ret[0].(string) + return ret0 +} + +// Id indicates an expected call of Id. +func (mr *MockSpaceStorageMockRecorder) Id() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Id", reflect.TypeOf((*MockSpaceStorage)(nil).Id)) +} + +// SetTreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) SetTreeDeletedStatus(arg0, arg1 string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetTreeDeletedStatus", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetTreeDeletedStatus indicates an expected call of SetTreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) SetTreeDeletedStatus(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).SetTreeDeletedStatus), arg0, arg1) +} + +// SpaceHeader mocks base method. +func (m *MockSpaceStorage) SpaceHeader() (*spacesyncproto.RawSpaceHeaderWithId, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceHeader") + ret0, _ := ret[0].(*spacesyncproto.RawSpaceHeaderWithId) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SpaceHeader indicates an expected call of SpaceHeader. +func (mr *MockSpaceStorageMockRecorder) SpaceHeader() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceHeader", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceHeader)) +} + +// SpaceSettingsId mocks base method. +func (m *MockSpaceStorage) SpaceSettingsId() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SpaceSettingsId") + ret0, _ := ret[0].(string) + return ret0 +} + +// SpaceSettingsId indicates an expected call of SpaceSettingsId. +func (mr *MockSpaceStorageMockRecorder) SpaceSettingsId() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSettingsId", reflect.TypeOf((*MockSpaceStorage)(nil).SpaceSettingsId)) +} + +// StoredIds mocks base method. +func (m *MockSpaceStorage) StoredIds() ([]string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "StoredIds") + ret0, _ := ret[0].([]string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// StoredIds indicates an expected call of StoredIds. +func (mr *MockSpaceStorageMockRecorder) StoredIds() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoredIds", reflect.TypeOf((*MockSpaceStorage)(nil).StoredIds)) +} + +// TreeDeletedStatus mocks base method. +func (m *MockSpaceStorage) TreeDeletedStatus(arg0 string) (string, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeDeletedStatus", arg0) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TreeDeletedStatus indicates an expected call of TreeDeletedStatus. +func (mr *MockSpaceStorageMockRecorder) TreeDeletedStatus(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeDeletedStatus", reflect.TypeOf((*MockSpaceStorage)(nil).TreeDeletedStatus), arg0) +} + +// TreeStorage mocks base method. +func (m *MockSpaceStorage) TreeStorage(arg0 string) (treestorage.TreeStorage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TreeStorage", arg0) + ret0, _ := ret[0].(treestorage.TreeStorage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TreeStorage indicates an expected call of TreeStorage. +func (mr *MockSpaceStorageMockRecorder) TreeStorage(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TreeStorage", reflect.TypeOf((*MockSpaceStorage)(nil).TreeStorage), arg0) +} diff --git a/common/util/cidutil/cid.go b/common/util/cidutil/cid.go index 1d80e97f..a08f130c 100644 --- a/common/util/cidutil/cid.go +++ b/common/util/cidutil/cid.go @@ -5,7 +5,7 @@ import ( mh "github.com/multiformats/go-multihash" ) -func NewCIDFromBytes(data []byte) (string, error) { +func NewCidFromBytes(data []byte) (string, error) { hash, err := mh.Sum(data, mh.SHA2_256, -1) if err != nil { return "", err @@ -13,7 +13,7 @@ func NewCIDFromBytes(data []byte) (string, error) { return cid.NewCidV1(cid.DagCBOR, hash).String(), nil } -func VerifyCID(data []byte, id string) bool { +func VerifyCid(data []byte, id string) bool { hash, err := mh.Sum(data, mh.SHA2_256, -1) if err != nil { return false diff --git a/common/util/peer/peer.go b/common/util/peer/peer.go index 32ea21ee..590a1ac0 100644 --- a/common/util/peer/peer.go +++ b/common/util/peer/peer.go @@ -6,7 +6,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ) -func IDFromSigningPubKey(pubKey signingkey.PubKey) (peer.ID, error) { +func IdFromSigningPubKey(pubKey signingkey.PubKey) (peer.ID, error) { rawSigning, err := pubKey.Raw() if err != nil { return "", err diff --git a/node/acl/service.go b/node/acl/service.go index b71ecebe..b7845a6e 100644 --- a/node/acl/service.go +++ b/node/acl/service.go @@ -125,7 +125,7 @@ func (s *service) signAndMarshal(rawRec *aclrecordproto.RawAclRecord) (recId, pr if payload, err = rawRec.Marshal(); err != nil { return } - recCid, err := cidutil.NewCIDFromBytes(payload) + recCid, err := cidutil.NewCidFromBytes(payload) if err != nil { return } diff --git a/node/acl/service_test.go b/node/acl/service_test.go index a9741975..ca25f8f1 100644 --- a/node/acl/service_test.go +++ b/node/acl/service_test.go @@ -28,7 +28,7 @@ func TestService_CreateLog(t *testing.T) { clog = l }) - aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCidFromBytes([]byte("aclId")) rec := &aclrecordproto.AclRecord{ PrevId: "", @@ -63,7 +63,7 @@ func TestService_AddRecord(t *testing.T) { clog = l }) - aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCidFromBytes([]byte("aclId")) rec := &aclrecordproto.AclRecord{ PrevId: "", @@ -108,7 +108,7 @@ func TestService_Watch(t *testing.T) { fx := newFixture(t) defer fx.Finish(t) var expErr = fmt.Errorf("error") - aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCidFromBytes([]byte("aclId")) aclIdBytes, _ := cidToByte(aclId) fx.mockClient.EXPECT().Watch(aclIdBytes, gomock.Any()).Do(func(aid []byte, w consensusclient.Watcher) { assert.Equal(t, aclIdBytes, aid) @@ -125,14 +125,14 @@ func TestService_Watch(t *testing.T) { t.Run("success", func(t *testing.T) { fx := newFixture(t) defer fx.Finish(t) - aclId, _ := cidutil.NewCIDFromBytes([]byte("aclId")) + aclId, _ := cidutil.NewCidFromBytes([]byte("aclId")) aclIdBytes, _ := cidToByte(aclId) fx.mockClient.EXPECT().Watch(aclIdBytes, gomock.Any()).Do(func(aid []byte, w consensusclient.Watcher) { assert.Equal(t, aclIdBytes, aid) go func() { time.Sleep(time.Millisecond * 10) - r1cid, _ := cidutil.NewCIDFromBytes([]byte("r1")) - r2cid, _ := cidutil.NewCIDFromBytes([]byte("r2")) + r1cid, _ := cidutil.NewCidFromBytes([]byte("r1")) + r2cid, _ := cidutil.NewCidFromBytes([]byte("r2")) r1cidB, _ := cidToByte(r1cid) r2cidB, _ := cidToByte(r2cid) w.AddConsensusRecords([]*consensusproto.Record{ diff --git a/node/acl/util_test.go b/node/acl/util_test.go index e042c49e..1ee3b056 100644 --- a/node/acl/util_test.go +++ b/node/acl/util_test.go @@ -7,7 +7,7 @@ import ( ) func TestCIDLen(t *testing.T) { - s, _ := cidutil.NewCIDFromBytes([]byte("some data")) + s, _ := cidutil.NewCidFromBytes([]byte("some data")) t.Log(s, len(s)) b, _ := cidToByte(s) t.Log(b, len(b)) diff --git a/util/cmd/nodesgen/gen.go b/util/cmd/nodesgen/gen.go index 2aa4888e..76b9d755 100644 --- a/util/cmd/nodesgen/gen.go +++ b/util/cmd/nodesgen/gen.go @@ -210,7 +210,7 @@ func genNodeConfig(addresses []string, apiAddresses []string, num int) (config.C return config.Config{}, err } - peerID, err := peer.IDFromSigningPubKey(signKey.GetPublic()) + peerID, err := peer.IdFromSigningPubKey(signKey.GetPublic()) if err != nil { return config.Config{}, err } @@ -264,7 +264,7 @@ func genClientConfig(addresses []string, apiAddresses []string, encKey encryptio return config.Config{}, err } - peerID, err := peer.IDFromSigningPubKey(peerKey.GetPublic()) + peerID, err := peer.IdFromSigningPubKey(peerKey.GetPublic()) if err != nil { return config.Config{}, err } @@ -318,7 +318,7 @@ func genConsensusConfig(addresses []string) (cconfig.Config, error) { return cconfig.Config{}, err } - peerID, err := peer.IDFromSigningPubKey(signKey.GetPublic()) + peerID, err := peer.IdFromSigningPubKey(signKey.GetPublic()) if err != nil { return cconfig.Config{}, err } @@ -367,7 +367,7 @@ func getFileNodeConfig(addresses []string, num int) (fconfig.Config, error) { return fconfig.Config{}, err } - peerID, err := peer.IDFromSigningPubKey(signKey.GetPublic()) + peerID, err := peer.IdFromSigningPubKey(signKey.GetPublic()) if err != nil { return fconfig.Config{}, err } From 5b98550349b38280cc1d34886e25f0a5b2fd4f66 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 26 Dec 2022 18:05:33 +0100 Subject: [PATCH 08/17] Change port number for file node in deploy --- util/cmd/deploy/deploy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cmd/deploy/deploy.go b/util/cmd/deploy/deploy.go index 9c32fc85..39a23ced 100644 --- a/util/cmd/deploy/deploy.go +++ b/util/cmd/deploy/deploy.go @@ -268,7 +268,7 @@ func runAll(args rootArgs, numClients, numNodes, numFileNodes uint) (err error) return } - filePaths, err := createAppPaths(args, args.fileNodeBinaryPath, "file", 6070, int(numFileNodes)) + filePaths, err := createAppPaths(args, args.fileNodeBinaryPath, "file", 6080, int(numFileNodes)) if err != nil { err = fmt.Errorf("failed to create working directories for clients: %w", err) return From 70163c3aaf2512c5ce0204d672e7d876462c505e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 23 Dec 2022 20:43:06 +0800 Subject: [PATCH 09/17] First integrational test! --- util/cmd/debug/commands/scripts.go | 274 +++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/util/cmd/debug/commands/scripts.go b/util/cmd/debug/commands/scripts.go index 5f1c14f4..e3136866 100644 --- a/util/cmd/debug/commands/scripts.go +++ b/util/cmd/debug/commands/scripts.go @@ -4,13 +4,58 @@ import ( "context" "fmt" clientproto "github.com/anytypeio/go-anytype-infrastructure-experiments/client/api/apiproto" + nodeproto "github.com/anytypeio/go-anytype-infrastructure-experiments/node/api/apiproto" "github.com/spf13/cobra" "github.com/zeebo/errs" + "golang.org/x/exp/slices" "math/rand" "strings" "sync" + "time" ) +type DebugClient struct { + name string + address string +} + +func keepChecking(fn func() bool, finished chan bool) { + ticker := time.NewTicker(time.Second * 1) + + go func() { + for { + select { + case <-ticker.C: + if fn() { + finished <- true + ticker.Stop() + return + } + } + } + }() + + <-finished +} + +func containsFunc[E comparable](s []E, f func(E) bool) bool { + return slices.IndexFunc(s, f) >= 0 +} + +func iterate(shouldStop func(iteration int) bool, wg *sync.WaitGroup, iterationCount int) { + ticker := time.NewTicker(time.Millisecond * 10) + defer wg.Done() + defer ticker.Stop() + for i := 0; i < iterationCount; i++ { + select { + case <-ticker.C: + if shouldStop(i) { + return + } + } + } +} + func (s *service) registerScripts() { cmdAddTextMany := &cobra.Command{ Use: "add-text-many [text]", @@ -76,4 +121,233 @@ func (s *service) registerScripts() { cmdAddTextMany.MarkFlagRequired("document") cmdAddTextMany.MarkFlagRequired("clients") s.scripts = append(s.scripts, cmdAddTextMany) + + integration := &cobra.Command{ + Use: "integration-tests", + Short: "integration-tests", + Args: cobra.RangeArgs(0, 0), + Run: func(cmd *cobra.Command, args []string) { + documentsCount, _ := cmd.Flags().GetInt("documents") + + node1, node2, node3 := + DebugClient{ + name: "Node1", + address: s.peers["node1"], + }, + DebugClient{ + name: "Node2", + address: s.peers["node2"], + }, + DebugClient{ + name: "Node3", + address: s.peers["node3"], + } + + nodes := []DebugClient{node1, node2, node3} + + start := time.Now() + elapsedFunc := func() time.Duration { return time.Since(start) } + + print := func(output string) { + fmt.Printf("%s | %s \n", output, elapsedFunc()) + } + + createSpace := func(client DebugClient) string { + space, err := s.client.CreateSpace(context.Background(), client.address, &clientproto.CreateSpaceRequest{}) + + if err != nil { + panic("can't create a space") + } + + print(fmt.Sprintf("%s: Created a space with id %s", client.name, space.Id)) + + return space.Id + } + + doesNodesContainDocument := func(docId string, spaceId string) map[string]bool { + var dictionary = map[string]bool{} + for _, node := range nodes { + resp, _ := s.node.TreeParams(context.Background(), node.address, &nodeproto.TreeParamsRequest{ + SpaceId: spaceId, + DocumentId: docId, + }) + + dictionary[node.name] = resp.GetHeadIds() != nil + } + + return dictionary + } + + waitUntilLoadSpace := func(spaceId string, client DebugClient) bool { + print(fmt.Sprintf("%s: Trying to load space with id %s", client.name, spaceId)) + + _, err := s.client.LoadSpace(context.Background(), client.address, &clientproto.LoadSpaceRequest{spaceId}) + + if err != nil { + return false + } + + print(fmt.Sprintf("%s: Did load space with id %s", client.name, spaceId)) + + return true + } + + waitUntilSpaceExists := func(groupId string, client DebugClient) bool { + allSpaces, err := s.client.AllSpaces(context.Background(), client.address, &clientproto.AllSpacesRequest{}) + if err != nil { + panic("can't retrieve all spaces") + } + + print(fmt.Sprintf("%s: contains %s, %t", client, groupId, slices.Contains(allSpaces.SpaceIds, groupId))) + return slices.Contains(allSpaces.SpaceIds, groupId) + } + + waitUntilDocumentExists := func(client DebugClient, spaceId string, documentId string) bool { + rs, _ := s.client.AllTrees(context.Background(), client.address, &clientproto.AllTreesRequest{SpaceId: spaceId}) + + contains := containsFunc(rs.Trees, func(c *clientproto.Tree) bool { + return c.Id == documentId + }) + + if !contains { + print(fmt.Sprintf("%s doesn't contain a document %s", client.name, documentId)) + fmt.Println(doesNodesContainDocument(documentId, spaceId)) + } else { + print(fmt.Sprintf("%s contains a document %s", client.name, documentId)) + } + + return contains + } + + addTextFunc := func(iterationNumber int, client DebugClient, spaceId string, documentId string) bool { + randText := func(nonce int) string { + rand.Seed(time.Now().UnixNano()) + buf := make([]byte, nonce*3) + rand.Read(buf) + return string(buf) + } + + r, err := s.client.AddText(context.Background(), client.address, &clientproto.AddTextRequest{ + SpaceId: spaceId, + DocumentId: documentId, + Text: randText(iterationNumber), + IsSnapshot: false, + }) + + if err != nil { + print(client.address + err.Error()) + return true + } else { + print(fmt.Sprintf("%s: Did add text to document %s, head: %s, text: %d", client.name, r.DocumentId, r.HeadId, iterationNumber)) + } + + return false + } + + createDocumentFunc := func(client DebugClient, spaceId string) string { + docResponse, err := s.client.CreateDocument(context.Background(), client.address, &clientproto.CreateDocumentRequest{SpaceId: spaceId}) + + if err != nil { + panic("can't create a document") + } + + print(fmt.Sprintf("%s: Created a document in space %s with id %s", client.name, spaceId, docResponse.Id)) + return docResponse.Id + } + + _ = func(wg *sync.WaitGroup, client DebugClient, spaceId string, docId string) { + time.Sleep(2) + + documentDeletion := func() bool { + print("Will remove document with id" + spaceId + "." + docId) + + _, err := s.client.DeleteDocument(context.Background(), client.address, &clientproto.DeleteDocumentRequest{ + SpaceId: spaceId, + DocumentId: docId, + }) + + return err == nil + } + + var finita = make(chan bool) + go keepChecking(func() bool { return documentDeletion() }, finita) + + wg.Done() + } + + checkHeadsEqual := func(client1 DebugClient, client2 DebugClient, spaceId string, docId string) bool { + rs1, _ := s.client.TreeParams(context.Background(), client1.address, &clientproto.TreeParamsRequest{ + SpaceId: spaceId, + DocumentId: docId, + }) + rs2, _ := s.client.TreeParams(context.Background(), client2.address, &clientproto.TreeParamsRequest{ + SpaceId: spaceId, + DocumentId: docId, + }) + + print(fmt.Sprintf("%s document %s head is %v", client1.name, docId, rs1.GetHeadIds())) + print(fmt.Sprintf("%s document %s head is %v", client2.name, docId, rs2.GetHeadIds())) + + if rs1.GetHeadIds() == nil || rs1.GetHeadIds() == nil { + print("Some head is nil") + return false + } + + return slices.Equal(rs1.GetHeadIds(), rs2.GetHeadIds()) + } + + client1, client2 := DebugClient{ + name: "Client1", + address: s.peers["client1"], + }, DebugClient{ + name: "Client2", + address: s.peers["client2"], + } + + singleTest := func(testGroup *sync.WaitGroup, spaceId string) { + wg := sync.WaitGroup{} + finished := make(chan bool) + + documentId := createDocumentFunc(client2, spaceId) + keepChecking(func() bool { return waitUntilDocumentExists(client1, spaceId, documentId) }, finished) + + wg.Add(2) + go iterate(func(iteration int) bool { + return addTextFunc(iteration, client2, spaceId, documentId) + }, &wg, 70) + go iterate(func(iteration int) bool { + return addTextFunc(iteration, client1, spaceId, documentId) + }, &wg, 100) + + wg.Wait() + + keepChecking(func() bool { return checkHeadsEqual(client1, client2, spaceId, documentId) }, finished) + + print("The End") + + testGroup.Done() + } + + // Start + finished := make(chan bool) + spaceId := createSpace(client1) + + keepChecking(func() bool { return waitUntilLoadSpace(spaceId, client2) }, finished) + keepChecking(func() bool { return waitUntilSpaceExists(spaceId, client2) }, finished) + + wg := sync.WaitGroup{} + + wg.Add(documentsCount) + for i := 0; i < documentsCount; i++ { + go singleTest(&wg, spaceId) + } + + wg.Wait() + + print("Directed by robert b weide") + }, + } + + integration.Flags().Int("documents", 50, "how many documents would be created") + s.scripts = append(s.scripts, integration) } From f86337ffc832d94028a2116097d611d9c519dc01 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 27 Dec 2022 17:57:17 +0800 Subject: [PATCH 10/17] Nodes descriptions added --- util/cmd/debug/commands/scripts.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/util/cmd/debug/commands/scripts.go b/util/cmd/debug/commands/scripts.go index e3136866..fcb81d41 100644 --- a/util/cmd/debug/commands/scripts.go +++ b/util/cmd/debug/commands/scripts.go @@ -164,15 +164,15 @@ func (s *service) registerScripts() { return space.Id } - doesNodesContainDocument := func(docId string, spaceId string) map[string]bool { - var dictionary = map[string]bool{} + nodesDocumentHeads := func(docId string, spaceId string) map[string][]string { + var dictionary = map[string][]string{} for _, node := range nodes { resp, _ := s.node.TreeParams(context.Background(), node.address, &nodeproto.TreeParamsRequest{ SpaceId: spaceId, DocumentId: docId, }) - dictionary[node.name] = resp.GetHeadIds() != nil + dictionary[node.name] = resp.GetHeadIds() } return dictionary @@ -211,7 +211,7 @@ func (s *service) registerScripts() { if !contains { print(fmt.Sprintf("%s doesn't contain a document %s", client.name, documentId)) - fmt.Println(doesNodesContainDocument(documentId, spaceId)) + fmt.Println(nodesDocumentHeads(documentId, spaceId)) } else { print(fmt.Sprintf("%s contains a document %s", client.name, documentId)) } @@ -289,6 +289,7 @@ func (s *service) registerScripts() { print(fmt.Sprintf("%s document %s head is %v", client2.name, docId, rs2.GetHeadIds())) if rs1.GetHeadIds() == nil || rs1.GetHeadIds() == nil { + fmt.Println(nodesDocumentHeads(docId, spaceId)) print("Some head is nil") return false } From 84b21c62c5e6a1d186b29045e8fd795c5519844d Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Tue, 27 Dec 2022 16:50:20 +0300 Subject: [PATCH 11/17] refactor configs --- client/Makefile | 2 +- client/account/service.go | 12 +- client/badgerprovider/config.go | 9 + client/badgerprovider/service.go | 5 +- client/clientspace/service.go | 5 +- client/cmd/client.go | 2 +- client/config/config.go | 75 ++++++ client/debug/clientdebugrpc/clientdebugrpc.go | 12 +- client/filestorage/rpcstore/store_test.go | 13 +- client/go.mod | 47 +++- client/go.sum | 223 ++++++++++++++++-- common/accountservice/accountservice.go | 12 +- .../mock_accountservice/helper.go | 15 ++ .../{config/log.go => app/logger/config.go} | 17 +- .../confconnector}/confconnector.go | 11 +- common/commonspace/config.go | 10 + common/commonspace/headsync/diffsyncer.go | 6 +- common/commonspace/headsync/headsync.go | 4 +- .../object/accountdata/accountdata.go | 1 + .../object/tree/synctree/syncclient.go | 3 +- common/commonspace/objectsync/objectsync.go | 4 +- .../commonspace/objectsync/streamchecker.go | 6 +- common/commonspace/spaceservice.go | 8 +- common/config/account.go | 8 - common/config/anytype.go | 5 - common/config/api.go | 5 - common/config/config.go | 65 ----- common/config/grpc.go | 6 - common/config/metric.go | 5 - common/config/peer.go | 14 -- common/config/space.go | 6 - common/config/storage.go | 5 - common/config/stream.go | 6 - common/metric/config.go | 9 + common/metric/metric.go | 9 +- common/net/config.go | 19 ++ common/net/dialer/dialer.go | 12 +- common/net/rpc/server/drpcserver.go | 17 +- common/net/secureservice/secureservice.go | 3 +- .../{config/nodes.go => nodeconf/config.go} | 12 +- common/nodeconf/configuration.go | 11 + common/nodeconf/service.go | 25 +- consensus/Makefile | 4 +- consensus/account/service.go | 3 +- consensus/config/config.go | 32 ++- consensus/consensusclient/client_test.go | 23 +- etc/configs/client1.yml | 78 +++--- etc/configs/client2.yml | 78 +++--- etc/configs/cons1.yml | 20 +- etc/configs/cons2.yml | 20 +- etc/configs/cons3.yml | 20 +- etc/configs/file1.yml | 20 +- etc/configs/node1.yml | 78 +++--- etc/configs/node2.yml | 78 +++--- etc/configs/node3.yml | 78 +++--- filenode/Makefile | 4 +- filenode/account/service.go | 3 +- filenode/config/config.go | 29 +-- filenode/go.mod | 1 - filenode/go.sum | 2 - node/account/service.go | 3 +- node/cmd/node.go | 2 +- node/config/config.go | 75 ++++++ node/debug/nodedebugrpc/nodedebugrpc.go | 12 +- node/go.mod | 2 +- node/nodespace/service.go | 5 +- node/storage/config.go | 9 + node/storage/storageservice.go | 5 +- util/cmd/nodesgen/gen.go | 168 +++++++------ 69 files changed, 1001 insertions(+), 595 deletions(-) create mode 100644 client/badgerprovider/config.go create mode 100644 client/config/config.go create mode 100644 common/accountservice/mock_accountservice/helper.go rename common/{config/log.go => app/logger/config.go} (67%) rename common/{nodeconf => commonspace/confconnector}/confconnector.go (87%) create mode 100644 common/commonspace/config.go delete mode 100644 common/config/account.go delete mode 100644 common/config/anytype.go delete mode 100644 common/config/api.go delete mode 100644 common/config/config.go delete mode 100644 common/config/grpc.go delete mode 100644 common/config/metric.go delete mode 100644 common/config/peer.go delete mode 100644 common/config/space.go delete mode 100644 common/config/storage.go delete mode 100644 common/config/stream.go create mode 100644 common/metric/config.go create mode 100644 common/net/config.go rename common/{config/nodes.go => nodeconf/config.go} (70%) create mode 100644 node/config/config.go create mode 100644 node/storage/config.go diff --git a/client/Makefile b/client/Makefile index f8466e93..5264ea9a 100644 --- a/client/Makefile +++ b/client/Makefile @@ -8,7 +8,7 @@ proto: build: @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-infrastructure-experiments/client)) - go build -v -o ../bin/client -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/client/cmd + go build -v -o ../bin/anytype-client -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/client/cmd test: go test ./... --cover diff --git a/client/account/service.go b/client/account/service.go index 8aeed2e2..656a4d17 100644 --- a/client/account/service.go +++ b/client/account/service.go @@ -4,7 +4,6 @@ import ( commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" @@ -15,16 +14,12 @@ type service struct { peerId string } -func (s *service) Account() *accountdata.AccountData { - return s.accountData -} - func New() app.Component { return &service{} } func (s *service) Init(a *app.App) (err error) { - acc := a.MustComponent(config.CName).(commonaccount.ConfigGetter).GetAccount() + acc := a.MustComponent("config").(commonaccount.ConfigGetter).GetAccount() decodedEncryptionKey, err := keys.DecodeKeyFromString( acc.EncryptionKey, @@ -60,6 +55,7 @@ func (s *service) Init(a *app.App) (err error) { PeerKey: decodedPeerKey, SignKey: decodedSigningKey, EncKey: decodedEncryptionKey, + PeerId: acc.PeerId, } s.peerId = acc.PeerId @@ -69,3 +65,7 @@ func (s *service) Init(a *app.App) (err error) { func (s *service) Name() (name string) { return commonaccount.CName } + +func (s *service) Account() *accountdata.AccountData { + return s.accountData +} diff --git a/client/badgerprovider/config.go b/client/badgerprovider/config.go new file mode 100644 index 00000000..52727317 --- /dev/null +++ b/client/badgerprovider/config.go @@ -0,0 +1,9 @@ +package badgerprovider + +type configGetter interface { + GetStorage() Config +} + +type Config struct { + Path string `yaml:"path"` +} diff --git a/client/badgerprovider/service.go b/client/badgerprovider/service.go index 64f80c2d..d7ece491 100644 --- a/client/badgerprovider/service.go +++ b/client/badgerprovider/service.go @@ -3,7 +3,6 @@ package badgerprovider import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/dgraph-io/badger/v3" ) @@ -23,8 +22,8 @@ func New() BadgerProvider { } func (s *service) Init(a *app.App) (err error) { - cfg := a.MustComponent(config.CName).(*config.Config) - s.db, err = badger.Open(badger.DefaultOptions(cfg.Storage.Path)) + cfg := a.MustComponent("config").(configGetter).GetStorage() + s.db, err = badger.Open(badger.DefaultOptions(cfg.Path)) return } diff --git a/client/clientspace/service.go b/client/clientspace/service.go index e545003f..904c784c 100644 --- a/client/clientspace/service.go +++ b/client/clientspace/service.go @@ -9,7 +9,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - config2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" "time" ) @@ -30,14 +29,14 @@ type Service interface { } type service struct { - conf config2.Space + conf commonspace.Config spaceCache ocache.OCache commonSpace commonspace.SpaceService spaceStorageProvider spacestorage.SpaceStorageProvider } func (s *service) Init(a *app.App) (err error) { - s.conf = a.MustComponent(config2.CName).(*config2.Config).Space + s.conf = a.MustComponent("config").(commonspace.ConfigGetter).GetSpace() s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.SpaceService) s.spaceStorageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.spaceCache = ocache.New( diff --git a/client/cmd/client.go b/client/cmd/client.go index cbe57c17..dcca82c5 100644 --- a/client/cmd/client.go +++ b/client/cmd/client.go @@ -8,6 +8,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/client/badgerprovider" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/clientspace/clientcache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/debug/clientdebugrpc" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/document" "github.com/anytypeio/go-anytype-infrastructure-experiments/client/filestorage" @@ -17,7 +18,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/dialer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" diff --git a/client/config/config.go b/client/config/config.go new file mode 100644 index 00000000..604713af --- /dev/null +++ b/client/config/config.go @@ -0,0 +1,75 @@ +package config + +import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/badgerprovider" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" + "gopkg.in/yaml.v3" + "os" +) + +const CName = "config" + +func NewFromFile(path string) (c *Config, err error) { + c = &Config{} + data, err := os.ReadFile(path) + if err != nil { + return nil, err + } + if err = yaml.Unmarshal(data, c); err != nil { + return nil, err + } + return +} + +type Config struct { + GrpcServer net.Config `yaml:"grpcServer"` + Account commonaccount.Config `yaml:"account"` + APIServer net.Config `yaml:"apiServer"` + Nodes []nodeconf.NodeConfig `yaml:"nodes"` + Space commonspace.Config `yaml:"space"` + Storage badgerprovider.Config `yaml:"storage"` + Metric metric.Config `yaml:"metric"` + Log logger.Config `yaml:"log"` +} + +func (c *Config) Init(a *app.App) (err error) { + return +} + +func (c Config) Name() (name string) { + return CName +} + +func (c Config) GetNet() net.Config { + return c.GrpcServer +} + +func (c Config) GetDebugNet() net.Config { + return c.APIServer +} + +func (c Config) GetAccount() commonaccount.Config { + return c.Account +} + +func (c Config) GetMetric() metric.Config { + return c.Metric +} + +func (c Config) GetSpace() commonspace.Config { + return c.Space +} + +func (c Config) GetStorage() badgerprovider.Config { + return c.Storage +} + +func (c Config) GetNodes() []nodeconf.NodeConfig { + return c.Nodes +} diff --git a/client/debug/clientdebugrpc/clientdebugrpc.go b/client/debug/clientdebugrpc/clientdebugrpc.go index 4507885f..ad43cf45 100644 --- a/client/debug/clientdebugrpc/clientdebugrpc.go +++ b/client/debug/clientdebugrpc/clientdebugrpc.go @@ -11,7 +11,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "storj.io/drpc" @@ -25,6 +25,10 @@ func New() ClientDebugRpc { return &service{BaseDrpcServer: server.NewBaseDrpcServer()} } +type configGetter interface { + GetDebugNet() net.Config +} + type ClientDebugRpc interface { app.ComponentRunnable drpc.Mux @@ -32,7 +36,7 @@ type ClientDebugRpc interface { type service struct { transport secureservice.SecureService - cfg *config.Config + cfg net.Config spaceService clientspace.Service storageService clientstorage.ClientStorage docService document.Service @@ -46,7 +50,7 @@ func (s *service) Init(a *app.App) (err error) { s.storageService = a.MustComponent(spacestorage.CName).(clientstorage.ClientStorage) s.docService = a.MustComponent(document.CName).(document.Service) s.account = a.MustComponent(accountservice.CName).(accountservice.Service) - s.cfg = a.MustComponent(config.CName).(*config.Config) + s.cfg = a.MustComponent("config").(configGetter).GetDebugNet() s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) s.file = a.MustComponent(fileservice.CName).(fileservice.FileService) return nil @@ -60,7 +64,7 @@ func (s *service) Run(ctx context.Context) (err error) { params := server.Params{ BufferSizeMb: s.cfg.Stream.MaxMsgSizeMb, TimeoutMillis: s.cfg.Stream.TimeoutMilliseconds, - ListenAddrs: s.cfg.APIServer.ListenAddrs, + ListenAddrs: s.cfg.Server.ListenAddrs, Wrapper: func(handler drpc.Handler) drpc.Handler { return handler }, diff --git a/client/filestorage/rpcstore/store_test.go b/client/filestorage/rpcstore/store_test.go index 7ce43728..1f76fcb9 100644 --- a/client/filestorage/rpcstore/store_test.go +++ b/client/filestorage/rpcstore/store_test.go @@ -3,12 +3,15 @@ package rpcstore import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice/mock_accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileblockstore" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonfile/fileproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/rpctest" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" + "github.com/golang/mock/gomock" blocks "github.com/ipfs/go-block-format" "github.com/ipfs/go-cid" "github.com/stretchr/testify/assert" @@ -115,14 +118,16 @@ func newFixture(t *testing.T) *fixture { conf := &config.Config{} for i := 0; i < 11; i++ { - conf.Nodes = append(conf.Nodes, config.Node{ + conf.Nodes = append(conf.Nodes, nodeconf.NodeConfig{ PeerId: fmt.Sprint(i), - Types: []config.NodeType{config.NodeTypeFile}, + Types: []nodeconf.NodeType{nodeconf.NodeTypeFile}, }) } rserv := rpctest.NewTestServer() require.NoError(t, fileproto.DRPCRegisterFile(rserv.Mux, fx.serv)) + fx.ctrl = gomock.NewController(t) fx.a.Register(fx.s). + Register(mock_accountservice.NewAccountServiceWithAccount(fx.ctrl, &accountdata.AccountData{})). Register(rpctest.NewTestPool().WithServer(rserv)). Register(nodeconf.New()). Register(conf) @@ -136,11 +141,13 @@ type fixture struct { s *service a *app.App serv *testServer + ctrl *gomock.Controller } func (fx *fixture) Finish(t *testing.T) { assert.NoError(t, fx.store.Close()) assert.NoError(t, fx.a.Close(ctx)) + fx.ctrl.Finish() } type testServer struct { diff --git a/client/go.mod b/client/go.mod index 9e3a3ef3..46d5d173 100644 --- a/client/go.mod +++ b/client/go.mod @@ -5,27 +5,36 @@ replace github.com/anytypeio/go-anytype-infrastructure-experiments/common => ../ go 1.19 require ( + github.com/VividCortex/ewma v1.2.0 github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-00010101000000-000000000000 + github.com/cheggaaa/mb/v3 v3.0.0-20221122160120-e9034545510c github.com/dgraph-io/badger/v3 v3.2103.3 github.com/gogo/protobuf v1.3.2 + github.com/golang/mock v1.6.0 + github.com/ipfs/go-block-format v0.0.3 + github.com/ipfs/go-cid v0.3.2 + github.com/ipfs/go-ipld-format v0.4.0 github.com/stretchr/testify v1.8.1 + go.uber.org/multierr v1.9.0 go.uber.org/zap v1.24.0 + gopkg.in/yaml.v3 v3.0.1 storj.io/drpc v0.0.32 ) require ( - github.com/VividCortex/ewma v1.2.0 // indirect + github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect github.com/anytypeio/go-anytype-infrastructure-experiments/consensus v0.0.0-20221217135026-4eba413631b3 // indirect github.com/anytypeio/go-chash v0.0.0-20220629194632-4ad1154fe232 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/cheggaaa/mb/v3 v3.0.0-20221122160120-e9034545510c // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/fogleman/gg v1.3.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/goccy/go-graphviz v0.0.9 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect @@ -33,9 +42,31 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/flatbuffers v1.12.1 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/huandu/skiplist v1.2.0 // indirect - github.com/ipfs/go-cid v0.3.2 // indirect + github.com/ipfs/bbloom v0.0.4 // indirect + github.com/ipfs/go-bitfield v1.0.0 // indirect + github.com/ipfs/go-blockservice v0.5.0 // indirect + github.com/ipfs/go-datastore v0.6.0 // indirect + github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect + github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect + github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect + github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect + github.com/ipfs/go-ipfs-files v0.0.3 // indirect + github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect + github.com/ipfs/go-ipfs-util v0.0.2 // indirect + github.com/ipfs/go-ipld-cbor v0.0.6 // indirect + github.com/ipfs/go-ipld-legacy v0.1.1 // indirect + github.com/ipfs/go-log v1.0.5 // indirect github.com/ipfs/go-log/v2 v2.5.1 // indirect + github.com/ipfs/go-merkledag v0.8.1 // indirect + github.com/ipfs/go-metrics-interface v0.0.1 // indirect + github.com/ipfs/go-unixfs v0.4.1 // indirect + github.com/ipfs/go-verifcid v0.0.2 // indirect + github.com/ipld/go-codec-dagpb v1.5.0 // indirect + github.com/ipld/go-ipld-prime v0.19.0 // indirect + github.com/jbenet/goprocess v0.1.4 // indirect github.com/klauspost/compress v1.15.10 // indirect github.com/klauspost/cpuid/v2 v2.2.2 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect @@ -53,25 +84,31 @@ require ( github.com/multiformats/go-multicodec v0.6.0 // indirect github.com/multiformats/go-multihash v0.2.1 // indirect github.com/multiformats/go-varint v0.0.7 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/polydawn/refmt v0.89.0 // indirect github.com/prometheus/client_golang v1.13.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/whyrusleeping/cbor-gen v0.0.0-20221213004032-c09a31a7d5e8 // indirect + github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect github.com/zeebo/blake3 v0.2.3 // indirect github.com/zeebo/errs v1.3.0 // indirect go.opencensus.io v0.23.0 // indirect + go.opentelemetry.io/otel v1.11.2 // indirect + go.opentelemetry.io/otel/trace v1.11.2 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b // indirect golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect golang.org/x/net v0.3.0 // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect golang.org/x/sys v0.3.0 // indirect + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect ) diff --git a/client/go.sum b/client/go.sum index 8fc01f6e..c3707e47 100644 --- a/client/go.sum +++ b/client/go.sum @@ -42,6 +42,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a h1:E/8AP5dFtMhl5KPJz66Kt9G0n+7Sn41Fy1wv9/jHOrc= +github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/anytypeio/go-anytype-infrastructure-experiments/consensus v0.0.0-20221217135026-4eba413631b3 h1:yIyGIb7bRkEngKtQ0Ja5bome2SEnErwTaEvR8dA/WtU= github.com/anytypeio/go-anytype-infrastructure-experiments/consensus v0.0.0-20221217135026-4eba413631b3/go.mod h1:w0i62cRB2jVpjFb2CpPNj5J+ihKqqmBBG9X2+Odekjw= github.com/anytypeio/go-chash v0.0.0-20220629194632-4ad1154fe232 h1:kMPPZYmJgbs4AJfodbg2OCXg5cp+9LPAJcLZJqmcghk= @@ -73,6 +75,8 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/corona10/goimagehash v1.0.2 h1:pUfB0LnsJASMPGEZLj7tGY251vF+qLGqOgEP4rUs6kA= github.com/corona10/goimagehash v1.0.2/go.mod h1:/l9umBhvcHQXVtQO1V6Gp1yD20STawkhRnnX0D1bvVI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -93,6 +97,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -105,10 +111,17 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/goccy/go-graphviz v0.0.9 h1:s/FMMJ1Joj6La3S5ApO3Jk2cwM4LpXECC2muFx3IPQQ= github.com/goccy/go-graphviz v0.0.9/go.mod h1:wXVsXxmyMQU6TN3zGRttjNn3h+iCAS7xQFC6TlNvLhk= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= @@ -127,6 +140,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -160,8 +174,9 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -172,22 +187,106 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU= +github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c= github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U= github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw= github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w= +github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs= +github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0= +github.com/ipfs/go-bitfield v1.0.0 h1:y/XHm2GEmD9wKngheWNNCNL0pzrWXZwCdQGv1ikXknQ= +github.com/ipfs/go-bitfield v1.0.0/go.mod h1:N/UiujQy+K+ceU1EF5EkVd1TNqevLrCQMIcAEPrdtus= +github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ= +github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY= +github.com/ipfs/go-block-format v0.0.3 h1:r8t66QstRp/pd/or4dpnbVfXT5Gt7lOqRvC+/dDTpMc= +github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk= +github.com/ipfs/go-blockservice v0.5.0 h1:B2mwhhhVQl2ntW2EIpaWPwSCxSuqr5fFA93Ms4bYLEY= +github.com/ipfs/go-blockservice v0.5.0/go.mod h1:W6brZ5k20AehbmERplmERn8o2Ni3ZZubvAxaIUeaT6w= +github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= +github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= +github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= +github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M= +github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog= +github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= +github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= github.com/ipfs/go-cid v0.3.2 h1:OGgOd+JCFM+y1DjWPmVH+2/4POtpDzwcr7VgnB7mZXc= github.com/ipfs/go-cid v0.3.2/go.mod h1:gQ8pKqT/sUxGY+tIwy1RPpAojYu7jAyCp5Tz1svoupw= +github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk= +github.com/ipfs/go-datastore v0.6.0 h1:JKyz+Gvz1QEZw0LsX1IBn+JFCJQH4SJVFtM4uWU0Myk= +github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8O4Vn9YAT8= +github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= +github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= +github.com/ipfs/go-ipfs-blockstore v1.2.0 h1:n3WTeJ4LdICWs/0VSfjHrlqpPpl6MZ+ySd3j8qz0ykw= +github.com/ipfs/go-ipfs-blockstore v1.2.0/go.mod h1:eh8eTFLiINYNSNawfZOC7HOxNTxpB1PFuA5E1m/7exE= +github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ= +github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7NapWLY8= +github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8= +github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= +github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ= +github.com/ipfs/go-ipfs-ds-help v1.1.0 h1:yLE2w9RAsl31LtfMt91tRZcrx+e61O5mDxFRR994w4Q= +github.com/ipfs/go-ipfs-ds-help v1.1.0/go.mod h1:YR5+6EaebOhfcqVCyqemItCLthrpVNot+rsOU/5IatU= +github.com/ipfs/go-ipfs-exchange-interface v0.2.0 h1:8lMSJmKogZYNo2jjhUs0izT+dck05pqUw4mWNW9Pw6Y= +github.com/ipfs/go-ipfs-exchange-interface v0.2.0/go.mod h1:z6+RhJuDQbqKguVyslSOuVDhqF9JtTrO3eptSAiW2/Y= +github.com/ipfs/go-ipfs-exchange-offline v0.3.0 h1:c/Dg8GDPzixGd0MC8Jh6mjOwU57uYokgWRFidfvEkuA= +github.com/ipfs/go-ipfs-files v0.0.3 h1:ME+QnC3uOyla1ciRPezDW0ynQYK2ikOh9OCKAEg4uUA= +github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4= +github.com/ipfs/go-ipfs-posinfo v0.0.1 h1:Esoxj+1JgSjX0+ylc0hUmJCOv6V2vFoZiETLR6OtpRs= +github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A= +github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY= +github.com/ipfs/go-ipfs-routing v0.3.0 h1:9W/W3N+g+y4ZDeffSgqhgo7BsBSJwPMcyssET9OWevc= +github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc= +github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8= +github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= +github.com/ipfs/go-ipld-cbor v0.0.6 h1:pYuWHyvSpIsOOLw4Jy7NbBkCyzLDcl64Bf/LZW7eBQ0= +github.com/ipfs/go-ipld-cbor v0.0.6/go.mod h1:ssdxxaLJPXH7OjF5V4NSjBbcfh+evoR4ukuru0oPXMA= +github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms= +github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs= +github.com/ipfs/go-ipld-format v0.3.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM= +github.com/ipfs/go-ipld-format v0.4.0 h1:yqJSaJftjmjc9jEOFYlpkwOLVKv68OD27jFLlSghBlQ= +github.com/ipfs/go-ipld-format v0.4.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM= +github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2cdcc= +github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg= +github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM= +github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8= +github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo= +github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g= github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY= github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI= +github.com/ipfs/go-merkledag v0.8.1 h1:N3yrqSre/ffvdwtHL4MXy0n7XH+VzN8DlzDrJySPa94= +github.com/ipfs/go-merkledag v0.8.1/go.mod h1:uYUlWE34GhbcTjGuUDEcdPzsEtOdnOupL64NgSRjmWI= +github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg= +github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY= +github.com/ipfs/go-peertaskqueue v0.8.0 h1:JyNO144tfu9bx6Hpo119zvbEL9iQ760FHOiJYsUjqaU= +github.com/ipfs/go-unixfs v0.4.1 h1:nmJFKvF+khK03PIWyCxxydD/nkQX315NZDcgvRqMXf0= +github.com/ipfs/go-unixfs v0.4.1/go.mod h1:2SUDFhUSzrcL408B1qpIkJJ5HznnyTzweViPXUAvkNg= +github.com/ipfs/go-verifcid v0.0.2 h1:XPnUv0XmdH+ZIhLGKg6U2vaPaRDXb9urMyNVCE7uvTs= +github.com/ipfs/go-verifcid v0.0.2/go.mod h1:40cD9x1y4OWnFXbLNJYRe7MpNvWlMn3LZAG5Wb4xnPU= +github.com/ipld/go-codec-dagpb v1.5.0 h1:RspDRdsJpLfgCI0ONhTAnbHdySGD4t+LHSPK4X1+R0k= +github.com/ipld/go-codec-dagpb v1.5.0/go.mod h1:0yRIutEFD8o1DGVqw4RSHh+BUTlJA9XWldxaaWR/o4g= +github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8= +github.com/ipld/go-ipld-prime v0.19.0 h1:5axC7rJmPc17Emw6TelxGwnzALk0PdupZ2oj2roDj04= +github.com/ipld/go-ipld-prime v0.19.0/go.mod h1:Q9j3BaVXwaA3o5JUDNvptDDr/x8+F7FG6XJ8WI3ILg4= +github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= +github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= +github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= +github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -196,8 +295,12 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= @@ -206,24 +309,36 @@ github.com/klauspost/compress v1.15.10/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrD github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= -github.com/klauspost/cpuid/v2 v2.1.1 h1:t0wUqjowdm8ezddV5k0tLWVklVuvLJpoHeb4WBdydm0= -github.com/klauspost/cpuid/v2 v2.1.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.2 h1:xPMwiykqNK9VK0NYC3+jTMYv9I6Vl3YdjZgPZKG3zO0= github.com/klauspost/cpuid/v2 v2.2.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/koron/go-ssdp v0.0.3 h1:JivLMY45N76b4p/vsWGOKewBQu6uf39y8l+AQ7sDKx8= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c= github.com/libp2p/go-libp2p v0.23.2 h1:yqyTeKQJyofWXxEv/eEVUvOrGdt/9x+0PIQ4N1kaxmE= github.com/libp2p/go-libp2p v0.23.2/go.mod h1:s9DEa5NLR4g+LZS+md5uGU4emjMWFiqkZr6hBTY8UxI= +github.com/libp2p/go-libp2p-asn-util v0.2.0 h1:rg3+Os8jbnO5DxkC7K/Utdi+DkY3q/d1/1q+8WeNAsw= +github.com/libp2p/go-libp2p-record v0.2.0 h1:oiNUOCWno2BFuxt3my4i1frNrt7PerzB3queqa1NkQ0= +github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= +github.com/libp2p/go-msgio v0.2.0 h1:W6shmB+FeynDrUVl2dgFQvzfBZcXiyqY4VmpQLu9FqU= +github.com/libp2p/go-nat v0.1.0 h1:MfVsH6DLcpa04Xr+p8hmVRG4juse0s3J8HyNWYHffXg= +github.com/libp2p/go-netroute v0.2.0 h1:0FpsbsvuSnAhXFnCY0VLFbJOzaK0VnP0r1QT/o4nWRE= github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo= github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6gNdOBQMtc= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -231,6 +346,10 @@ github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= +github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= +github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= +github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -240,28 +359,46 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= +github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= -github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= +github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= github.com/multiformats/go-multiaddr v0.7.0 h1:gskHcdaCyPtp9XskVwtvEeQOG465sCohbQIirSyqxrc= github.com/multiformats/go-multiaddr v0.7.0/go.mod h1:Fs50eBDWvZu+l3/9S6xAE7ZYj6yhxlvaVZjakWN7xRs= +github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A= +github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= +github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs= +github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= github.com/multiformats/go-multibase v0.1.1 h1:3ASCDsuLX8+j4kx58qnJ4YFq/JWTJpCyDW27ztsVTOI= github.com/multiformats/go-multibase v0.1.1/go.mod h1:ZEjHE+IsUrgp5mhlEAYjMtZwK1k4haNkcaPg9aoe1a8= github.com/multiformats/go-multicodec v0.6.0 h1:KhH2kSuCARyuJraYMFxrNO3DqIaYhOdS039kbhgVwpE= github.com/multiformats/go-multicodec v0.6.0/go.mod h1:GUC8upxSBE4oG+q3kWZRw/+6yC1BqO550bjhWsJbZlw= +github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U= +github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= +github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= +github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= +github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg= github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d16Vve9l108= github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc= -github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= +github.com/multiformats/go-multistream v0.3.3 h1:d5PZpjwRgVlbwfdTDjife7XszfZd8KYWfROYFlGcR8o= +github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= +github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8= github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY= github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -269,6 +406,10 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= +github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= +github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= +github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -295,10 +436,20 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -320,10 +471,22 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/warpfork/go-testmark v0.10.0 h1:E86YlUMYfwIacEsQGlnTvjk1IgYkyTGjPhF0RnwTCmw= +github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI= +github.com/whyrusleeping/cbor-gen v0.0.0-20221213004032-c09a31a7d5e8 h1:wGJHI5UqTlrtrgpA5kaQACNegkEHGhG/6Lmc7QORfqI= +github.com/whyrusleeping/cbor-gen v0.0.0-20221213004032-c09a31a7d5e8/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= +github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E= +github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8= +github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -346,29 +509,37 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= +go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= +go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -405,11 +576,13 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -439,8 +612,7 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5 h1:KafLifaRFIuSJ5C+7CyFJOF9haxKNC1CEIDk8GX6X0k= -golang.org/x/net v0.0.0-20220920183852-bf014ff85ad5/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -460,11 +632,16 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -474,6 +651,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -495,6 +673,7 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -505,9 +684,10 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -520,12 +700,14 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -535,6 +717,8 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -562,11 +746,15 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -658,6 +846,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/common/accountservice/accountservice.go b/common/accountservice/accountservice.go index 971de9bc..1ea30c24 100644 --- a/common/accountservice/accountservice.go +++ b/common/accountservice/accountservice.go @@ -4,7 +4,6 @@ package accountservice import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" ) const CName = "common.accountservice" @@ -14,6 +13,13 @@ type Service interface { Account() *accountdata.AccountData } -type ConfigGetter interface { - GetAccount() config.Account +type Config struct { + PeerId string `yaml:"peerId"` + PeerKey string `yaml:"peerKey"` + SigningKey string `yaml:"signingKey"` + EncryptionKey string `yaml:"encryptionKey"` +} + +type ConfigGetter interface { + GetAccount() Config } diff --git a/common/accountservice/mock_accountservice/helper.go b/common/accountservice/mock_accountservice/helper.go new file mode 100644 index 00000000..594af462 --- /dev/null +++ b/common/accountservice/mock_accountservice/helper.go @@ -0,0 +1,15 @@ +package mock_accountservice + +import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" + "github.com/golang/mock/gomock" +) + +func NewAccountServiceWithAccount(ctrl *gomock.Controller, acc *accountdata.AccountData) *MockService { + mock := NewMockService(ctrl) + mock.EXPECT().Name().Return(accountservice.CName).AnyTimes() + mock.EXPECT().Init(gomock.Any()).AnyTimes() + mock.EXPECT().Account().Return(acc).AnyTimes() + return mock +} diff --git a/common/config/log.go b/common/app/logger/config.go similarity index 67% rename from common/config/log.go rename to common/app/logger/config.go index ca7bffea..2f3547ce 100644 --- a/common/config/log.go +++ b/common/app/logger/config.go @@ -1,17 +1,14 @@ -package config +package logger -import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "go.uber.org/zap" -) +import "go.uber.org/zap" -type Log struct { +type Config struct { Production bool `yaml:"production"` DefaultLevel string `yaml:"defaultLevel"` NamedLevels map[string]string `yaml:"namedLevels"` } -func (l Log) ApplyGlobal() { +func (l Config) ApplyGlobal() { var conf zap.Config if l.Production { conf = zap.NewProductionConfig() @@ -29,8 +26,8 @@ func (l Log) ApplyGlobal() { } defaultLogger, err := conf.Build() if err != nil { - logger.Default().Fatal("can't build logger", zap.Error(err)) + Default().Fatal("can't build logger", zap.Error(err)) } - logger.SetDefault(defaultLogger) - logger.SetNamedLevels(levels) + SetDefault(defaultLogger) + SetNamedLevels(levels) } diff --git a/common/nodeconf/confconnector.go b/common/commonspace/confconnector/confconnector.go similarity index 87% rename from common/nodeconf/confconnector.go rename to common/commonspace/confconnector/confconnector.go index a4ac839c..b2fffbc2 100644 --- a/common/nodeconf/confconnector.go +++ b/common/commonspace/confconnector/confconnector.go @@ -1,29 +1,30 @@ -package nodeconf +package confconnector import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/slice" ) type ConfConnector interface { - Configuration() Configuration + Configuration() nodeconf.Configuration Pool() pool.Pool GetResponsiblePeers(ctx context.Context, spaceId string) ([]peer.Peer, error) DialInactiveResponsiblePeers(ctx context.Context, spaceId string, activeNodeIds []string) ([]peer.Peer, error) } type confConnector struct { - conf Configuration + conf nodeconf.Configuration pool pool.Pool } -func NewConfConnector(conf Configuration, pool pool.Pool) ConfConnector { +func NewConfConnector(conf nodeconf.Configuration, pool pool.Pool) ConfConnector { return &confConnector{conf: conf, pool: pool} } -func (s *confConnector) Configuration() Configuration { +func (s *confConnector) Configuration() nodeconf.Configuration { // TODO: think about rewriting this, because these deps should not be exposed return s.conf } diff --git a/common/commonspace/config.go b/common/commonspace/config.go new file mode 100644 index 00000000..befa3ac8 --- /dev/null +++ b/common/commonspace/config.go @@ -0,0 +1,10 @@ +package commonspace + +type ConfigGetter interface { + GetSpace() Config +} + +type Config struct { + GCTTL int `yaml:"gcTTL"` + SyncPeriod int `yaml:"syncPeriod"` +} diff --git a/common/commonspace/headsync/diffsyncer.go b/common/commonspace/headsync/diffsyncer.go index 5e1d6d1e..5ed36ba0 100644 --- a/common/commonspace/headsync/diffsyncer.go +++ b/common/commonspace/headsync/diffsyncer.go @@ -3,6 +3,7 @@ package headsync import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/synctree" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" @@ -11,7 +12,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/rpcerr" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "go.uber.org/zap" "time" ) @@ -26,7 +26,7 @@ type DiffSyncer interface { func newDiffSyncer( spaceId string, diff ldiff.Diff, - confConnector nodeconf.ConfConnector, + confConnector confconnector.ConfConnector, cache treegetter.TreeGetter, storage spacestorage.SpaceStorage, clientFactory spacesyncproto.ClientFactory, @@ -47,7 +47,7 @@ func newDiffSyncer( type diffSyncer struct { spaceId string diff ldiff.Diff - confConnector nodeconf.ConfConnector + confConnector confconnector.ConfConnector cache treegetter.TreeGetter storage spacestorage.SpaceStorage clientFactory spacesyncproto.ClientFactory diff --git a/common/commonspace/headsync/headsync.go b/common/commonspace/headsync/headsync.go index cc050bee..efe03408 100644 --- a/common/commonspace/headsync/headsync.go +++ b/common/commonspace/headsync/headsync.go @@ -4,12 +4,12 @@ package headsync import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ldiff" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settings/deletionstate" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync" "go.uber.org/zap" "strings" @@ -47,7 +47,7 @@ func NewHeadSync( spaceId string, syncPeriod int, storage spacestorage.SpaceStorage, - confConnector nodeconf.ConfConnector, + confConnector confconnector.ConfConnector, cache treegetter.TreeGetter, syncStatus syncstatus.StatusUpdater, log *zap.Logger) HeadSync { diff --git a/common/commonspace/object/accountdata/accountdata.go b/common/commonspace/object/accountdata/accountdata.go index 9331e2fe..d4a5a363 100644 --- a/common/commonspace/object/accountdata/accountdata.go +++ b/common/commonspace/object/accountdata/accountdata.go @@ -10,4 +10,5 @@ type AccountData struct { // TODO: create a convenient constructor for this PeerKey signingkey.PrivKey SignKey signingkey.PrivKey EncKey encryptionkey.PrivKey + PeerId string } diff --git a/common/commonspace/object/tree/synctree/syncclient.go b/common/commonspace/object/tree/synctree/syncclient.go index 034a822f..020918c0 100644 --- a/common/commonspace/object/tree/synctree/syncclient.go +++ b/common/commonspace/object/tree/synctree/syncclient.go @@ -2,6 +2,7 @@ package synctree import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" @@ -19,7 +20,7 @@ type syncClient struct { objectsync.StreamPool RequestFactory spaceId string - connector nodeconf.ConfConnector + connector confconnector.ConfConnector configuration nodeconf.Configuration checker objectsync.StreamChecker diff --git a/common/commonspace/objectsync/objectsync.go b/common/commonspace/objectsync/objectsync.go index 5efbba5b..097706c3 100644 --- a/common/commonspace/objectsync/objectsync.go +++ b/common/commonspace/objectsync/objectsync.go @@ -5,10 +5,10 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/syncobjectgetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectsync/synchandler" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/periodicsync" "go.uber.org/zap" "time" @@ -42,7 +42,7 @@ type objectSync struct { func NewObjectSync( spaceId string, - confConnector nodeconf.ConfConnector, + confConnector confconnector.ConfConnector, periodicSeconds int) (objectSync ObjectSync) { streamPool := newStreamPool(func(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { return objectSync.HandleMessage(ctx, senderId, message) diff --git a/common/commonspace/objectsync/streamchecker.go b/common/commonspace/objectsync/streamchecker.go index 16d00f5c..60455130 100644 --- a/common/commonspace/objectsync/streamchecker.go +++ b/common/commonspace/objectsync/streamchecker.go @@ -3,10 +3,10 @@ package objectsync import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/rpcerr" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "go.uber.org/atomic" "go.uber.org/zap" "golang.org/x/exp/slices" @@ -20,7 +20,7 @@ type StreamChecker interface { type streamChecker struct { spaceId string - connector nodeconf.ConfConnector + connector confconnector.ConfConnector streamPool StreamPool clientFactory spacesyncproto.ClientFactory log *zap.Logger @@ -32,7 +32,7 @@ const streamCheckerInterval = time.Second * 10 func NewStreamChecker( spaceId string, - connector nodeconf.ConfConnector, + connector confconnector.ConfConnector, streamPool StreamPool, clientFactory spacesyncproto.ClientFactory, syncCtx context.Context, diff --git a/common/commonspace/spaceservice.go b/common/commonspace/spaceservice.go index 1af201aa..8eff65f7 100644 --- a/common/commonspace/spaceservice.go +++ b/common/commonspace/spaceservice.go @@ -5,6 +5,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/confconnector" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/headsync" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" @@ -13,7 +14,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" @@ -39,7 +39,7 @@ type SpaceService interface { } type spaceService struct { - config config.Space + config Config account accountservice.Service configurationService nodeconf.Service storageProvider spacestorage.SpaceStorageProvider @@ -48,7 +48,7 @@ type spaceService struct { } func (s *spaceService) Init(a *app.App) (err error) { - s.config = a.MustComponent(config.CName).(*config.Config).Space + s.config = a.MustComponent("config").(ConfigGetter).GetSpace() s.account = a.MustComponent(accountservice.CName).(accountservice.Service) s.storageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.configurationService = a.MustComponent(nodeconf.CName).(nodeconf.Service) @@ -108,7 +108,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { } lastConfiguration := s.configurationService.GetLast() - confConnector := nodeconf.NewConfConnector(lastConfiguration, s.pool) + confConnector := confconnector.NewConfConnector(lastConfiguration, s.pool) syncStatus := syncstatus.NewNoOpSyncStatus() // this will work only for clients, not the best solution, but... diff --git a/common/config/account.go b/common/config/account.go deleted file mode 100644 index 1ca9a8fd..00000000 --- a/common/config/account.go +++ /dev/null @@ -1,8 +0,0 @@ -package config - -type Account struct { - PeerId string `yaml:"peerId"` - PeerKey string `yaml:"peerKey"` - SigningKey string `yaml:"signingKey"` - EncryptionKey string `yaml:"encryptionKey"` -} diff --git a/common/config/anytype.go b/common/config/anytype.go deleted file mode 100644 index 8e637244..00000000 --- a/common/config/anytype.go +++ /dev/null @@ -1,5 +0,0 @@ -package config - -type Anytype struct { - SwarmKey string `yaml:"swarmKey"` -} diff --git a/common/config/api.go b/common/config/api.go deleted file mode 100644 index 25cd3e33..00000000 --- a/common/config/api.go +++ /dev/null @@ -1,5 +0,0 @@ -package config - -type APIServer struct { - Port string `yaml:"port"` -} diff --git a/common/config/config.go b/common/config/config.go deleted file mode 100644 index eb8a8c61..00000000 --- a/common/config/config.go +++ /dev/null @@ -1,65 +0,0 @@ -package config - -import ( - "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "gopkg.in/yaml.v3" - "io/ioutil" -) - -const CName = "config" - -func NewFromFile(path string) (c *Config, err error) { - c = &Config{} - data, err := ioutil.ReadFile(path) - if err != nil { - return nil, err - } - if err = yaml.Unmarshal(data, c); err != nil { - return nil, err - } - return -} - -type Config struct { - Anytype Anytype `yaml:"anytype"` - GrpcServer GrpcServer `yaml:"grpcServer"` - Account Account `yaml:"account"` - APIServer GrpcServer `yaml:"apiServer"` - Nodes []Node `yaml:"nodes"` - Space Space `yaml:"space"` - Storage Storage `yaml:"storage"` - Metric Metric `yaml:"metric"` - Log Log `yaml:"log"` - Stream Stream `yaml:"stream"` -} - -func (c *Config) Init(a *app.App) (err error) { - logger.NewNamed("config").Info(fmt.Sprint(c.Space)) - return -} - -func (c Config) Name() (name string) { - return CName -} - -func (c Config) GetAnytype() Anytype { - return c.Anytype -} - -func (c Config) GetGRPCServer() GrpcServer { - return c.GrpcServer -} - -func (c Config) GetStream() Stream { - return c.Stream -} - -func (c Config) GetAccount() Account { - return c.Account -} - -func (c Config) GetMetric() Metric { - return c.Metric -} diff --git a/common/config/grpc.go b/common/config/grpc.go deleted file mode 100644 index 700c3567..00000000 --- a/common/config/grpc.go +++ /dev/null @@ -1,6 +0,0 @@ -package config - -type GrpcServer struct { - ListenAddrs []string `yaml:"listenAddrs"` - TLS bool `yaml:"tls"` -} diff --git a/common/config/metric.go b/common/config/metric.go deleted file mode 100644 index 8cc29227..00000000 --- a/common/config/metric.go +++ /dev/null @@ -1,5 +0,0 @@ -package config - -type Metric struct { - Addr string `yaml:"addr"` -} diff --git a/common/config/peer.go b/common/config/peer.go deleted file mode 100644 index 17680e2b..00000000 --- a/common/config/peer.go +++ /dev/null @@ -1,14 +0,0 @@ -package config - -type PeerList struct { - MyId struct { - PeerId string `yaml:"peerId"` - PrivKey string `yaml:"privKey"` - } `yaml:"myId"` - Remote []PeerRemote `yaml:"remote"` -} - -type PeerRemote struct { - PeerId string `yaml:"peerId"` - Addr string `yaml:"addr"` -} diff --git a/common/config/space.go b/common/config/space.go deleted file mode 100644 index 5b603715..00000000 --- a/common/config/space.go +++ /dev/null @@ -1,6 +0,0 @@ -package config - -type Space struct { - GCTTL int `yaml:"gcTTL"` - SyncPeriod int `yaml:"syncPeriod"` -} diff --git a/common/config/storage.go b/common/config/storage.go deleted file mode 100644 index ebafe622..00000000 --- a/common/config/storage.go +++ /dev/null @@ -1,5 +0,0 @@ -package config - -type Storage struct { - Path string `yaml:"path"` -} diff --git a/common/config/stream.go b/common/config/stream.go deleted file mode 100644 index e120c2f9..00000000 --- a/common/config/stream.go +++ /dev/null @@ -1,6 +0,0 @@ -package config - -type Stream struct { - TimeoutMilliseconds int `yaml:"timeoutMilliseconds"` - MaxMsgSizeMb int `yaml:"maxMsgSizeMb"` -} diff --git a/common/metric/config.go b/common/metric/config.go new file mode 100644 index 00000000..b53e9e0b --- /dev/null +++ b/common/metric/config.go @@ -0,0 +1,9 @@ +package metric + +type configSource interface { + GetMetric() Config +} + +type Config struct { + Addr string `yaml:"addr"` +} diff --git a/common/metric/metric.go b/common/metric/metric.go index 64ecbd84..3ffb02fd 100644 --- a/common/metric/metric.go +++ b/common/metric/metric.go @@ -3,7 +3,6 @@ package metric import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - config2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -24,16 +23,12 @@ type Metric interface { type metric struct { registry *prometheus.Registry - config config2.Metric -} - -type configSource interface { - GetMetric() config2.Metric + config Config } func (m *metric) Init(a *app.App) (err error) { m.registry = prometheus.NewRegistry() - m.config = a.MustComponent(config2.CName).(configSource).GetMetric() + m.config = a.MustComponent("config").(configSource).GetMetric() return nil } diff --git a/common/net/config.go b/common/net/config.go new file mode 100644 index 00000000..b0cdf564 --- /dev/null +++ b/common/net/config.go @@ -0,0 +1,19 @@ +package net + +type ConfigGetter interface { + GetNet() Config +} + +type Config struct { + Server ServerConfig `yaml:"server"` + Stream StreamConfig `yaml:"stream"` +} + +type ServerConfig struct { + ListenAddrs []string `yaml:"listenAddrs"` +} + +type StreamConfig struct { + TimeoutMilliseconds int `yaml:"timeoutMilliseconds"` + MaxMsgSizeMb int `yaml:"maxMsgSizeMb"` +} diff --git a/common/net/dialer/dialer.go b/common/net/dialer/dialer.go index f016646e..a688629d 100644 --- a/common/net/dialer/dialer.go +++ b/common/net/dialer/dialer.go @@ -5,10 +5,11 @@ import ( "errors" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + net2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/timeoutconn" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/libp2p/go-libp2p/core/sec" "go.uber.org/zap" "net" @@ -38,7 +39,7 @@ type Dialer interface { type dialer struct { transport secureservice.SecureService - config *config.Config + config net2.Config peerAddrs map[string][]string mu sync.RWMutex @@ -46,11 +47,8 @@ type dialer struct { func (d *dialer) Init(a *app.App) (err error) { d.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) - d.config = a.MustComponent(config.CName).(*config.Config) - d.peerAddrs = map[string][]string{} - for _, n := range d.config.Nodes { - d.peerAddrs[n.PeerId] = []string{n.Address} - } + d.peerAddrs = a.MustComponent(nodeconf.CName).(nodeconf.Service).GetLast().Addresses() + d.config = a.MustComponent("config").(net2.ConfigGetter).GetNet() return } diff --git a/common/net/rpc/server/drpcserver.go b/common/net/rpc/server/drpcserver.go index 5b022486..ef8dc34b 100644 --- a/common/net/rpc/server/drpcserver.go +++ b/common/net/rpc/server/drpcserver.go @@ -4,8 +4,8 @@ import ( "context" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/prometheus/client_golang/prometheus" "storj.io/drpc" @@ -24,20 +24,15 @@ type DRPCServer interface { drpc.Mux } -type configGetter interface { - GetGRPCServer() config.GrpcServer - GetStream() config.Stream -} - type drpcServer struct { - config configGetter + config net.Config metric metric.Metric transport secureservice.SecureService *BaseDrpcServer } func (s *drpcServer) Init(a *app.App) (err error) { - s.config = a.MustComponent(config.CName).(configGetter) + s.config = a.MustComponent("config").(net.ConfigGetter).GetNet() s.metric = a.MustComponent(metric.CName).(metric.Metric) s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) return nil @@ -63,9 +58,9 @@ func (s *drpcServer) Run(ctx context.Context) (err error) { return } params := Params{ - BufferSizeMb: s.config.GetStream().MaxMsgSizeMb, - TimeoutMillis: s.config.GetStream().TimeoutMilliseconds, - ListenAddrs: s.config.GetGRPCServer().ListenAddrs, + BufferSizeMb: s.config.Stream.MaxMsgSizeMb, + TimeoutMillis: s.config.Stream.TimeoutMilliseconds, + ListenAddrs: s.config.Server.ListenAddrs, Wrapper: func(handler drpc.Handler) drpc.Handler { return &metric.PrometheusDRPC{ Handler: handler, diff --git a/common/net/secureservice/secureservice.go b/common/net/secureservice/secureservice.go index 49353e91..a6dd7e06 100644 --- a/common/net/secureservice/secureservice.go +++ b/common/net/secureservice/secureservice.go @@ -5,7 +5,6 @@ import ( commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/sec" @@ -36,7 +35,7 @@ type secureService struct { } func (s *secureService) Init(a *app.App) (err error) { - account := a.MustComponent(config.CName).(commonaccount.ConfigGetter).GetAccount() + account := a.MustComponent("config").(commonaccount.ConfigGetter).GetAccount() pkb, err := keys.DecodeBytesFromString(account.PeerKey) if err != nil { return diff --git a/common/config/nodes.go b/common/nodeconf/config.go similarity index 70% rename from common/config/nodes.go rename to common/nodeconf/config.go index ae6217f3..a1985be2 100644 --- a/common/config/nodes.go +++ b/common/nodeconf/config.go @@ -1,4 +1,4 @@ -package config +package nodeconf type NodeType string @@ -8,15 +8,19 @@ const ( NodeTypeFile NodeType = "file" ) -type Node struct { +type configGetter interface { + GetNodes() []NodeConfig +} + +type NodeConfig struct { PeerId string `yaml:"peerId"` - Address string `yaml:"address"` + Addresses []string `yaml:"address"` SigningKey string `yaml:"signingKey,omitempty"` EncryptionKey string `yaml:"encryptionKey,omitempty"` Types []NodeType `yaml:"types,omitempty"` } -func (n Node) HasType(t NodeType) bool { +func (n NodeConfig) HasType(t NodeType) bool { for _, nt := range n.Types { if nt == t { return true diff --git a/common/nodeconf/configuration.go b/common/nodeconf/configuration.go index 9e27742b..6f5a62a9 100644 --- a/common/nodeconf/configuration.go +++ b/common/nodeconf/configuration.go @@ -16,6 +16,8 @@ type Configuration interface { FilePeers() []string // ConsensusPeers returns list of consensusnodes ConsensusPeers() []string + // Addresses returns map[peerId][]addr with connection addresses for all known nodes + Addresses() map[string][]string } type configuration struct { @@ -24,6 +26,7 @@ type configuration struct { filePeers []string consensusPeers []string chash chash.CHash + allMembers []NodeConfig } func (c *configuration) Id() string { @@ -57,3 +60,11 @@ func (c *configuration) FilePeers() []string { func (c *configuration) ConsensusPeers() []string { return c.consensusPeers } + +func (c *configuration) Addresses() map[string][]string { + res := make(map[string][]string) + for _, m := range c.allMembers { + res[m.PeerId] = m.Addresses + } + return res +} diff --git a/common/nodeconf/service.go b/common/nodeconf/service.go index 29fef97f..d58ead48 100644 --- a/common/nodeconf/service.go +++ b/common/nodeconf/service.go @@ -1,9 +1,9 @@ package nodeconf import ( + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" @@ -35,7 +35,7 @@ type service struct { } type Node struct { - Address string + Addresses []string PeerId string SigningKey signingkey.PubKey EncryptionKey encryptionkey.PubKey @@ -50,8 +50,8 @@ func (n *Node) Capacity() float64 { } func (s *service) Init(a *app.App) (err error) { - conf := a.MustComponent(config.CName).(*config.Config) - s.accountId = conf.Account.PeerId + nodesConf := a.MustComponent("config").(configGetter).GetNodes() + s.accountId = a.MustComponent(commonaccount.CName).(commonaccount.Service).Account().PeerId fileConfig := &configuration{ id: "config", @@ -63,9 +63,10 @@ func (s *service) Init(a *app.App) (err error) { }); err != nil { return } - members := make([]chash.Member, 0, len(conf.Nodes)) - for _, n := range conf.Nodes { - if n.HasType(config.NodeTypeTree) { + + members := make([]chash.Member, 0, len(nodesConf)) + for _, n := range nodesConf { + if n.HasType(NodeTypeTree) { var member *Node member, err = nodeFromConfigNode(n) if err != nil { @@ -76,12 +77,13 @@ func (s *service) Init(a *app.App) (err error) { if n.PeerId == s.accountId { continue } - if n.HasType(config.NodeTypeConsensus) { + if n.HasType(NodeTypeConsensus) { fileConfig.consensusPeers = append(fileConfig.consensusPeers, n.PeerId) } - if n.HasType(config.NodeTypeFile) { + if n.HasType(NodeTypeFile) { fileConfig.filePeers = append(fileConfig.filePeers, n.PeerId) } + fileConfig.allMembers = append(fileConfig.allMembers, n) } if err = fileConfig.chash.AddMembers(members...); err != nil { return @@ -103,8 +105,7 @@ func (s *service) GetById(id string) Configuration { panic("implement me") } -func nodeFromConfigNode( - n config.Node) (*Node, error) { +func nodeFromConfigNode(n NodeConfig) (*Node, error) { decodedSigningKey, err := keys.DecodeKeyFromString( n.SigningKey, signingkey.UnmarshalEd25519PrivateKey, @@ -122,7 +123,7 @@ func nodeFromConfigNode( } return &Node{ - Address: n.Address, + Addresses: n.Addresses, PeerId: n.PeerId, SigningKey: decodedSigningKey.GetPublic(), EncryptionKey: decodedEncryptionKey.GetPublic(), diff --git a/consensus/Makefile b/consensus/Makefile index f48adb7e..4afd2df8 100644 --- a/consensus/Makefile +++ b/consensus/Makefile @@ -6,7 +6,7 @@ proto: build: @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-infrastructure-experiments/consensus)) - go build -v -o ../bin/consensus-node -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/cmd + go build -v -o ../bin/anytype-consensus -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/cmd test: - go test ./... --cover \ No newline at end of file + go test ./... --cover diff --git a/consensus/account/service.go b/consensus/account/service.go index 629a0de4..bb862cbd 100644 --- a/consensus/account/service.go +++ b/consensus/account/service.go @@ -4,7 +4,6 @@ import ( commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" @@ -24,7 +23,7 @@ func New() app.Component { } func (s *service) Init(a *app.App) (err error) { - acc := a.MustComponent(config.CName).(commonaccount.ConfigGetter).GetAccount() + acc := a.MustComponent("config").(commonaccount.ConfigGetter).GetAccount() decodedEncryptionKey, err := keys.DecodeKeyFromString( acc.EncryptionKey, diff --git a/consensus/config/config.go b/consensus/config/config.go index 5735ae17..ac1557ba 100644 --- a/consensus/config/config.go +++ b/consensus/config/config.go @@ -1,17 +1,20 @@ package config import ( + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "gopkg.in/yaml.v3" - "io/ioutil" + "os" ) -const CName = config.CName +const CName = "config" func NewFromFile(path string) (c *Config, err error) { c = &Config{} - data, err := ioutil.ReadFile(path) + data, err := os.ReadFile(path) if err != nil { return nil, err } @@ -22,12 +25,11 @@ func NewFromFile(path string) (c *Config, err error) { } type Config struct { - GrpcServer config.GrpcServer `yaml:"grpcServer"` - Account config.Account `yaml:"account"` - Mongo Mongo `yaml:"mongo"` - Metric config.Metric `yaml:"metric"` - Log config.Log `yaml:"log"` - Stream config.Stream `yaml:"stream"` + GrpcServer net.Config `yaml:"grpcServer"` + Account commonaccount.Config `yaml:"account"` + Mongo Mongo `yaml:"mongo"` + Metric metric.Config `yaml:"metric"` + Log logger.Config `yaml:"log"` } func (c *Config) Init(a *app.App) (err error) { @@ -42,18 +44,14 @@ func (c Config) GetMongo() Mongo { return c.Mongo } -func (c Config) GetGRPCServer() config.GrpcServer { +func (c Config) GetNet() net.Config { return c.GrpcServer } -func (c Config) GetStream() config.Stream { - return c.Stream -} - -func (c Config) GetAccount() config.Account { +func (c Config) GetAccount() commonaccount.Config { return c.Account } -func (c Config) GetMetric() config.Metric { +func (c Config) GetMetric() metric.Config { return c.Metric } diff --git a/consensus/consensusclient/client_test.go b/consensus/consensusclient/client_test.go index 8ca61f51..cb11ad03 100644 --- a/consensus/consensusclient/client_test.go +++ b/consensus/consensusclient/client_test.go @@ -3,8 +3,9 @@ package consensusclient import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice/mock_accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/rpctest" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" @@ -137,20 +138,21 @@ func newFixture(t *testing.T) *fixture { fx.drpcTS = rpctest.NewTestServer() require.NoError(t, consensusproto.DRPCRegisterConsensus(fx.drpcTS.Mux, fx.testServer)) fx.a.Register(fx.Service). + Register(mock_accountservice.NewAccountServiceWithAccount(fx.ctrl, &accountdata.AccountData{})). Register(fx.nodeconf). Register(rpctest.NewTestPool().WithServer(fx.drpcTS)). - Register(&config.Config{Nodes: []config.Node{ + Register(&testConfig{Nodes: []nodeconf.NodeConfig{ { PeerId: "c1", - Types: []config.NodeType{config.NodeTypeConsensus}, + Types: []nodeconf.NodeType{nodeconf.NodeTypeConsensus}, }, { PeerId: "c2", - Types: []config.NodeType{config.NodeTypeConsensus}, + Types: []nodeconf.NodeType{nodeconf.NodeTypeConsensus}, }, { PeerId: "c3", - Types: []config.NodeType{config.NodeTypeConsensus}, + Types: []nodeconf.NodeType{nodeconf.NodeTypeConsensus}, }, }}) return fx @@ -240,3 +242,14 @@ func (t *testWatcher) AddConsensusError(err error) { close(t.ready) }) } + +type testConfig struct { + Nodes []nodeconf.NodeConfig +} + +func (t testConfig) GetNodes() []nodeconf.NodeConfig { + return t.Nodes +} + +func (t *testConfig) Init(a *app.App) error { return nil } +func (t *testConfig) Name() string { return "config" } diff --git a/etc/configs/client1.yml b/etc/configs/client1.yml index abb2873d..21565cfe 100755 --- a/etc/configs/client1.yml +++ b/etc/configs/client1.yml @@ -1,51 +1,62 @@ -anytype: - swarmKey: /key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec grpcServer: - listenAddrs: - - 127.0.0.1:4630 - tls: false + server: + listenAddrs: + - 127.0.0.1:4630 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWAFkTthV9yfBHka2XZZ7obiCLeAxTcR1WkWABD894jZhz - peerKey: usEO/nvRwBM4Zb8jgWu7pJVpT2ed1IagN1kE5QZlXMIGgLrhNeoz6r2ITiQbx8dGSPxWxM5AwSaJqoGA+YOmSQ== - signingKey: blF7T3vxMI8qGvQCQpiMpEjKj6XfTKbAvhxgwJXKTBmw8wEcmvu8g0CjhT0lhXdguRB4PBcDeBrMal3Qla6JwQ== - encryptionKey: MIIEowIBAAKCAQEAq/wBUWRcbCNTIgQdlNfyMs+/aMIv5UYoVcJ2uEujzR+pIBnp3GwqBIa77UsfahR2eLQDVjSP4T0J5alTM7BPNgDE//E3gZZzIH8njttxu8FdfNmJv95Iy8QX3fl7MboC/NddZ8Lrw0BmrgUrcDAUK7x6UvYgYTsp2ID+PDbZCTbq1VqCihbS0TLsgR0eq+XF/fO4yaWPrdbOG7+3bKAObDs0MCObBpMlhuUrFYjnwgJLtct+8bElDncsMPckw4fK7ZjbEAbl3n6NtYefa2CXu1ce89avFTVqLU04FDH/jYUYvNuIVB3vdUpHLwpc4+CIDgM3ys/AI3dhmJYyQDAcEwIDAQABAoIBABrDDhlyOoeBP7BtX4UHzWJmvWw5u2Y78o7Vwc+PxZ9nq9OY9LEeC7PEm32jUPIa2QyTRmmlqDXuX5njLVU/vDO1DvKcwHxjwuptnuQ19Y632ipRV4QJvN4oV2ZtKeRlA44AnUJGLJWncdLmbwn4EUt0+rvqHMPEhxBvkiAgkMlEBuVXBWjukIZ3AZsu1DxF+3YkoWO/w9R5E+kGHPmkeYosKONTde6f44/u3OTQ9NA3udDEMIXzF+b1AMObX8aFambbtI7wOx4Dd85r7m1XYFdsoLre+7MHXIfoAUFJQi2Se89iJ9964/BVJEPHvG24LSE8qkn5aqgRr4CqwNPd7UECgYEA47jpfX+4NF9xWR5LzIv66Tfz5w44OeAN8JA8o5596NntbDSSF5dIhc0LJJatWysRLAx80op2L1g1rEzCBu/HEUqpRvjxqoKV/ZIT8nmwoPj3QxXQQzXZ32Pbv8wXoRloIGci4sYrXa2ZbrAct2W1j0DV9fQ3J1OLFuyOfgAAUEMCgYEAwVc8FXWCesW2U+vEu9SnPd5Yy7+D1oaeu6dGepU2s5Z6fPAQADG+WAlRJK1m+vaFOvYFl2nmnhnxLVZsKF9/CFo8KDtP0h8LT2AoS5AXi/OAcEnf5ix/WZp8vK4O73pFmibhSC48YwHz5+LJsZsr9GXoiYQqVDGQoF1Z2orS7/ECgYBmGBLmZwpowJmKwOBu1hsp0CITZvaiS+c0ARaOrJH6gSnGp1MQLI0hH6ptPvh9tTM/smGL6vPNihiWJNugTIPNJtH5tcZzEZS5WHKE9TXRFY2VkAQM/emuE5EDzjaRzVg3nsWvMfVjTF9Llr1pI7pgfUrvuAu6H+Rt5KSFrO53DQKBgQCoZo479rVmsG1GHXanT+s3tUJMfYycv3bk5ic6QFt8Axa/We3l7W3oinz14F9xOmYDXCS0pJYtoVTzc3ITnFIueUIqnLbCwy17vrp6TpBj4v09UOtHNfzak/gP89+ocSzMvw68ayFH73x9voiFPS4E2vq3RLoFyYI6W/UWqJJgUQKBgAjGoLIs2w6BlGAOOB3oxvj6YFpwsRH3E/zATtk08qC6BSuZIY6sIitIzizA3aXzZ4Xks0oMaUykArsix/5hk1akTFoH1IkCmHyq20UvZn15Py+8Z2gFzz97/6fvgeBg73ZtNrwDWv6pu633tuNs4jX4RlSusxm+cvJe/AvveAcT + peerId: 12D3KooWA3snvPWvocpXefCy8bVbLGNB7oFoKfyD4hfEcdGBz29K + peerKey: OL6vRR0FchBkYej86GgysuF+fBMF6l+J7Uz1Ku25VtoDdgvS3TWY8iXSp8DPDyKV+VCdQyRTomWrXdvkW1z6bg== + signingKey: 1ABIkla1rsphFo0PZPzOtVM5DKoJqDd+iIwN11WvFKLQ+10fWq2dZcAddmkyX7utEerlVFH7bqTPquqoVlUqpQ== + encryptionKey: MIIEogIBAAKCAQEArKfNFTVh2k3guPoy0aIHjKdwqmEMEKs4EJWu7kkXzYy1vqQQWb4pyTKoQ/3oaZuyXxib9dzgImIxzSyRXroIgODeapXA3lCR56zf+deJMGf7v/HJpDqK6K0IjJqOnXTKjY4uVcqsXDEFX3er+PunetZoVh3BFt8ZjfeJrfgQ0KN+21Ki7qiB9CuvEMOh4w0a62LitxMfxzK/sRYL8HDWU0m3p+kFPs5eLJOiRC1g9rE2NLtivwOhrNKkx1SaVV8E/4YwZ4guERvgVErzKhc1hFwHtjP+f2ZiIX7l2s0JspSEDyYCUCbEHFDcDEZvgLXjVzh/L18JwXL/gqe2zmd5CwIDAQABAoIBAEMocilRvmI/8K2DBMluESmw564eWacSMpig4I5neA7IMNmaz5FY2sAcKD9qQED0AwnidKfJ5pT5RQ3dzB3glvYqgdlLrt3K0TYglG6GXCKsD8y1rA1piCbBR5YJeHfeufsd1wAf+bNSjhh4YDhVCuxJAgSdRkIzPalvI+q7ly7QBaXJMDs0ywxCombKTnhsJGxMP4d34497J659iIi2T94RjO/vnFKKR73FyxGgcc8/zMzsovVwP/m+PC+d0cuqN6K/2F8bGBRCG684aS7CIjz1tuV4yfY2SsDc77V4Vwu6BJjl1UMeVb8vb16Fuw6j4lhjWsZ9Knpekh8vzTDJE+ECgYEAwX77PVGpb2cwoMzeF2bfIGggmLJHxG6xzcEfTXAImBssOePL+ce3svyECwXGDmqLmayL/N6rDpsu8kSnRGy0h7aYo3N1V+GNAk1QYs+2BjSCMCdpAbdC0/rgoobcAJwOGw4qxvvclxqLNPsV7AbrYA+/CJZsiJNGV9O8TOCSFrUCgYEA5G1s08EEoiVd4tPlphgho1cvsUHRT8iCUbmaNBhhP2ujbR74pg5M6ixFAfrX7FG5b0DzQ/PWDLjiBVyJP8z9NJGE9Ui3THOAumx8bX6J/KrV05bUeR3HE1I0h/5XBUVuqrEZnkwZZsFeWewP1wZGOZDERGhDMgLSMD3nUA3TaL8CgYAGlkMJQFlrQHEIWFELLOZVnRXW/OKyji4hWfytzy2LuAkWY2nTM/hN8IiyM10dqoTcE2KklhPuqFu9xZaIHsc6g33Iuqp49mWteWJOKtIAfhMcfor1kv6EZtr0zXB52NYmF6JfKb3FqxKoGBAT+9xRZdfT/ALv10uiu8OCPnbarQKBgB0+PP5m6XbwnbJaOj4nPLcyhDKHIIq8OqLHxgwBSwHZf9SKcH6hugsIm9UDDf19AOZTRFFgt/hs+tKA5Dk8vvWp44GbS4wIBWTYWp2R44xrOnCaEJ1oyIGatorqbq2IFADaJ1NynpXfD3snk2eNsBPSiq3PQzr1zX7Ljf9bpcL1AoGAEsnMJFnhOD/Lk8v5jR52cuEsi3Ua264JqVaqhTAoYNxoDS+PbUdKUVt7uCKfnHZnUV1Oug69yOqEsQX2JyncdRQ0MbwNHIoeBrdGUgT1MTW8tswRWlBqh4BKVVT2hQrrmlDiRdrwEnkiceDl38nHfnXPTXJoN34qqyCxcY6pmdU= apiServer: - listenAddrs: - - 127.0.0.1:8090 - tls: false + server: + listenAddrs: + - 127.0.0.1:8090 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 nodes: - - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - address: 127.0.0.1:4430 - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + - peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + address: + - 127.0.0.1:4430 + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== types: - tree - - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - address: 127.0.0.1:4431 - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + - peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + address: + - 127.0.0.1:4431 + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== types: - tree - - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - address: 127.0.0.1:4432 - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + - peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + address: + - 127.0.0.1:4432 + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== types: - tree - - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - address: 127.0.0.1:4530 + - peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + address: + - 127.0.0.1:4530 types: - consensus - - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - address: 127.0.0.1:4531 + - peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + address: + - 127.0.0.1:4531 types: - consensus - - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - address: 127.0.0.1:4532 + - peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + address: + - 127.0.0.1:4532 types: - consensus - - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - address: 127.0.0.1:4730 + - peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + address: + - 127.0.0.1:4730 types: - file space: @@ -59,6 +70,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/client2.yml b/etc/configs/client2.yml index 51da8157..c6872449 100755 --- a/etc/configs/client2.yml +++ b/etc/configs/client2.yml @@ -1,51 +1,62 @@ -anytype: - swarmKey: /key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec grpcServer: - listenAddrs: - - 127.0.0.1:4631 - tls: false + server: + listenAddrs: + - 127.0.0.1:4631 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWBvTaK7tTMLDAtEGYGV9sn6TAXop95NmUUrsRSBghN5L9 - peerKey: PreOE1Gf6hRD/SOF9xoLCt6vkegBenMuJaPP6ZFlZi0fRvjBCff16BOicdQjQvx4jtzoWj1NgqUeGXrzJAURDg== - signingKey: blF7T3vxMI8qGvQCQpiMpEjKj6XfTKbAvhxgwJXKTBmw8wEcmvu8g0CjhT0lhXdguRB4PBcDeBrMal3Qla6JwQ== - encryptionKey: MIIEowIBAAKCAQEAq/wBUWRcbCNTIgQdlNfyMs+/aMIv5UYoVcJ2uEujzR+pIBnp3GwqBIa77UsfahR2eLQDVjSP4T0J5alTM7BPNgDE//E3gZZzIH8njttxu8FdfNmJv95Iy8QX3fl7MboC/NddZ8Lrw0BmrgUrcDAUK7x6UvYgYTsp2ID+PDbZCTbq1VqCihbS0TLsgR0eq+XF/fO4yaWPrdbOG7+3bKAObDs0MCObBpMlhuUrFYjnwgJLtct+8bElDncsMPckw4fK7ZjbEAbl3n6NtYefa2CXu1ce89avFTVqLU04FDH/jYUYvNuIVB3vdUpHLwpc4+CIDgM3ys/AI3dhmJYyQDAcEwIDAQABAoIBABrDDhlyOoeBP7BtX4UHzWJmvWw5u2Y78o7Vwc+PxZ9nq9OY9LEeC7PEm32jUPIa2QyTRmmlqDXuX5njLVU/vDO1DvKcwHxjwuptnuQ19Y632ipRV4QJvN4oV2ZtKeRlA44AnUJGLJWncdLmbwn4EUt0+rvqHMPEhxBvkiAgkMlEBuVXBWjukIZ3AZsu1DxF+3YkoWO/w9R5E+kGHPmkeYosKONTde6f44/u3OTQ9NA3udDEMIXzF+b1AMObX8aFambbtI7wOx4Dd85r7m1XYFdsoLre+7MHXIfoAUFJQi2Se89iJ9964/BVJEPHvG24LSE8qkn5aqgRr4CqwNPd7UECgYEA47jpfX+4NF9xWR5LzIv66Tfz5w44OeAN8JA8o5596NntbDSSF5dIhc0LJJatWysRLAx80op2L1g1rEzCBu/HEUqpRvjxqoKV/ZIT8nmwoPj3QxXQQzXZ32Pbv8wXoRloIGci4sYrXa2ZbrAct2W1j0DV9fQ3J1OLFuyOfgAAUEMCgYEAwVc8FXWCesW2U+vEu9SnPd5Yy7+D1oaeu6dGepU2s5Z6fPAQADG+WAlRJK1m+vaFOvYFl2nmnhnxLVZsKF9/CFo8KDtP0h8LT2AoS5AXi/OAcEnf5ix/WZp8vK4O73pFmibhSC48YwHz5+LJsZsr9GXoiYQqVDGQoF1Z2orS7/ECgYBmGBLmZwpowJmKwOBu1hsp0CITZvaiS+c0ARaOrJH6gSnGp1MQLI0hH6ptPvh9tTM/smGL6vPNihiWJNugTIPNJtH5tcZzEZS5WHKE9TXRFY2VkAQM/emuE5EDzjaRzVg3nsWvMfVjTF9Llr1pI7pgfUrvuAu6H+Rt5KSFrO53DQKBgQCoZo479rVmsG1GHXanT+s3tUJMfYycv3bk5ic6QFt8Axa/We3l7W3oinz14F9xOmYDXCS0pJYtoVTzc3ITnFIueUIqnLbCwy17vrp6TpBj4v09UOtHNfzak/gP89+ocSzMvw68ayFH73x9voiFPS4E2vq3RLoFyYI6W/UWqJJgUQKBgAjGoLIs2w6BlGAOOB3oxvj6YFpwsRH3E/zATtk08qC6BSuZIY6sIitIzizA3aXzZ4Xks0oMaUykArsix/5hk1akTFoH1IkCmHyq20UvZn15Py+8Z2gFzz97/6fvgeBg73ZtNrwDWv6pu633tuNs4jX4RlSusxm+cvJe/AvveAcT + peerId: 12D3KooWMNDfQ3veiG7ZKPcQWWC8WWwuoUhKEwoUiertQjpFpqkM + peerKey: /5OcmokQbtnPAEJiRUuSdoW4M8Qe/UyD155FtDSlrDurmYY70d9v8jL6GaU/SO6PtaawiYJbzhIKrVOAtqtOKg== + signingKey: 1ABIkla1rsphFo0PZPzOtVM5DKoJqDd+iIwN11WvFKLQ+10fWq2dZcAddmkyX7utEerlVFH7bqTPquqoVlUqpQ== + encryptionKey: MIIEogIBAAKCAQEArKfNFTVh2k3guPoy0aIHjKdwqmEMEKs4EJWu7kkXzYy1vqQQWb4pyTKoQ/3oaZuyXxib9dzgImIxzSyRXroIgODeapXA3lCR56zf+deJMGf7v/HJpDqK6K0IjJqOnXTKjY4uVcqsXDEFX3er+PunetZoVh3BFt8ZjfeJrfgQ0KN+21Ki7qiB9CuvEMOh4w0a62LitxMfxzK/sRYL8HDWU0m3p+kFPs5eLJOiRC1g9rE2NLtivwOhrNKkx1SaVV8E/4YwZ4guERvgVErzKhc1hFwHtjP+f2ZiIX7l2s0JspSEDyYCUCbEHFDcDEZvgLXjVzh/L18JwXL/gqe2zmd5CwIDAQABAoIBAEMocilRvmI/8K2DBMluESmw564eWacSMpig4I5neA7IMNmaz5FY2sAcKD9qQED0AwnidKfJ5pT5RQ3dzB3glvYqgdlLrt3K0TYglG6GXCKsD8y1rA1piCbBR5YJeHfeufsd1wAf+bNSjhh4YDhVCuxJAgSdRkIzPalvI+q7ly7QBaXJMDs0ywxCombKTnhsJGxMP4d34497J659iIi2T94RjO/vnFKKR73FyxGgcc8/zMzsovVwP/m+PC+d0cuqN6K/2F8bGBRCG684aS7CIjz1tuV4yfY2SsDc77V4Vwu6BJjl1UMeVb8vb16Fuw6j4lhjWsZ9Knpekh8vzTDJE+ECgYEAwX77PVGpb2cwoMzeF2bfIGggmLJHxG6xzcEfTXAImBssOePL+ce3svyECwXGDmqLmayL/N6rDpsu8kSnRGy0h7aYo3N1V+GNAk1QYs+2BjSCMCdpAbdC0/rgoobcAJwOGw4qxvvclxqLNPsV7AbrYA+/CJZsiJNGV9O8TOCSFrUCgYEA5G1s08EEoiVd4tPlphgho1cvsUHRT8iCUbmaNBhhP2ujbR74pg5M6ixFAfrX7FG5b0DzQ/PWDLjiBVyJP8z9NJGE9Ui3THOAumx8bX6J/KrV05bUeR3HE1I0h/5XBUVuqrEZnkwZZsFeWewP1wZGOZDERGhDMgLSMD3nUA3TaL8CgYAGlkMJQFlrQHEIWFELLOZVnRXW/OKyji4hWfytzy2LuAkWY2nTM/hN8IiyM10dqoTcE2KklhPuqFu9xZaIHsc6g33Iuqp49mWteWJOKtIAfhMcfor1kv6EZtr0zXB52NYmF6JfKb3FqxKoGBAT+9xRZdfT/ALv10uiu8OCPnbarQKBgB0+PP5m6XbwnbJaOj4nPLcyhDKHIIq8OqLHxgwBSwHZf9SKcH6hugsIm9UDDf19AOZTRFFgt/hs+tKA5Dk8vvWp44GbS4wIBWTYWp2R44xrOnCaEJ1oyIGatorqbq2IFADaJ1NynpXfD3snk2eNsBPSiq3PQzr1zX7Ljf9bpcL1AoGAEsnMJFnhOD/Lk8v5jR52cuEsi3Ua264JqVaqhTAoYNxoDS+PbUdKUVt7uCKfnHZnUV1Oug69yOqEsQX2JyncdRQ0MbwNHIoeBrdGUgT1MTW8tswRWlBqh4BKVVT2hQrrmlDiRdrwEnkiceDl38nHfnXPTXJoN34qqyCxcY6pmdU= apiServer: - listenAddrs: - - 127.0.0.1:8091 - tls: false + server: + listenAddrs: + - 127.0.0.1:8091 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 nodes: - - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - address: 127.0.0.1:4430 - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + - peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + address: + - 127.0.0.1:4430 + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== types: - tree - - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - address: 127.0.0.1:4431 - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + - peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + address: + - 127.0.0.1:4431 + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== types: - tree - - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - address: 127.0.0.1:4432 - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + - peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + address: + - 127.0.0.1:4432 + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== types: - tree - - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - address: 127.0.0.1:4530 + - peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + address: + - 127.0.0.1:4530 types: - consensus - - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - address: 127.0.0.1:4531 + - peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + address: + - 127.0.0.1:4531 types: - consensus - - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - address: 127.0.0.1:4532 + - peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + address: + - 127.0.0.1:4532 types: - consensus - - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - address: 127.0.0.1:4730 + - peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + address: + - 127.0.0.1:4730 types: - file space: @@ -59,6 +70,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/cons1.yml b/etc/configs/cons1.yml index bc4d29ee..c4789561 100755 --- a/etc/configs/cons1.yml +++ b/etc/configs/cons1.yml @@ -1,12 +1,15 @@ grpcServer: - listenAddrs: - - 127.0.0.1:4530 - tls: false + server: + listenAddrs: + - 127.0.0.1:4530 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - peerKey: aIA/Xrt2sFC/nQYOYS/O4Uan6CBK6CFLl1fo8yFJkfyEGg4UQj4UXhYuLj3MaKd5Ts6f3zIZu60bpk7t2a9qEw== - signingKey: aIA/Xrt2sFC/nQYOYS/O4Uan6CBK6CFLl1fo8yFJkfyEGg4UQj4UXhYuLj3MaKd5Ts6f3zIZu60bpk7t2a9qEw== - encryptionKey: MIIEpAIBAAKCAQEA4FVIVzFvJJnc6Ik+xAYL8YHfgWLCBmKkPL9pzzaKbPNBzEkLLolt6BQQzg4dX23SbcN9KoBBO97v4vhp60xgQNtf0yT0IfBQhs59AYN5SK2HEsH+04EZY7vibPXSaVC+H+tFBgMwOc7ThSlcWyNWpz9be+AW9mFz9XN4RLs5hppESIn5BZVAWN05zm/suYkd+nVU3W+FapELLlqHgtiT+8UvMNP5eREj2pJ8QNlbg50dETAccnZkY6ouxklvD6AE42ENnvlPaZkRHF5yYRrwWwpFmGxAm8y3KFz4uM7ADQ5ndvNx8XdN7YFK7OV9cVfXhQrE2wh1TldrLrF9QSyxLQIDAQABAoIBAQC7Wd4hm9JzoeBhgAWgVmBxIQLVnvHlvUnmxgGLIcS3uuzPvI0PH41fjip+vEEBqslcDDCjZxuT8dssFkT3UwDsCYpc33bYRUgrXZX+xptq/ClbnBLC9wWKSqaOUzqX4+v04lrx64XCMZ5rjqBoKPo8kWhI61yiBb9/VSEzXZ1scCeba6hpjcO0s0Llwd+VfGth5Ur9jHqv9acreT0ZznRlHqcAb7Sh4gWcUHe4j5pEdw+JGrqacTmYnLmXCwqPdYt1IHWIqRAse8cAIi+zBkV2AaTpd5YMJ1s93KPxCjpjXQ5YFe1GV1pupuj3SD5GNN/gjRuitfPTv6wpgA42EEYhAoGBAPIWwIzwg9J/XtCDSuWFPGmJiB8S0NdHBA3U8xEZ2hIj+Os/w4e74P5EXRT+bbddDxEus6FwsmNU2Q94134K7ohOK613Nk0XGWtqjfuge6p5yGBcBNCtwi03M3RP6oLjxgrfQljybfWZ8SontIOT8W/bQL3qy5Otc2KNlWVkkghpAoGBAO05Vaucxxei5Xn2klfgN3dQCaX54ZsdS7Cffah4dZDRG/XkVrvUH0wL1O4h7kcT4bok8HyvazOf2PvZnCkDFXaaKEyyiHNebjZ+TFZEl0guCLPQys2TBk8KVyKoG8ZLpia7u8FiqLWa1VbOQAslKsUDts1/edP+5YC2V+vZJmolAoGBALjFLMllePdcR52V18A+ZNGYKtCsp8Dnbuyvr6VJuetGkWHcFPywJRVsUC8J0eu1lx5iKq/5N+4ggFsSvEZzSYO3RhbregJ0su4NMbjvz/NZZ9pD4Vj0hdPE4fzQUgj8l9cMd7MztUFS8YJfM6OJcykQiuVpI1/fbsW1kmUE0YChAoGABq2niMZIIJU4ap+TbR/lz9kT/HU1cb14ZQeIbRa/EI2igOClxHHrU6O9odqYr62SnD/v+UKi/PgSDr0IlWr9zrH2UnpwNvdAmQ4jLgaOT7zkB9Pn8bOi6NS8sUAUUBfPHKYKWh5h64LpYKE70lSAiL1bBxwAnQQ/B8maXgxl9XUCgYBMObufBmN2Rg2Fhq6a75mZwuH8RzR8SfTOT9v7X50mL/qBup16ALMe4c3F/SDCNwoXv4yikehBjMAKfQ89pp3djHY4OYQv1W5fH1GraoQPCua7jwzS+rooMuihWlXQgIcVOPDV1/YNYFbbnd6oUwz33j+ev8SB6c02IVbq70FY/g== + peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + peerKey: 5Btn70kUmMokNhSDhu3GzuFcbLxK9aRnoyb/zPWkLvu7svtWJZxQDJ5AWYZ4TxGhgb/GbZB1nPjp7Kz+V+J4OQ== + signingKey: 5Btn70kUmMokNhSDhu3GzuFcbLxK9aRnoyb/zPWkLvu7svtWJZxQDJ5AWYZ4TxGhgb/GbZB1nPjp7Kz+V+J4OQ== + encryptionKey: MIIEowIBAAKCAQEA8/3ITa/Tjr46B2UmrCqCBDctoSUMjJGeF8vAZMEQLsR4tn9ngDga9kk6eMwiBJ8u18gqe5ATNghLSkDENQ/tUehkFhZFHdbb/T3eNb3kjD22YFRXuoW/fGPD6BtVQu+ZpZ57u9OU9O51fPcit7DjNM2kBPRrleNJ49Ijye+h/BApCtUSiLEZ/Ivd+CCppnJzyLtokWyZY1VgwXkc5wq+iFXxXAtD6PfE/hNmopkYK9Hh4fy//mNZpxJbtmutFC0TlIvlZe0e9c7ZpTO29TaxyqQ9Kma59OCc/PQ4dD47mMySwD5xi+oY9jJensz8o9eX26L/s1yTSfv+U0recgACpQIDAQABAoIBAQDRn+6h4DhQ4VqV0+/f5z2BRa7sThp0Av/izelkJwMySxazJM7VuF5hzxRviGKJugHS3mSxeF0pBQM6rl5kgGSTBKhI2aVUN68V6jupzJY5byPrq0scM6EKy+Qa3LDqK1TEmF8SRnwp214RmXq4ez8ZtLwAjcaJJpfrJjYdXsa6+bHrwZsOfhETbh10j9LwJAJ4rDUUPGi/7zB1wr75Nm2OlT3aBSPAjW6ISSqjAmi9eTUqjuv8hqqo2MlYcRGCUKMvvcUbAr6QxNClV0X1MM1X69jY5BEVM8X2qkT14/0mAKSBd/3kyB6fopvIsa1q5abYFqxCctt8RJ4MY6iEbTcZAoGBAP1qdGBPCj+Cy16WzvkdNjm2cbBPiJJukNdCnoUt1LGKhSQUgponslJJ9v0BwLTVtPrhuAxu3euOeU+KYHwCsqX8EYk1qEqJxSN/w299kqh22raEPYq9VDjczMm2yEjtkpPaOKw6fvFUUjoVSahE9pa2Kf8Wuwcp8rDjhXj65xRXAoGBAPZ6uZ1WdoHKzZQgsCkqjYkBklbEeuWE2722mT7tymJV2iEmKp9hjRs81lYhuiLdyIF3wJDrDNJsWTQaiZiWdMGYum0+aNA5Ix7YI08Fi5nE3UzU0qdp8FjWx7qKPmJJnMEZ0KIYv/gxwqEB9FkbBVU2ws9gVpe5EJgBTv/I9uNjAoGAaBHpzQtoqABsyGGiigeHF1hnhAKFka06akx/kS3rJSY/2ztZDzmyL70UY37uxtTkyAsebGyzUmNmSlYHnaX1+9hy0yhn/oRpo1R6zDSDoA9/bmkMZQevqNJ0f3pC8kAua+24THKRY0Y/pn7LiwEXS3lv8cRB9oUxl5c4XyCa+W0CgYAlEFlfFoRlihiV4MB8wEBeTNUzpQISB4N/qLispNddKCnP+ExKgUHVybU1aIbz/UPMbDSR1jasYcycMC1mu6E9B3lpOgxK23yzg67zkBLpAZiBmDNBJ4YT5eBM5cLxxr4Cr54W8f/UE69/xKp4x75qjPyIcKU01YhwQyoc/pxZnwKBgAnQAiWxh4c71U/7Q9VzYHbN4w686ymtqsZE3LhOo5i7MsovGDh7ppIZK7K4aYs6imuV4Iai2KXdFCkn1Pe6jwTE30O3IkBxQJiNu19PuoDXKgnhzAtCzeX2wQK0UtLcKERgrIaMCDTBNT9xa8eY2fnLWSa9Bb/U0zky2DXTpWEF mongo: connect: mongodb://localhost:27017/?w=majority database: consensus @@ -17,6 +20,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/cons2.yml b/etc/configs/cons2.yml index dde5ead7..2c84fa5e 100755 --- a/etc/configs/cons2.yml +++ b/etc/configs/cons2.yml @@ -1,12 +1,15 @@ grpcServer: - listenAddrs: - - 127.0.0.1:4531 - tls: false + server: + listenAddrs: + - 127.0.0.1:4531 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - peerKey: sKEX26/7hp9h/u0XQAdBWBeDBl7WLxP0fYMYOlw7pho/Tde8/bFwSjZfHw9X3l//NaFgnbF3iH19y3vDSCUNjQ== - signingKey: sKEX26/7hp9h/u0XQAdBWBeDBl7WLxP0fYMYOlw7pho/Tde8/bFwSjZfHw9X3l//NaFgnbF3iH19y3vDSCUNjQ== - encryptionKey: MIIEpAIBAAKCAQEAyVHYPs+5RWYn9eRYkcR2+kciJ1tO7TUVHm+R3EXKL0/70wjtEgylA1cF5KwjRphkQhLjKGTw3wgXPlHe8KNT42c3/eRrFEikrOhp2OHqfEa0o3KGZTXb4AoRM0DDcWHL2K3A3fvmlHYOGtTzsJUp0NIhBQn0GzWcgJkE4CG6NHbZh3WADeYj8s8qzKeXw9LSzqzkjRix1kushLI9bIaziH4J3ex1L/E03aTHARiWTgLQesrkXl1VixrlYpePgvSeK1H8XJXqZQ9CXSOOO/0kcY00Qc+0djgHvhue4xvcYT2wgYBW/OLZvCpUBwt10JYSB/UShuW6udp+GodviWj2KQIDAQABAoIBAEIzjsfA6SzgFf3vFA0DLRjKMXn9taudTA+RIsbrkDwUsjvIcKUB0XWStVZoIMWDMVzk9xv+bZL6ByKwK364Rsq905TC+09VQAm3966hQ8mQOrCQ5Y78sgwvY06WWm67eRwMryKQRlfFpoe+RVBpDLIll0Qf7MzRyWAkcYz+qku7v9oqhZtp/nuSOuaDsCfK37pck+Ms03+sL/O0RFZq7eBosGnxBwCvuaigBQT/dPSiD3xKGrmwPDMCDfYiCIBcyQIJrULf8Dk+07N82fXJP2aZyJTCW8voFgQ+ZviIqcneh7dxLuKySgYqeGrO32FOKKIorQ0etuM+UvuEBW3CT20CgYEA8fovVzTD/fpnJag1G74RHs4rLBXVhtytcp6nTYF0PdoFJehzWl0V/lEoZvzsdV9REzKWhjpgPmrmDK+E7XgbyTCIWLDLPQfddJ0ZcTAecaouihkmvTWMdWZATPeQKatcwtlMc0/8sH8oSC+Near9ajr87Kb+Sva9afok8RLt2n8CgYEA1Px9peu6e7d35X0IRKZScKuOy9HCKwE5Z0PY1PgQePG2HaukHlrlQil940zyuA2sjAQ6IPecIwyaeFANGg+heOvJ2X/NWUihufTSg+7V7fj/SaMbfp7Jjf3bo1+wZlXYvKU783/XOItwFaNymlKlbQhP5/DkvXApUq6iIR8vy1cCgYEAsfcXKkQcgYbQpdl4ddbsMIPhLKNCT9Wtm0ckNNSo8XSPpLm5XRRpQInf9R6/qfNYZY4nNsFoV3+3gkz0rtJPXUDchp5AW7qVHVcNhzmkqmRHpjmpTC8+BnoVgIXy+TKXHpdCquyBJC3hKnYOzxT7HE4WBtcq32dpF7BpywPo+3ECgYEAqAPCTshFZOEXaOaYRid6cz0yuWBwLqKZmPexrlc+D1qGEqPbJMMJhYbbsxp5gm3vBsky3dzWw+NmW7CylTNtasl+guBJqrwcMGiMRN18z2yUXo+X2ewDDcsLn7aVnjTsc+xY/b6EliuRMNCuUEUQEJH1DwA+QZ6gSoROi5hhiKMCgYBv7shoLVGd+YGADjDoBUszSAL+9OfFB5xQIIUeNTWJnyLBFDgOXCE8Pyo8UO1CmKMoY1CT3n0xdCoRX9EFBrsHjQDLOMePN27IexkPdjm6iMX94QNWHYg0X9hD2zcNkF0v4mRmIAafZmPOWbVzVdmNhNFN3Vfkss+jMNtNOaCiIg== + peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + peerKey: SWdUoOefb/9zMLAYBgoNunIq4tzXm5Lr9Czn/Hs2IEO7DxBIWh7yjXSXpI5maURS7clClZOBe5PVO+1HCPKR2g== + signingKey: SWdUoOefb/9zMLAYBgoNunIq4tzXm5Lr9Czn/Hs2IEO7DxBIWh7yjXSXpI5maURS7clClZOBe5PVO+1HCPKR2g== + encryptionKey: MIIEpAIBAAKCAQEAsQGYl8hNwYzrug/FZ/K37dzUGxf6a2/tpMCVNTDwW5+UfGsWg4m1yuQwn3LubKIO9imC+jVLZ2XYisdu6WttFmdMzYUxflza5/xkuUjGuLkptKZeL996rP2xioKfMWaWjo8OpJ/jVr9HWx4buFWLqI01gwarXi5DnGKEg7BdvzcAeJO3k9VhhMTR5o5nCHRHaHH+EbOKV7rG+unDQYmoz1WgogJMbzNFTkOL8jxKpnGg36QDOtEQhngSyA/2f+nhucEihX5s7IfC5qw0cFHPovDxn0MSGAPYDxTsgZ/A9jz5agFDQ2PrTHJN0YWXg8IEvZ02A2kDVWos0pEGlE/OxQIDAQABAoIBAGPfVKv/lu/ohXEcSPQX3XPWr88Bvog0RVA6YXX7wQLRjcSN38wkPXDXRCAThzfAUNTQI1juDTewHXhggtItjQWhD5K+3mhAGDvhCywIRiggQcnuPSKh4+QL2MsgXJZRHg4d5dM5a9qcXrSozlc53W0jD9h4QOUJEZkBdWegcaTbgOovYwmMvsCEOQ8pDObd/uqWx/iid98//VtzEEDPw8/gC5hqMoJiQb1WPJ8y3Vrh94hinde6SHiwb7po36geMcsQ0kaWv3fAimyWW9YZSBgvBTnwRPXJXsnoIbYYkEH5GOV1d4l59RzMqDIzCuQGiDVmwQ1qhQ7Cz7lVHFlJcsECgYEAxIfCQUovW0Zyn6Fro9h6tvMccwWKRMLYkQPyOCMZNKwpbE4PxxvENJfr1jdQ/lljZbot1kmzqilfKOOCH4DCtwoRvZ985h/3wbw3IIOIiWeSoHq0dxm4kN6dXu2F3VyyVjz5XgJ1IL60hG6+XA0vkQ8ILDOac3MsvgrcKzBiz+kCgYEA5pFnIS7pzH8gtqSMXbI/Dyjg1KvNqaYqG/c2mbo1Gubm1tmTxAfe24vSTaOpSj1b3PL2xrpPrG6QlRRqb1ob3nR2E3I0RaLRCc/UUm/RVNfc41Kuisd5pQPq9nJ0CdM3A9TbRs54hyHFc1ObtN85hFbYyLTS6Avx+21wKzlZun0CgYEAsN4MsH13CQnpdkfre1UDe0pnPAysVx2TkU6f2m2b7Y9S6CmIgYQ3m61tjSfTOFRx48ceIU/K5US+Yyn8nSVgFyJ0vNafrOrwKeadJiG56w7PIqXLa7Q2KgpuTlQsuP8HcB0HvtcvWfzGsLiJkIY9XKrOjBkU0vnANnfHlQbCpqECgYEAkDnWHAC/iQbgzL8Dery8C1yTvxS08nEZmCK8yc6b13cmYLD7aL1Pn1/ILn64r9LP+tcUnN0AZ6lF0atSpNLl6fJJxgJDRmgBgLS7aNG/TOY2qxAWVINQyXM47+5KPbcci84DWDhhVo4+d9SN6sdTsD+vHWVXJIYMWS1s4+zc/vUCgYAkTPNny+Anx6/WS2bQ2rRz/w+K6CWA4JPxaZW04eX5RrBd6PbAyI6xmU8YfbcM4OegZUzGybmqCxkIGN8vgiI3h85ZZxt7foRG89DJAJbdCItandjps2MHM7NHm+qbgEYF69/7c5d6J2B0Z0wMzVsdk0eTrwnhU76CA4MjPabBaA== mongo: connect: mongodb://localhost:27017/?w=majority database: consensus @@ -17,6 +20,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/cons3.yml b/etc/configs/cons3.yml index e8111219..39a70241 100755 --- a/etc/configs/cons3.yml +++ b/etc/configs/cons3.yml @@ -1,12 +1,15 @@ grpcServer: - listenAddrs: - - 127.0.0.1:4532 - tls: false + server: + listenAddrs: + - 127.0.0.1:4532 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - peerKey: Bn1itxyTCgOmB7Sk3CgZ20KCWMNvux90oDl9T/gtnKTn9zSa61s/Uoqww3egTYtgkBuy60XEIL1i4mHGzxqBAg== - signingKey: Bn1itxyTCgOmB7Sk3CgZ20KCWMNvux90oDl9T/gtnKTn9zSa61s/Uoqww3egTYtgkBuy60XEIL1i4mHGzxqBAg== - encryptionKey: MIIEowIBAAKCAQEAsK4Lqo5KzWVUmoHIud02xBL9hYIPiCVFlYgwtzA1I2gJEC2wLmycbq/2PRInNNYPl0sDiBvRVlQKTGzPhGyDQMD1lBuP9Jv8H345ThLQ+EuRtLqr2LQOVn98jq9MV7/sn9uGGW1bp1nkHXw9ey/XbRy7BhMrIoIf6oFgJFq7aoBybSUdTNtC+aQtoitf+GXTWCY3KRnwcRfHeNj80s5q9/6Ru2SPHcCyCTe2MgZIVHG1RFIF2PqqcXK/jziz6z8ekByTi9PpOd95newd0WwXO8fZVPpILJ6Ii3VGiHldtoGcMMipp4slWxE3sv44n9cvy7zwnDCINtBwLlYYR6c71wIDAQABAoIBAHYgF4qz0g1bh2I6DaM+5MPZUol1uL609L4SLUf9Qjnm79BSS63uTfSvTvnr7iykRg5ISBczShXm4G/SfDg0eNjNaiPY/bl0pO/Fa7joWbD4jXWBLS4YzFFGsVeQmoE8v47trc3IUPQl5J9WFqELDoRUJjLclAVhbMdUMpx70TxVgYbmELjtUwsjWnBuHQv7YbAbN2QFmdUFfZOUpQZno8ArufQtB+B3rZVzemHjb5+fB2PPv63LHJKhDoZ0HJvSWivBQYGmL/Aph10sSkqfDk+6F64RLGs+uonWcL2SK485aUZLQYweRCo7u+409QD437ERzff2c0Wmfu0t+hlRzbECgYEA5MqWg7Rp1Z95NHTajsOm95ea65EB0is/wqRa++fng6FQ3UsGF9aNjo2R6Io/BUYnvqkTIbD26pqDCSVBOiuRk8fnw66Q4REP8ceKlvk7gwYByUFTPz28R0YeJpbt2P7lbEmm5HuyJ5sMbCW9TzDhatoDA+f1hNMj8UhORBfMPb8CgYEAxbD0jbHDnQ8o5tg1/FoqBGy0f9kOixReKKNhBvVbKwrYn3uHOoZsgXDnKgXa5UEjWC1CmS00OOi0nW2yQmRBRm+jO7wOEnslYf9WuiRZrmK5LwAFyREIQXdYo/RPGz2YjNjGGkPMCukHFxtp2VB/gH56/TvX/9SoNbSyffBBN+kCgYAVWeKZ/+gwi2VgQ9dxo0idqoRGn42v82FL5NKo14d/fTpyrGGxL9CeERAgx2YCM/3ZiSXD6yPf2POJkvR3XUGErQ8v78aNem4mfhys4i1vmMvp4DLIoBZGAIEn0MX5jjAS3vy4LeL+VzXdkdgM397pfdbyMl9zOdEM31aOfDoPOQKBgQCQj9oFU5yr2U4boLe5lWVsXuGPK/aKlZZVOUPWhszoKMJHvVkh3vKxpRIllKqBQqTJ8i7lPD0X8HNDO9hC3HUvQKupHtdbhFnN055j9/jsoJyyVd3lLmNPHCrhmeHPFbfcJxiWVEV9JPJeX1mD5G2YVOUzEPPezG9E9qIfnfTTIQKBgCst1oRJ41uiJQ5Wi/v4O6niIZGptpNxXgTWeBiGl11d0bFujYlTx25jpQGWvF6ZZWbhUtNR9Kjpp6QGqNxxcWpQehKFFPytEYkkbA3roUC/k5E7CjN3UfWNte5kJ/pnlTZCE3+6VOwQ9Cdnqh4mPxIdRxv1Dk10xLpd4iGncbRU + peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + peerKey: ZeIGyAHh5/FOyPAFABPAGls2y8u5q9ndlXeWvWtlG9ni2QGe8+mu6KS6Lf2aXqDnALprDUSaeb/ezTAGB3NtDA== + signingKey: ZeIGyAHh5/FOyPAFABPAGls2y8u5q9ndlXeWvWtlG9ni2QGe8+mu6KS6Lf2aXqDnALprDUSaeb/ezTAGB3NtDA== + encryptionKey: MIIEogIBAAKCAQEArgUvy8MrSMDHzymuOC5xsPmQB93P+cd47FgeinZPS/DdEIXJDCc7VhbYDX4cZdxYgqoISJLgUN6/HNrAQILh1u2TA+meLPgtKCZgSgs8UGLYbQl1OoWd2BEpy7K6gxYNUu+mxvrMUOXSjU8Jl/yde8WeqZGBeNRQLHYXpw5DoSRQ91pag6Z8llIM/m11A8OUtFQMq1z8v4LHaQoi1Z7cyPJqLKEUS8etjJ8cHYWXF7b/68vbPmYiv4IwpWt7zefpfL5Qa/NcQgPm72HNz29P2V3h90Gs1muYy0Ka+GfCOcNqv4hnXfK78YZlACFBtBCn5Ar4CmT2LuXsIHe6qyXOqQIDAQABAoIBAF5LgTKwduvdSmf+9eCLih+Tm3AnyWJXrDalKSduJFnKEn+5fs+PEp/7kOb+xvSLCYsEB6kLrXEkwfoorrRGN4n3AgrEtGk5sX5oDRUSMYR9izjKPzOO45EI+9Tc7CPL9zxRj9WSYNQVNJpNka1BvTQsSWUo6zdGFIuDEh37pLnTxy2C3+uFaWI7aMUllU16ACO+0cNaOWKCKtASHk75SSTqnEh2P00oH5SBOUjmeAPc4eVpkzcR0+xbXQU+m0hs+9NKnrrQsNFUuWhv5Evvg5KrwWhEBcsbR4n8+q4YF2mj/eRbVK4eI7bc+vcrvF9MjuHpuuQPkQuH0ZqxDEuKmGECgYEA0kjm/FhaRlGgBZkh+z//Qch4dvK+ZtOiM8yKmYqctecl9mPL9fQoTMbTP7ml5y9Wt3z9msplD/b5FICfq327zGX+tFD3ZRXxtSzL0G0hTp6kh6Ywgj++pjK1tDV82uW1F8AHxsdyDl6wCmp0SIwF44j3kjpJ4oi9j3tMQX8doK8CgYEA09oI7SVvPYmTya8gCDBsZLM7kReEQPA8D8KVO24EdTYzjwpiwmQGocqxSmkQ36Rnn45/33JLnrSWMPVdXuHJ7XNvuKu94r3+2t7zUw4T/d5l7oBRXicEePz650IeeqoTddQgFEPIWXQmyo0XlKwZ48wbF0gLAev9l0c0iPDP7CcCgYBhREtjqdKH+DWWoVBwkReW7A2cp4eetIGwiAoMH2uBUFvk7iBnsfn6GXWZYlv05Zas5OnBcaDxk4F/FEfG4S++yebYrSLh5RaagQ/9Zp0jaoocHKkPdkDPS2F069DGx73OMIroTVTahL3U84y6CdqndrFdOAz49dsIxTVujke8DQKBgDGA12kiwDWu+ju8kk2XkxyMzTSAPEU4XbCJFXoHoT8KZU3dbWpjGTGhPYBXwLuhnR0pnTPHb2gsZpQWIbVUKW009jw+1WYwY2cdhdo4he9ikosCrQDFOURUSQTU7G5ZY6a65KwXkq9kdtQJ2CLDfGFAhmwQR5IxZNZ+qwX8z3ktAoGAPCU7XOZsRr6E+UIx17ghjNZ0Y/RwpmxqqOFuVPmpITO47BQIIQVL/gKqUOW649xfdpkTdIXc/eHeD8GEnksopO/O3Qaa8DkAHzQ+vVD0DAWzY1/2wVPARoGuo6qqNPEqRoKLy/TK5aZOO53rbVq+hiT90b6PytE4RWIATYqE2Bs= mongo: connect: mongodb://localhost:27017/?w=majority database: consensus @@ -17,6 +20,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/file1.yml b/etc/configs/file1.yml index 0558aff2..369578f5 100755 --- a/etc/configs/file1.yml +++ b/etc/configs/file1.yml @@ -1,16 +1,16 @@ account: - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - peerKey: TXZuL/m33AzjAzVe+kI7mnoiLkZdl7drSMN8tKQJ6M0/hO4d5HsC9n0pIxjAz7NF5d9nlfBVM9AhOtiEjS+3hQ== - signingKey: TXZuL/m33AzjAzVe+kI7mnoiLkZdl7drSMN8tKQJ6M0/hO4d5HsC9n0pIxjAz7NF5d9nlfBVM9AhOtiEjS+3hQ== - encryptionKey: MIIEpAIBAAKCAQEAwA85uexjOjWr8N5r3/4EQk1J5z39HjhQaDgL+58ohstIHoyHsp0fBDGy3j8puwv7RDT5U0Rjk0u36Lm4Y72NUi1DxaJ/0xtvB7k7AVjX1tGbGAoTWf55ljmJ7qhYA48bUU5ylzCj9xkfwfVMAVhvTAbYafW34foR3NYab1PloPz5i/c9yo6hhf7dGyqzQ5e03S7Fzrs4wAAAaQR88ZjaYUvMCnG1xUtGIkWqvTdLLMuoCikKcPFsrTEfwEXffBsDs7ZUmRHPEFd+SC4iP6wflRQFyZmU+t4PJF17Fo9JUgwshcfGwHAk0yq8aCAGkNotoGJyh78y0t+tjBMehY58EwIDAQABAoIBAQCvE7INuF1kDNUmh7tSvx5myknaUHnS+Ibj2mOiBp5M8jZWEskIm45QpnVlf7Ks3ek5bgjyTN9wwI9vyQ07bunKxZSILu/TI6j9I2+UdMac/wogyd6GJSH1PZJtSmyhIe1HGvn+tMpjUDXQ+6lDeLhMV9kkDmiHyQxLgakrXxFuxFWLRGdRQKz0XPKtyizftq1g5uKLL9sqw3oNKM92Qo6vzFS12CvtnhfpOURrRLNPz2WubnUO595z3f6pyKTDGtmczhpNwaqOKJ58kez5x4zTm1XPJVHu4XKFHEl8UKpU07eLK4i3dTcDlOGMT23tV6pRZXvS2nAdP/WdM+E9LogRAoGBAPyalYSCfaijSiBUoKy0C8eVeRm828ZppuwSARvNptMa55bKwcQ6GWlODYsmcfvOUhvPj55rW5KnDjCCzUO6XwrHPrk5KZCdZGnDsIaayKLpdfQ8TcdEInZxLLexZMEIz3F1N94e//rl/R7ZSxH2PKg9GoVoIK8R01DedrxzpQAVAoGBAMKkQkTHppKNmI3eJXgDaKoZqTJC73irApO7o//LsIfwCK0ehFJ/x3lvVaQBLGGUGGyN4j64+PXETGLg6oVfXgpBDC74kWsF901vhIR66w1HWqqjm6frHc4HozuQUP4aQ4rct2rx0XWFSnU2hT5AuXG0xGLGCK/BOCkZClHMmO2HAoGAX0qliuZ7JunqpcWnE1+cbf86PvZa5j+nA7lLB8UN4OduZBk6/Z55RZt3Sn4HU9miafFkGXwggHNay/wcGSeugO9m/xLMVky5u5hh+HVdqO9vWuKA6OIQKiRJnUZjXtrG/uMcX0PMh0bJtSB9zFnayhC694avhbuwvvodSrxJi30CgYEArYT0Ew8Nv4791lOZgaFAWIxh2w3zINcLiBp6vNqguL9TbMpM2qNReD+50Gi/YQo+r9/ZN2N9htQF6Qxr5pS7aFbO/rzYHtoFuwHU2KogDAl1mbQbWxpuyrLiYYJpwe42EoBr/6ouuh8m3tHI/VOEPwsRHKFBMzYE1BafrYbBOtcCgYB4kNtGEQ2t/BGyUlNatcDCjZsex2kgtoEGVTrBig98FyafEMYjZBwEVcESBDzJk8QBiyI/BhkKra/ChM7FAeZTCfqx+p84E9U6QpqSqaex66jS4BY9WjlRmCzGV9bDtMmeVhJkcvB0YSk5HB3Q9Ap6BxtSnByUGhyEqp7V7Bz+vA== + peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + peerKey: X7YT92hRIQf42tNiIlOS01p1uJiPSqcdkE6LViS8PxnhAv/28YzTctqPjm11AC63Dq7ybmwPQiBu1pwa3AxHzQ== + signingKey: X7YT92hRIQf42tNiIlOS01p1uJiPSqcdkE6LViS8PxnhAv/28YzTctqPjm11AC63Dq7ybmwPQiBu1pwa3AxHzQ== + encryptionKey: MIIEpAIBAAKCAQEA5KuB40UIN6LbGaFw1EK7PZ30bkQerMC24hiorv9oUqBPsFXnGuqSd09B9yLWsUGBHn4q2G3ZF2e73+K6Exn/OPp4othDwUPzm0sx75y1D2iy7nNbP4EAqC4n5x3rBaLCvdN9MJEc8TfvkKJAJ8gCAub3RXuf8so5GfYra2WcFjRovjqtpV5dN0onq5Z9gNYMUrzmHNE2PjO4jpAyTh2/zIP3odpt9e14xUjB+Xv3gonX7Scl7njJFXcRMfdriDBkTDlCMPt/hA7Sabif7jXzd3hDIFBiX51SYCSeBpv70+iSNwR1bO4zKagAyI1s5MiBriNdO07CvbI6WK6MzC3NeQIDAQABAoIBAQDS9Xrt3ajYExGJEsxRtoKhNNDkzUlzXJMcAV3VnGF1INqDtqxvw4p+MYuM4QIqI2FobUM/yg+mrRfBU50QtEImIcUbjuLrMLJUSUn3YZ4UaiXxIFFFQ9EEVxiO+qXw3BhHIg5zuNx3mYAU8eq4CKf6X3QuEQAd7/w//EBQYzxdqhsGqRdawnqlRg0GdqsYP6SaGliyQcjIybb8+UA4YbBofECQmubY+ObrAKiE2Y+AxXtO/JMC4hM7r4QV9RYd9O7n5n6cP7eEN0oo6gViHEhCsMktPeawXwXXbvrS4iz/gyYFs4pYTuQxC+UNVusIRNfrHQTQuyXIqioArPgj4TlRAoGBAOUv6ioGsDF89VQFhYPrJdeoGkARRG6fRWVxuVK1Yx/3uCuHp01mjmczowY36w3MdMSZMuiRk3zeVkts3UQwHgUR8jHJT7Ty/cL80K2/n12aI2OK8vnY71idiZPoy7PL0vY2S4klLsBfumrEB9sHCE7G3+0Ai9jfePAUNj+RCHOVAoGBAP9sGiorjyZbFOCaXDemJcI140VUqJ+OFeBsiZZCOvHlgE1tFcy2RpDvs7dwe2gBb/Gkt2hsDbQdEWdSQk5AVcJBnALoWn4eoarEN6TVDxIDhN0Vz63uTYM+rMvgETVFfc8lxvEmcO7G9rxNPSkIUSqVXw3AywYizNAgRb4fRnlVAoGAY2zQ6iByqVVrXGL01BDcHt1nXenfxRnFUkfuvMnB0el2dTPpSXO3TWAiVh1GFHthILTRWAFneWE/EIOOzfkN3Oc3KZAKyxYrLj7dDLM3oLSwq4to8yjAVLIrMAZq8Hn48CUHydxelsgwqAaY3dUELqCqHjgBczknTweFrTfu8a0CgYEAtPSDPOkLS6MvkUgKmSpOid7fmpi1tgRVn1+Fwjw9wm5TjYcA8L0aFUiczBMWesK56jpF7ebPdpE5aTev3fxaRXtx6eVvZvaQlojY2yBOwvZXRMJVFeZEZ/0ZMn8V8eW/kegzn1kanS+8Uf9umwlXZ5HXe8jgjQJOlAypHF7P8NkCgYA0Z1F1kGUSl8DBIaNbOAR9FOKE/cMOubxoFCi/eHQc0wu+jEa53SnD5a8TYpEU3eqAiWsImuqoJA4RsvLZcKKfk2PJl8w+CD65YOJckyNRzUjzSz2S7oUXkUVhzbJ676y2B4Vp+CxYLllg/s5qh4ZMSOBj2quy1NhFbOq5rISddg== grpcServer: - listenAddrs: - - 127.0.0.1:4730 - tls: false + server: + listenAddrs: + - 127.0.0.1:4730 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 metric: addr: "" fileStorePogreb: path: db/file/1 -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/node1.yml b/etc/configs/node1.yml index f1e94f75..de26ad63 100755 --- a/etc/configs/node1.yml +++ b/etc/configs/node1.yml @@ -1,51 +1,62 @@ -anytype: - swarmKey: /key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec grpcServer: - listenAddrs: - - 127.0.0.1:4430 - tls: false + server: + listenAddrs: + - 127.0.0.1:4430 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - peerKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + peerKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== apiServer: - listenAddrs: - - 127.0.0.1:8080 - tls: false + server: + listenAddrs: + - 127.0.0.1:8080 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 nodes: - - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - address: 127.0.0.1:4430 - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + - peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + address: + - 127.0.0.1:4430 + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== types: - tree - - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - address: 127.0.0.1:4431 - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + - peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + address: + - 127.0.0.1:4431 + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== types: - tree - - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - address: 127.0.0.1:4432 - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + - peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + address: + - 127.0.0.1:4432 + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== types: - tree - - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - address: 127.0.0.1:4530 + - peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + address: + - 127.0.0.1:4530 types: - consensus - - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - address: 127.0.0.1:4531 + - peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + address: + - 127.0.0.1:4531 types: - consensus - - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - address: 127.0.0.1:4532 + - peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + address: + - 127.0.0.1:4532 types: - consensus - - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - address: 127.0.0.1:4730 + - peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + address: + - 127.0.0.1:4730 types: - file space: @@ -59,6 +70,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/node2.yml b/etc/configs/node2.yml index 49e52239..6fdc51b3 100755 --- a/etc/configs/node2.yml +++ b/etc/configs/node2.yml @@ -1,51 +1,62 @@ -anytype: - swarmKey: /key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec grpcServer: - listenAddrs: - - 127.0.0.1:4431 - tls: false + server: + listenAddrs: + - 127.0.0.1:4431 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - peerKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + peerKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== apiServer: - listenAddrs: - - 127.0.0.1:8081 - tls: false + server: + listenAddrs: + - 127.0.0.1:8081 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 nodes: - - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - address: 127.0.0.1:4430 - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + - peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + address: + - 127.0.0.1:4430 + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== types: - tree - - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - address: 127.0.0.1:4431 - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + - peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + address: + - 127.0.0.1:4431 + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== types: - tree - - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - address: 127.0.0.1:4432 - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + - peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + address: + - 127.0.0.1:4432 + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== types: - tree - - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - address: 127.0.0.1:4530 + - peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + address: + - 127.0.0.1:4530 types: - consensus - - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - address: 127.0.0.1:4531 + - peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + address: + - 127.0.0.1:4531 types: - consensus - - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - address: 127.0.0.1:4532 + - peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + address: + - 127.0.0.1:4532 types: - consensus - - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - address: 127.0.0.1:4730 + - peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + address: + - 127.0.0.1:4730 types: - file space: @@ -59,6 +70,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/etc/configs/node3.yml b/etc/configs/node3.yml index 802f1cb0..3de95882 100755 --- a/etc/configs/node3.yml +++ b/etc/configs/node3.yml @@ -1,51 +1,62 @@ -anytype: - swarmKey: /key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec grpcServer: - listenAddrs: - - 127.0.0.1:4432 - tls: false + server: + listenAddrs: + - 127.0.0.1:4432 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 account: - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - peerKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + peerKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== apiServer: - listenAddrs: - - 127.0.0.1:8082 - tls: false + server: + listenAddrs: + - 127.0.0.1:8082 + stream: + timeoutMilliseconds: 1000 + maxMsgSizeMb: 256 nodes: - - peerId: 12D3KooWASSfyabE6Qhr735j7tEwotryNkwwbGWXGMZ4XtP1wPVj - address: 127.0.0.1:4430 - signingKey: ITu3NaR3D76DjGz7/O1CmMk8RMT7OrJuW5TVWcJdbUIJPgB21FKWYgpzvFOvyXm9c4GvjSV/Yvbe/Jqp6Cksig== - encryptionKey: MIIEpAIBAAKCAQEA9AG9HVfWD07+nbrB/GfH+D335lxkTMhDWUJUHOPAmWdzhSgMSrwFraC58sz9Qibtpch8BNUiWTejolhrSUxW7XoPqqKeOlbj8VUpHee5QqJ/Bzmo/OxAEwTuJFGz+96l+4QOz2z3ORDkB0Zm/jrnAmHBLPyr8pNkSnzcrjqnfb4nXZEnFvRDRPtURoG4D0Tv0T3nHIKWStkHudGaotaH+0+fz1gNiHlbKt+SWQTNQHojakhnNMjJvQCtqkuLI365kZD8PcEqeTs5Ip0J2aeEHYwWRaeaWyXvcbdM2bc1r/bH0yCDXzG+btMykepzeBhPXqiBpV4Aw03SX47h2CNf0QIDAQABAoIBAQCfsP+e05yBmlZizhYk5Zrm6U9zkOYHpk0FfrZjzd5/x0fATqx0wMcKkhUARY4+HBIOHL6lvwNi1loeZrWYXADMHMViDFl3nuRBTlXBf6UsagKurNre5JMun1xnop0jatzAVfYHZK4Lx/UkmbvQCKalVWrC0X6LHFFXuo4G7NYvINuhpaW7WXhy27hZhALIWnt5x8ipQTKLUeOSuoL2QhHupQj0SJlA6qKBSB+guM13xqrrYpaRR8mPhmpoiTu1l+iGvLi63TUWMrk2xGa+k6xyGWluO2Uv4jCKSSjRa7VQicP0uNsZrn8SeKI3xo3OI/4+5Pm3+sTpztY6Vv2ImGwBAoGBAPbdIn1OlVGK1Id0KfMAmPweeiRMwmVr8JxdrJDl+XnkGQAvvt8IcSPJuAUc35EsTSW4iUyCVLr/uywQAQvG0aUxjtNvQhnikU1K6mUxWdxuSutDERin8U9wLDwDkbhKXglTAq8J1hYCL+t0//eLtHDjKv08XiX8gqZ2f1SebHZBAoGBAP0JiSZRZCfzOPSTxAVTQWg753HY1HGRRYAoKdnAXewedycUTjBPvyPYP6EwX211rysabttDbdC6wL2fl+ERv5NcCCey7XwKBTb8CwR4x1lakpnFmgOA/UT/6mPToWlvs3f6c1AjI/dY/CJr4dN8HyHVO64BdwG68opSKSz6XSWRAoGAD23CuhIvQulqXwzjkkx3Q0qkV6B0heI5J4yzPFsjPHsFFP3m8AmXCKWS2r7zOh+KstDVw/JhWU6iZB6b8iB6+dgfFRffCb8fVbVY8Poko6JBDHMknmXgrxZTrWyLrvj2555IjKgQuU9pr02gsdgJbwTDqxAa0kT15XGCg8djAAECgYB3QBU4z8bp5QCEk1cgQ1ph60lqKAwG8bXVbhg7HSOmcb0p17H5pruoAvQJ3Sg8B+hj4fM4tpB8fGb1ds83LQwiQI8/Vl4BxR8sCKCQnPMmMz8/5RZubE3wRMOMBGLfs9rawlex/r2mhnNdLYaiCq8JXNrhaKNTV22SrqHlJqDbYQKBgQDmAspmGAiyyXb1o5ortCmU6bZeGCeTP28HBV2jNGaniYeKcbIpZjpm/wB9iEag9u9shP688A0MMpHH8DD3khLGo4e7CFmyXurV6RKVAcyH1FiDXKkr0wmE4fqIaD2Dkj5raiDa+lWAxCTTNXnNip1j1JZcAH4lPYZboB3oHBaspA== + - peerId: 12D3KooWKnXTtbveMDUFfeSqR5dt9a4JW66tZQXG7C7PdDh3vqGu + address: + - 127.0.0.1:4430 + signingKey: /Ou28/uU/z3BbGmkHMV5ev0mwl6lJI/NNniFlMm2gOeUHDfed/zbwYZLbPt1B0sujNx0DGKUgUTUXy/SE7biwg== + encryptionKey: MIIEpAIBAAKCAQEA23AWlsGaLrUxea+x6rkpy1ByqUJKdb2oS10q0urntUCivsNb7ipo1tvM2rldn6DAIrIC1nQHdlwrakNhl/j9zfX/GdACRDEuy7pVigm78QqYwSoyZn1l717HGjXKpJpa2m9Qyo6ZNGTLcej06zuOK8yUR4gudxSV5BJ2AmMvB9v4jUdCUwROSMy0e/hDa3Cx2xV33iULF/XltoeBVDoW6yYXfsok2yH3jHUV59yqQDbZO+kAj5rO8Fd/DnmGriuQZwAwdqJBH6/NtkhbA6triS/xW7f+RoyjjA3dp7TSUscHTFW0LIUaS0ZKt6amaanT7L/Jwi/0w133wTboYPG7NQIDAQABAoIBAGRYaGv+ElSDlSFRP6nXjI4ltplB8CzRUrFL5HZY5yZSbVmQmmxZxmFiV9Y5Z9/EMbhr8LJCktsEIPJR58IIIX/amxIhtbebSgvtpIogE2qRbvL+KdgGRePlUmTg7k7BKwSyXJ6UAOkdoo7veXhMXqIWxkPDuYPIzRZjfsVut6X+j0e9W2/kK7Tx1cn07GGyEX6T9sYsrDZud9xAgDWeE3ARga+M8l3RpTi3GiM6aaz82byjtn+uROUioUSDRLeOx4lOsmTzwWs4+tcyguqC4h/01Hejs9gDsJTOZ+xsrSc+eTsj1oOmABtHcuQ6NWq4KTqV9gVAB9BEMa39k3SrzaECgYEA9kd71vAwqFp6iu3INXBuwJouV72Egwm936KGcs9/NxfXQ7R6NdKa4LiWxdIn8e7uT6+bGPxCPuUmeJ9pYandb6j6fcBcGAjPOJPg5cTtoaeXSTOBNtzaoDLM191dNkhftXAgVoz6EQXUXaGXqnUEWDCptZ8/VKO4Jbb+Zco3F30CgYEA5BljE1KiWKP3IXwfndnPFKwev8Ds6YMczCFpiCzHB4LVLAWShUQrQIcA12yIRHTvD35Vg7SwH5mM+DFd9AMNxTznz8aC7R+jXEApeaCEQqBEKakoDFMsdblT6WFwerfl5ug32IyeKglfLuOiID5M740t+6TxUR1ZjnhIx3QdMBkCgYBUANn63H6cThBSZvzNTYZZZ72668fRMndzWmplquUHk7g3Pc4ZobZ2REAZRa+eVBMxVwKeKR0net3+ctFtIJWJSqf2ULCY+hhEghxKAzvS0elGbKz8W6Su0+UPFFCA/Xq31oERRJDfUY+4SDAFUlijBCY+7wyZACcFpj9r1OepuQKBgQDAJV6ffWHC98SLkYr0pvFZgbCZaYRpJQiSMKc8jjPO8PhwD/Wgi48/2TntPsD/od1sGMkinIgs5mWpAbUag6QK/cZs8dWCuL8dS/NkQMKJeYZR7ewNjdcLCGZWV72vstBZFk9M/Q+Ta7ehwSHmtXSL60rMC+M4qFezu0HbusWHqQKBgQCNuIsiB1yS1aByY2Hw2NJyAWFIRLuv4VNm+S/+YUJzOb/cuX5rwJ+PydJj0xD5mKKq5zGhCFzGZYdheKCYC4UQKn+Zz6Iv5T/mIJU7ELy9R2/I/Jv/IQMQwDXUokbNU8p25Hxul+rI+INjoHihUFKRNL68iuGVNjQHyKQYjit+mg== types: - tree - - peerId: 12D3KooWCZehy8V3i5mrSi7G2vHhP8tDoVo3yqH6jmDyjsomP6Pm - address: 127.0.0.1:4431 - signingKey: YYM+h4qdkkaHK7qBwu8P03eWPhzd/HojiGp2zNduu/UozgxxyA8da2Pb6jLTJJcKIg4Xm3ObXNT6Eb/3Z5uZTA== - encryptionKey: MIIEowIBAAKCAQEAsBUpbKyrBFbqFHq7gf/AKEJv26X4axFLqm8SJkNT9A6KvnQUptfI+x9wp8qkUG/4c8HNPyR/lB5QWJvdDQvQBQ1hrCxZcvMmukV+qtnKlcGmrglBHwbXt3hwA/Z3l1ICIrO5mrbXxEZ3CD2iD/ur2zo4i2st6zLUBHo4RmYQoskYUibS8npFRrnX1Qaoi0GjOtvrpAeafMcqSgdRv9ERuaPccvlGvT1bwRksb8uwEu6htINwDuLQ2vGWp6qsrp83qTJK6L7PaNsy9w9FBDtpl4xzYnwR0QOgS6i2RYBvcQI6tlsCstzNsbEMRu1xaPYpQ+ZsxpzdZVM/HDNZd3/3tQIDAQABAoIBAAiwYqTsOFw0dcSg8dPObQsPjDmIjSOrbNJyPLEKrX/jn9EaJVK+XzqVKJf/FfCqNdZwf9JX2LvUax6UQmo8ZP161ZELdzaG7ShP+ZowuSB+t9zqs/319nslRFHNvcUH1Pcla0lJMIiM+Z68e9zSDH769oNavJ9YmMHHzjMbIkMGGFCskJwJs36rXfL3WiNlmMHAfS+KE0s38eIRcvjiqtUU1krj5vRXtSxQHcyeGwxvCAu/03kmq+KGAeemZKHOtoU0OmQQN7QKc7d2NEF9VyI1F6GpwqROL3oAJ9MKiGUKSG3bCaTlnEIz4pIASRqGTajMXIFe0jOVo1PF7Zn/hcECgYEA6l/Dxs7gBXCaxGZNqDiMnWwc8AIwGkjl6ATo6nIt3Owrre/6CDwh686IWMIX9kl9gHlDh2Bzc77xkOTpEHpgpO7XdI2jsqynv075iK0m0Ak4FsShy5+1qWQNToOUuTRNSpK0bwi25iG5qjNzzXxadXdlkQgO7Q/2cPRKKCG1hi0CgYEAwFR5bUxsiFEQ78jcYIVjyx+MPztPcJXH1z7/SnaDFw8KCsDiSMaOahaPZKO8TSNcMaJ7qAKmD0fc148e/tH7GpI9vSkHf9JaaswwCfCuRvMo/tUnWdGddRG/rIfyuPZcKeoQsHvR55PBLV2ACz3fSh0V4/+EocaSj6q9i+YWdKkCgYEA4EgyNj7kG/CM+mMX72HmFgNOkdLWK2EVOXnxVeFbyCztA69A6r54i4qB6cYbXiEni1j/6T3AXcQcsNaNvaoOb+broWqleydEA4vUuRlRqgUYeplCZ3R3SBkprre2C6FkUXegWRzSwdkGLjy8lahpfD18oVQ/zFXZNHBhwpO3fSUCgYBhMM8D2qDl6gFjCt/CruWVGeYndfNY83e/YAhmOqlYF7N9Z6dyG1SQa8Iem1dmq73FH1TZvCzqf+grzhldsALylIA6fOdbQpOKcJC+FTAcjnhi/pgaHYEyTbvMlg6kRWqhi7TPWmLiYZo3MI6qH6QcscIEK3V8wvoBO8j5T1Z9sQKBgEeF9feBs9jqGyTkcnxlc8fhsNiZZNYXv43OV7+gsihPetiG5vOjmGEyRLrgiR4ZTESFcZ+cKGNXNmxLyGu/uXTYV0Bx/h2ma+vYe1MMD36HNpmF7x6A5ISpoZbj8PGCgh2sWRZM/ScCDrlRBbREP5zXSQ12u7lnm8npmbUdCaaD + - peerId: 12D3KooWKgVN2kW8xw5Uvm2sLUnkeUNQYAvcWvF58maTzev7FjPi + address: + - 127.0.0.1:4431 + signingKey: ckI1ThxMQmAWH48so5jT614HNg4VppB/3jTfh1cdrzSSkFuVPiGzSDJcsgFLsRGW2WT0a8ymqtc4hog5Z4mdfQ== + encryptionKey: MIIEpAIBAAKCAQEAwQcHwXkTynIvU5PfTn9kaQEb5Zzz8eHl/uO1srbWI0hM+sIvhOq/ahYuhDlai0mAhRFQIvb6QRnWzCp3qvMH8+j8ls83BKV4hfxuS+SR/Y/LonW+WeLljiloMM5ju9tjw1iSslUK6z7d0HSLppQCCjMP+v3kKjx24qJ2T+2N1MAMbdt+S5c2P2jBUJVSvQbZ1AVuZTEzDau//+cZzV47lsODrVZ2SxW/KAAKA9xIJSIwBFyIqya54FDlrsy4HMcThxUbmcqy0Ou3bRjPR2f9A6QaNDNlolPhW1Z4gs+MTQOXJyAj2vdKwNKPwr8X6wyUtN4v8MiJt2yl4h3EVSVkGQIDAQABAoIBAQCak4iwdMdWfa5MncRb1kSQmiS+8bug3igSwEOHREejpYiP3uWy6VI0IGNL26oYlNnotf6YoXOyooCSqwd9zHV37AIquvHyNJiZo5aoC/ilN3v5M5Ul4j+2Yo5fV0gi7gOsMcf4K4Y88PEst8gFs80WYeHQO3V2JUmHIFbilvfXgDfQNuKlHXgWq5kNNCxIobGpuP70Vvn1ANkDXLt+bU8RCbmBYFUZ/4HUeawf2NX+Xn5T1NFpheA68hAGprFQu6CuEsM34TtPZwH5SxyvOmA218nQbtq5fNLUgHZdq/uAeQyq7E8kxyOMEbx7m1UYtxDjwowBQgQd1dOtm3wTeQdpAoGBANjs7B0IW/B3TY6mRipcKtTYMVJ+M6AKu7etTkcmM6NpLGaIL9HqNP/a8PoNmHzVOBPJlC96ChQAvcULe+SKBL4L5g1T+k7OQvHEFMwzkFgs/HxjvQE9b1xX1Qyp+e9H7yvrcJhvRPbj3LLp7vunHL9dEm4/PFNKgCFExNsiv8WvAoGBAOPMGXtAethDYZE7vdlD55GdhsgklCmF3YQcraWsZrswj9paIBV8FWtVZIUDdaqOasPwT8L2NdajYWXXcmLlvxkOQQx7+cJG4SdLRwEz531rXvtcYrWPYYwjf37DQMi2qRmvZ0Oc/atitwN7mQ4wCMzZ+CV04HJTjK4eRfeDeyy3AoGAFbQWp4z3jeaR1uzh5kkUa/k5bhR8W83XHDh1tX6n+fiC3btQdYMmTFb+dzY3BH5cvvYTInDmYzvzwKw2eBYrBUyxdrHpQEs4vXGt1wRts7TEijl8ZoxcAPQ0t7Cl9f/PeSh0OnwffUgtA6WOKJV+tdK9DlS7V2YDzdBQldAzObcCgYAbjn0mo844iy4qW4fD2KsSunOrkoE55K+/Y5i+CfUDgARm7bAj6TbOHS5jyN9bGo9f1JpRg2dP58PIhh+YRyKu7UKBOB4mmlxyXHDifFzslyiOT8bBH+80/LZXp1cW8MHUEZv0WfF14iMxkKobRURLQ7L5FQJx0hmalp7wKj+kUQKBgQCEavx+ELQu1M22t4Kk1MOI1zEsrG4D+hjACmoWQsIjMqi5x+9vPJNshrO9vbYljjsIt4EOfqBB88oMepCesVHwbX3+/j7Yb48pmf2vZNcQ+SFozJqnCqYNQiWMtNXWT312NVdzkvpTlA0e1vaauwJjtetRnYDJUOPjc8BrdKsftw== types: - tree - - peerId: 12D3KooWLhR5S52XyDhfZvyvZG99BTqnKiFm3gPcuEa3T4FtDCrj - address: 127.0.0.1:4432 - signingKey: 2YHyrAJNMb/e0iHjjx5KcZOb3hzTUroZVDzREiFi9fahqMdykmVIFDfk0hdLm33syhFYNwLeiFfyCFaWTl+iYA== - encryptionKey: MIIEpAIBAAKCAQEA4ZMzzFFf8yvHUIR05z1vd7jG6LHQMj3PFH2nLPf8mHG5VGRnUdjNUu1IsPyNCgzHKh9KvCCwSrWuNXnw/fVln177mhBHUgyLF9uzRlRvf8fMoHo0ylL7ENBgCEJrgR92XE+d97zDPE46NqFo6lJul4gH+bSl5brP+Kb155o1/51LUOprKiL1wj2fyVNpOgTiuEhUNJB0FqmjkmbejschgwXwma+0gy2IQY6DCCSCb4ck5U2YBQUlwxFJ2NaCOgsXWRcEfjZoNFMzTlfwbfUjwFts3/K+1hJI1gKfG/EDIMM1255zDwcbbDZR6Y7HgN9gbEK4SUK0SmbGwsx4ha+6GwIDAQABAoIBABQbnRhvgJAarO++fvVGArO3YvPHNfnkjJsVAFv/1yJ3sL+XG6auHs9vm3U7bg8hSHe2xmCywURHobnent7kiySDwQXgwZrMx3FfAkIYsL/BPbpoamBGuV6sVIMn+JFQDqr35er5hqXPi1znUoTgyD71v1BBDDDIUFWn/G+izYF1hy90/yfocu2OADPSoPdvc1MhbmZ8uT7xYQF7E5tmJwfK+AR9VdS7adsGekpqfpmyIprJKFN4aQbXOq61WX8KGCxDOxUvZmyV3DiF/BSiCVwTMVMH2XbJmIuHXN/B/p/lowQcCXtQULj4jo87RUxN6ZsHXV1PHjnUS7YINeYGfAECgYEA9uVoRIdE4kcr3jwYo2g5IIUEbeXyl6DamT2Vv/uHxMnMNqlN943in9y+dgzC9LrIfZPRnjYVv3dr/mBmKWs5RNHutEMUYya0sLmg9dxFCm1ewzoU993Q4sZmt6sZdTjLNAQosdUnJ/s3cuozNeNIGWOJ0PXaeXmnDzMTh0Dd4wECgYEA6eSIbynaLumLUzgX8dAGW3WTlggEJnGpiDvsVAP286TkjCBZksy/ceI2chSsyvV6t+4FnIfTa5Y3lsHLC+3zP4m5prby4sk/HwDxUkVY5W+IpuvXGEXb8Hwc5PAPGiMHCp3r008BVzVX72VKt+704drX6U/hXsthQovIMfANyRsCgYEA59O22Qnuy02qykzBkcYORhPAefS9mlSmjdc+4nqrHEOjpfvJQtaOYi8jA7Ot55/vG8MNw7HjL9pRpBQeOWv95Tn+GnMWFJfGeF6E3fbLOSRDI6tI/wjf1+AVmQZmrCP84cW59GlCEA+aHCP+m+3iyDwnrvb7Aq8RB3udLZXiAwECgYEAn97x0uoMlJxV+2AQHd1POxy28IoyLATtGI29EABVwFwpTA6gq1MAWNuC05+GLIR2iVpMw52jyZo4DPgRzemrpvaAy4+pnZJpbsu6J7328Xy3L0FtGM5Hc62iImpkKD1hBsTC+QC7rdxsatoVpHvVLrvjcTqElcL2jAH3qQqooZkCgYASyKRslDmPaHvtCF1366AkhYgqgWABwM1BgjES6xpBzgdQONp/qq/iw9Z43rZz076fRRGD5GQ/fQZLR6lZIgVyRDsq2VI9H8tiWdWgXtnp19B1wpD8L5hwy/YytpZbh1HrPCzRL53C5taJzR0kXylHvNlrACYCsSEZ4aQDmrh9wg== + - peerId: 12D3KooWCUPYuMnQhu9yREJgQyjcz8zWY83rZGmDLwb9YR6QkbZX + address: + - 127.0.0.1:4432 + signingKey: EqD0bdvO2E9+i29hfJTMtae8Zw8Dgnb/KanLSg59K7YndQHdxxvtVUljy3htlXd7dGKfEuJ7EglVHdNxzg5q7g== + encryptionKey: MIIEpAIBAAKCAQEAuOwKfzHLrm94jH4PElKfkB9geQ5OhtdbcS4K3TeyZ5xU0hi0TiXxOiHQOCg2uO7B/fnQcAArUBvPNa4QOvNuWRY+246FHYBxCJvJdfOpwirQbQ2l5iqR13rpSAELnF/zB4XMQa6wGVhsgWipvY9PUrLF6RwpeeBu9OtpVaA2oUiUXyD+v1f4dNXjZqrTKS9IycksGEEI4knEfG421K862BRty94pVWfqv/ZgpJUQZiWLX9CSbAdvjoHxOdm96VhMjTBw3oyv7hTr/zQR9y77OMFwOOBtn4QWXSS54r89inoksgGjH5cProhR+V4QZ4962TGsnc92j+IjtlxI/o3CuQIDAQABAoIBACyLl5+6NBFqAsT9HM5SHuPN2yRuINZ0jC+AYteVMiGpU/lkQBLPKwPQ32KXtU7pHMv8YIyKTeS3Pjv1GS3KNBu7sxqag1Bu/0uOk4IZVxxRyfFrJzqBqK4aipVwwwZBSr7WKTTtSrhgR4sI1lK2ceo+7FPSF9+nA7N1/eLFfENvWegG9cM9G1162f1ypTmTKB6zvyEhrMnpw5IWGiyL41Pbn7Q6qMxJCMedJn40UWwZ+K04StxcX0MdPqiRC1mhEECF23y/Yu3QYVlyAR/Ya6POPK+Y/PQhvYuA8gMbdJgM/BpFntqqJx6nf9ojZjmkpFytHuKojDP+SOYSvifGSzECgYEA85YGa9DNHeEGU7e7U6iReHn0Cy1ZlDl4q/E1tyOSY1tpuTdiIYNLZAmx/ZDLj7y8NcNwK44CWhNGUlsTGOL0wrsFefH6tJOLLklTgwo6gnFFeNKUaTrZMQhu1Rf6fruO6yUHe34EgDnMIclx3+bXpZmWGVVOXLx7e/gQfDiRg3UCgYEAwlimHW2pJshQdCCyIFPvf36FK7xNiTIGy4VW8q8ulX4UESioxQtv8Irf5UCo1WpTSNA8RYRPU4gZnp0jkBydNDU2bdNGiN3IySU99/2dtYEHPJAferwXoOVdSCVXw2fGyQZK6GaciWDP3bgZdVKBSGBCN30eJ2PDVKni2NiHbbUCgYAdPHKE2kjkPy/9OF45ik/7f9e0x7qqucMsEAV8d76IQl6MJoOWtiWEWk2Mu6ZTGDoW0eBSufa6TPnxxJCkOglangvoOQz4Q4U/BvoJDl87bNED0XKStsd+xR5YYUplj6l1u7oMLnHn2ggQPhd24kQb0jVb0QtYwh6oIHwKDNgaSQKBgQCuTYeeuS2ORPYzUOexKtaQSE7z7My1kZKakhprSkbDePJSeV70as+Ys1UfbaB+1/+ePHTx/DqRNm2T3md45tDvdBI+6dBHDHL6RFaRxnrdwL1WygQRtgSTH2NMQ4G1Fawpu2UPjogyhguoVWcv3DFrUjnRPnv+4/DaTAvSZFECSQKBgQDh6g0n+MIknDo89ffCmIuD5qkPi7GYYGBfQ7HHHq5dUXazN6+vKazgGEJo72MU4ZlHl/U33MoMuuVP2cBEYJx8iMaP7ze8jUWVRA7rzg4A2ayBCOQxpBehEBhD1yEBPKO5PVTYV0a3BiM4tQLLPuoh5QcB7ANwmZkFdLpizLqn2A== types: - tree - - peerId: 12D3KooWJi32ajZPuHVV3DqknS6UinPoHNEKE4mzx2qz356UPp6N - address: 127.0.0.1:4530 + - peerId: 12D3KooWNT4hbNKXeFuDtdQ13ZbhQ1oJJ2AVWgAQVRrCj6Zb5wxk + address: + - 127.0.0.1:4530 types: - consensus - - peerId: 12D3KooWE5UhTEvzfZhjDpbwademWbGHYzK6tfTVNrcAYNtZy5Gx - address: 127.0.0.1:4531 + - peerId: 12D3KooWNQZjL4H82u9qdjpWFBFjFdZyTqvgXT6dajkJuRn9yE8H + address: + - 127.0.0.1:4531 types: - consensus - - peerId: 12D3KooWRRryc9JSd5qdRATTLCB21m9ELopJvbTiDehyovQZvgf3 - address: 127.0.0.1:4532 + - peerId: 12D3KooWR5tEHzEqVjQas8PfhsGjWMooTWXsryDUz8HXWYnQhczf + address: + - 127.0.0.1:4532 types: - consensus - - peerId: 12D3KooWE6KRBwb1CGZHChD4nw1zGSt7kVKsyiL3DyZe245Lo9nL - address: 127.0.0.1:4730 + - peerId: 12D3KooWQxiZ5a7vcy4DTJa8Gy1eVUmwb5ojN4SrJC9Rjxzigw6C + address: + - 127.0.0.1:4730 types: - file space: @@ -59,6 +70,3 @@ log: production: false defaultLevel: "" namedLevels: {} -stream: - timeoutMilliseconds: 1000 - maxMsgSizeMb: 256 diff --git a/filenode/Makefile b/filenode/Makefile index e98af4b3..01268b68 100644 --- a/filenode/Makefile +++ b/filenode/Makefile @@ -3,7 +3,7 @@ export GOPRIVATE=github.com/anytypeio build: @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-infrastructure-experiments/filenode)) - go build -v -o ../bin/file-node -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/cmd + go build -v -o ../bin/anytype-file -ldflags "$(FLAGS)" github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/cmd test: - go test ./... --cover \ No newline at end of file + go test ./... --cover diff --git a/filenode/account/service.go b/filenode/account/service.go index cf7c5a44..3b508a1b 100644 --- a/filenode/account/service.go +++ b/filenode/account/service.go @@ -4,7 +4,6 @@ import ( commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" @@ -24,7 +23,7 @@ func New() app.Component { } func (s *service) Init(a *app.App) (err error) { - acc := a.MustComponent(config.CName).(commonaccount.ConfigGetter).GetAccount() + acc := a.MustComponent("config").(commonaccount.ConfigGetter).GetAccount() decodedEncryptionKey, err := keys.DecodeKeyFromString( acc.EncryptionKey, diff --git a/filenode/config/config.go b/filenode/config/config.go index 05de8102..f6858de0 100644 --- a/filenode/config/config.go +++ b/filenode/config/config.go @@ -1,17 +1,19 @@ package config import ( + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "gopkg.in/yaml.v3" - "io/ioutil" + "os" ) -const CName = config.CName +const CName = "config" func NewFromFile(path string) (c *Config, err error) { c = &Config{} - data, err := ioutil.ReadFile(path) + data, err := os.ReadFile(path) if err != nil { return nil, err } @@ -22,11 +24,10 @@ func NewFromFile(path string) (c *Config, err error) { } type Config struct { - Account config.Account `yaml:"account"` - GrpcServer config.GrpcServer `yaml:"grpcServer"` - Metric config.Metric `yaml:"metric"` - FileStorePogreb FileStorePogreb `yaml:"fileStorePogreb"` - Stream config.Stream `yaml:"stream"` + Account commonaccount.Config `yaml:"account"` + GrpcServer net.Config `yaml:"grpcServer"` + Metric metric.Config `yaml:"metric"` + FileStorePogreb FileStorePogreb `yaml:"fileStorePogreb"` } func (c *Config) Init(a *app.App) (err error) { @@ -37,7 +38,7 @@ func (c Config) Name() (name string) { return CName } -func (c Config) GetAccount() config.Account { +func (c Config) GetAccount() commonaccount.Config { return c.Account } @@ -45,14 +46,10 @@ func (c Config) GetFileStorePogreb() FileStorePogreb { return c.FileStorePogreb } -func (c Config) GetGRPCServer() config.GrpcServer { +func (c Config) GetNet() net.Config { return c.GrpcServer } -func (c Config) GetMetric() config.Metric { +func (c Config) GetMetric() metric.Config { return c.Metric } - -func (c Config) GetStream() config.Stream { - return c.Stream -} diff --git a/filenode/go.mod b/filenode/go.mod index c12ce714..3fe16ed8 100644 --- a/filenode/go.mod +++ b/filenode/go.mod @@ -16,7 +16,6 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/cheggaaa/mb/v3 v3.0.0-20221122160120-e9034545510c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/filenode/go.sum b/filenode/go.sum index 878c8d00..a7f0ad57 100644 --- a/filenode/go.sum +++ b/filenode/go.sum @@ -50,8 +50,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cheggaaa/mb/v3 v3.0.0-20221122160120-e9034545510c h1:+bD75daSbsxyTzkKpNplC4xls+7/tGwty+zruzOnOmk= -github.com/cheggaaa/mb/v3 v3.0.0-20221122160120-e9034545510c/go.mod h1:zCt2QeYukhd/g0bIdNqF+b/kKz1hnLFNDkP49qN5kqI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= diff --git a/node/account/service.go b/node/account/service.go index cf7c5a44..7291c82c 100644 --- a/node/account/service.go +++ b/node/account/service.go @@ -4,10 +4,10 @@ import ( commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/accountdata" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/config" ) type service struct { @@ -60,6 +60,7 @@ func (s *service) Init(a *app.App) (err error) { PeerKey: decodedPeerKey, SignKey: decodedSigningKey, EncKey: decodedEncryptionKey, + PeerId: acc.PeerId, } return nil diff --git a/node/cmd/node.go b/node/cmd/node.go index 65ece374..fe2d0433 100644 --- a/node/cmd/node.go +++ b/node/cmd/node.go @@ -7,7 +7,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/dialer" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/pool" @@ -15,6 +14,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace/nodecache" diff --git a/node/config/config.go b/node/config/config.go new file mode 100644 index 00000000..d5321eac --- /dev/null +++ b/node/config/config.go @@ -0,0 +1,75 @@ +package config + +import ( + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/metric" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/storage" + "gopkg.in/yaml.v3" + "os" +) + +const CName = "config" + +func NewFromFile(path string) (c *Config, err error) { + c = &Config{} + data, err := os.ReadFile(path) + if err != nil { + return nil, err + } + if err = yaml.Unmarshal(data, c); err != nil { + return nil, err + } + return +} + +type Config struct { + GrpcServer net.Config `yaml:"grpcServer"` + Account commonaccount.Config `yaml:"account"` + APIServer net.Config `yaml:"apiServer"` + Nodes []nodeconf.NodeConfig `yaml:"nodes"` + Space commonspace.Config `yaml:"space"` + Storage storage.Config `yaml:"storage"` + Metric metric.Config `yaml:"metric"` + Log logger.Config `yaml:"log"` +} + +func (c *Config) Init(a *app.App) (err error) { + return +} + +func (c Config) Name() (name string) { + return CName +} + +func (c Config) GetNet() net.Config { + return c.GrpcServer +} + +func (c Config) GetDebugNet() net.Config { + return c.APIServer +} + +func (c Config) GetAccount() commonaccount.Config { + return c.Account +} + +func (c Config) GetMetric() metric.Config { + return c.Metric +} + +func (c Config) GetSpace() commonspace.Config { + return c.Space +} + +func (c Config) GetStorage() storage.Config { + return c.Storage +} + +func (c Config) GetNodes() []nodeconf.NodeConfig { + return c.Nodes +} diff --git a/node/debug/nodedebugrpc/nodedebugrpc.go b/node/debug/nodedebugrpc/nodedebugrpc.go index a55815bb..f2340cf5 100644 --- a/node/debug/nodedebugrpc/nodedebugrpc.go +++ b/node/debug/nodedebugrpc/nodedebugrpc.go @@ -6,7 +6,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/secureservice" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/debug/nodedebugrpc/nodedebugrpcproto" @@ -23,6 +23,10 @@ func New() NodeDebugRpc { return &nodeDebugRpc{BaseDrpcServer: server.NewBaseDrpcServer()} } +type configGetter interface { + GetDebugNet() net.Config +} + type NodeDebugRpc interface { app.ComponentRunnable drpc.Mux @@ -30,7 +34,7 @@ type NodeDebugRpc interface { type nodeDebugRpc struct { transport secureservice.SecureService - cfg *config.Config + cfg net.Config treeCache treegetter.TreeGetter spaceService nodespace.Service storageService nodestorage.NodeStorage @@ -41,7 +45,7 @@ func (s *nodeDebugRpc) Init(a *app.App) (err error) { s.treeCache = a.MustComponent(treegetter.CName).(treegetter.TreeGetter) s.spaceService = a.MustComponent(nodespace.CName).(nodespace.Service) s.storageService = a.MustComponent(spacestorage.CName).(nodestorage.NodeStorage) - s.cfg = a.MustComponent(config.CName).(*config.Config) + s.cfg = a.MustComponent("config").(configGetter).GetDebugNet() s.transport = a.MustComponent(secureservice.CName).(secureservice.SecureService) return nil } @@ -54,7 +58,7 @@ func (s *nodeDebugRpc) Run(ctx context.Context) (err error) { params := server.Params{ BufferSizeMb: s.cfg.Stream.MaxMsgSizeMb, TimeoutMillis: s.cfg.Stream.TimeoutMilliseconds, - ListenAddrs: s.cfg.APIServer.ListenAddrs, + ListenAddrs: s.cfg.Server.ListenAddrs, Wrapper: func(handler drpc.Handler) drpc.Handler { return handler }, diff --git a/node/go.mod b/node/go.mod index d3e02276..7ab1f28f 100644 --- a/node/go.mod +++ b/node/go.mod @@ -15,6 +15,7 @@ require ( github.com/ipfs/go-cid v0.3.2 github.com/stretchr/testify v1.8.1 go.uber.org/zap v1.24.0 + gopkg.in/yaml.v3 v3.0.1 storj.io/drpc v0.0.32 ) @@ -65,6 +66,5 @@ require ( golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect golang.org/x/sys v0.3.0 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect ) diff --git a/node/nodespace/service.go b/node/nodespace/service.go index 26ae28ca..e3dfacd2 100644 --- a/node/nodespace/service.go +++ b/node/nodespace/service.go @@ -8,7 +8,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" "time" ) @@ -27,14 +26,14 @@ type Service interface { } type service struct { - conf config.Space + conf commonspace.Config spaceCache ocache.OCache commonSpace commonspace.SpaceService spaceStorageProvider spacestorage.SpaceStorageProvider } func (s *service) Init(a *app.App) (err error) { - s.conf = a.MustComponent(config.CName).(*config.Config).Space + s.conf = a.MustComponent("config").(commonspace.ConfigGetter).GetSpace() s.commonSpace = a.MustComponent(commonspace.CName).(commonspace.SpaceService) s.spaceStorageProvider = a.MustComponent(spacestorage.CName).(spacestorage.SpaceStorageProvider) s.spaceCache = ocache.New( diff --git a/node/storage/config.go b/node/storage/config.go new file mode 100644 index 00000000..6039ede4 --- /dev/null +++ b/node/storage/config.go @@ -0,0 +1,9 @@ +package storage + +type configGetter interface { + GetStorage() Config +} + +type Config struct { + Path string `yaml:"path"` +} diff --git a/node/storage/storageservice.go b/node/storage/storageservice.go index 5c69b652..129c7f05 100644 --- a/node/storage/storageservice.go +++ b/node/storage/storageservice.go @@ -3,7 +3,6 @@ package storage import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" "os" ) @@ -21,8 +20,8 @@ func New() NodeStorage { } func (s *storageService) Init(a *app.App) (err error) { - cfg := a.MustComponent(config.CName).(*config.Config) - s.rootPath = cfg.Storage.Path + cfg := a.MustComponent("config").(configGetter).GetStorage() + s.rootPath = cfg.Path return nil } diff --git a/util/cmd/nodesgen/gen.go b/util/cmd/nodesgen/gen.go index 76b9d755..84b1de2d 100644 --- a/util/cmd/nodesgen/gen.go +++ b/util/cmd/nodesgen/gen.go @@ -3,13 +3,20 @@ package main import ( "flag" "fmt" - config "github.com/anytypeio/go-anytype-infrastructure-experiments/common/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/client/badgerprovider" + clconfig "github.com/anytypeio/go-anytype-infrastructure-experiments/client/config" + commonaccount "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net" + "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/asymmetric/signingkey" "github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/peer" - cconfig "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/config" + consconfig "github.com/anytypeio/go-anytype-infrastructure-experiments/consensus/config" fconfig "github.com/anytypeio/go-anytype-infrastructure-experiments/filenode/config" + config "github.com/anytypeio/go-anytype-infrastructure-experiments/node/config" + "github.com/anytypeio/go-anytype-infrastructure-experiments/node/storage" "gopkg.in/yaml.v3" "io/ioutil" "os" @@ -51,7 +58,7 @@ func main() { } var configs []config.Config - var nodes []config.Node + var nodes []nodeconf.NodeConfig for i, n := range nodesMap.Nodes { cfg, err := genNodeConfig(n.Addresses, n.APIAddresses, i+1) if err != nil { @@ -59,12 +66,12 @@ func main() { } configs = append(configs, cfg) - node := config.Node{ + node := nodeconf.NodeConfig{ PeerId: cfg.Account.PeerId, - Address: cfg.GrpcServer.ListenAddrs[0], + Addresses: cfg.GrpcServer.Server.ListenAddrs, SigningKey: cfg.Account.SigningKey, EncryptionKey: cfg.Account.EncryptionKey, - Types: []config.NodeType{config.NodeTypeTree}, + Types: []nodeconf.NodeType{nodeconf.NodeTypeTree}, } nodes = append(nodes, node) } @@ -79,7 +86,7 @@ func main() { panic(fmt.Sprintf("could not generate client signing key: %s", err.Error())) } - var clientConfigs []config.Config + var clientConfigs []clconfig.Config for i, c := range nodesMap.Clients { cfg, err := genClientConfig(c.Addresses, c.APIAddresses, encClientKey, signClientKey, i+1) if err != nil { @@ -88,17 +95,17 @@ func main() { clientConfigs = append(clientConfigs, cfg) } - var consConfigs []cconfig.Config + var consConfigs []consconfig.Config for _, n := range nodesMap.Consensus { cfg, err := genConsensusConfig(n.Addresses) if err != nil { panic(fmt.Sprintf("could not generate the config file: %s", err.Error())) } consConfigs = append(consConfigs, cfg) - nodes = append(nodes, config.Node{ - PeerId: cfg.Account.PeerId, - Address: n.Addresses[0], - Types: []config.NodeType{config.NodeTypeConsensus}, + nodes = append(nodes, nodeconf.NodeConfig{ + PeerId: cfg.Account.PeerId, + Addresses: n.Addresses, + Types: []nodeconf.NodeType{nodeconf.NodeTypeConsensus}, }) } var fileConfigs []fconfig.Config @@ -108,10 +115,10 @@ func main() { panic(fmt.Sprintf("could not generate the config file: %s", err.Error())) } fileConfigs = append(fileConfigs, cfg) - nodes = append(nodes, config.Node{ - PeerId: cfg.Account.PeerId, - Address: n.Addresses[0], - Types: []config.NodeType{config.NodeTypeFile}, + nodes = append(nodes, nodeconf.NodeConfig{ + PeerId: cfg.Account.PeerId, + Addresses: n.Addresses, + Types: []nodeconf.NodeType{nodeconf.NodeTypeFile}, }) } @@ -216,133 +223,144 @@ func genNodeConfig(addresses []string, apiAddresses []string, num int) (config.C } return config.Config{ - Anytype: config.Anytype{SwarmKey: "/key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec"}, - GrpcServer: config.GrpcServer{ - ListenAddrs: addresses, - TLS: false, + GrpcServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: addresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Storage: config.Storage{Path: fmt.Sprintf("db/node/%d/data", num)}, - Account: config.Account{ + Storage: storage.Config{Path: fmt.Sprintf("db/node/%d/data", num)}, + Account: commonaccount.Config{ PeerId: peerID.String(), PeerKey: encSignKey, SigningKey: encSignKey, EncryptionKey: encEncKey, }, - APIServer: config.GrpcServer{ - ListenAddrs: apiAddresses, - TLS: false, + APIServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: apiAddresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Space: config.Space{ + Space: commonspace.Config{ GCTTL: 60, SyncPeriod: 600, }, - Stream: config.Stream{ - TimeoutMilliseconds: 1000, - MaxMsgSizeMb: 256, - }, }, nil } -func genClientConfig(addresses []string, apiAddresses []string, encKey encryptionkey.PrivKey, signKey signingkey.PrivKey, num int) (config.Config, error) { +func genClientConfig(addresses []string, apiAddresses []string, encKey encryptionkey.PrivKey, signKey signingkey.PrivKey, num int) (clconfig.Config, error) { peerKey, _, err := signingkey.GenerateRandomEd25519KeyPair() if err != nil { - return config.Config{}, err + return clconfig.Config{}, err } encEncKey, err := keys.EncodeKeyToString(encKey) if err != nil { - return config.Config{}, err + return clconfig.Config{}, err } encSignKey, err := keys.EncodeKeyToString(signKey) if err != nil { - return config.Config{}, err + return clconfig.Config{}, err } encPeerKey, err := keys.EncodeKeyToString(peerKey) if err != nil { - return config.Config{}, err + return clconfig.Config{}, err } peerID, err := peer.IdFromSigningPubKey(peerKey.GetPublic()) if err != nil { - return config.Config{}, err + return clconfig.Config{}, err } - return config.Config{ - Anytype: config.Anytype{SwarmKey: "/key/swarm/psk/1.0.0/base16/209992e611c27d5dce8fbd2e7389f6b51da9bee980992ef60739460b536139ec"}, - GrpcServer: config.GrpcServer{ - ListenAddrs: addresses, - TLS: false, + return clconfig.Config{ + GrpcServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: addresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Storage: config.Storage{Path: fmt.Sprintf("db/client/%d", num)}, - Account: config.Account{ + Storage: badgerprovider.Config{Path: fmt.Sprintf("db/client/%d", num)}, + Account: commonaccount.Config{ PeerId: peerID.String(), PeerKey: encPeerKey, SigningKey: encSignKey, EncryptionKey: encEncKey, }, - APIServer: config.GrpcServer{ - ListenAddrs: apiAddresses, - TLS: false, + APIServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: apiAddresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Space: config.Space{ + Space: commonspace.Config{ GCTTL: 60, SyncPeriod: 20, }, - Stream: config.Stream{ - TimeoutMilliseconds: 1000, - MaxMsgSizeMb: 256, - }, }, nil } -func genConsensusConfig(addresses []string) (cconfig.Config, error) { +func genConsensusConfig(addresses []string) (consconfig.Config, error) { encKey, _, err := encryptionkey.GenerateRandomRSAKeyPair(2048) if err != nil { - return cconfig.Config{}, err + return consconfig.Config{}, err } signKey, _, err := signingkey.GenerateRandomEd25519KeyPair() if err != nil { - return cconfig.Config{}, err + return consconfig.Config{}, err } encEncKey, err := keys.EncodeKeyToString(encKey) if err != nil { - return cconfig.Config{}, err + return consconfig.Config{}, err } encSignKey, err := keys.EncodeKeyToString(signKey) if err != nil { - return cconfig.Config{}, err + return consconfig.Config{}, err } peerID, err := peer.IdFromSigningPubKey(signKey.GetPublic()) if err != nil { - return cconfig.Config{}, err + return consconfig.Config{}, err } - return cconfig.Config{ - GrpcServer: config.GrpcServer{ - ListenAddrs: addresses, - TLS: false, + return consconfig.Config{ + GrpcServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: addresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Account: config.Account{ + Account: commonaccount.Config{ PeerId: peerID.String(), PeerKey: encSignKey, SigningKey: encSignKey, EncryptionKey: encEncKey, }, - Mongo: cconfig.Mongo{ + Mongo: consconfig.Mongo{ Connect: "mongodb://localhost:27017/?w=majority", Database: "consensus", LogCollection: "log", }, - Stream: config.Stream{ - TimeoutMilliseconds: 1000, - MaxMsgSizeMb: 256, - }, }, nil } @@ -372,10 +390,16 @@ func getFileNodeConfig(addresses []string, num int) (fconfig.Config, error) { return fconfig.Config{}, err } return fconfig.Config{ - GrpcServer: config.GrpcServer{ - ListenAddrs: addresses, + GrpcServer: net.Config{ + Server: net.ServerConfig{ + ListenAddrs: addresses, + }, + Stream: net.StreamConfig{ + TimeoutMilliseconds: 1000, + MaxMsgSizeMb: 256, + }, }, - Account: config.Account{ + Account: commonaccount.Config{ PeerId: peerID.String(), PeerKey: encSignKey, SigningKey: encSignKey, @@ -384,9 +408,5 @@ func getFileNodeConfig(addresses []string, num int) (fconfig.Config, error) { FileStorePogreb: fconfig.FileStorePogreb{ Path: fmt.Sprintf("db/file/%d", num), }, - Stream: config.Stream{ - TimeoutMilliseconds: 1000, - MaxMsgSizeMb: 256, - }, }, nil } From d4b90e5202dd3a656d3ec9b32b32ebf32372f400 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Tue, 27 Dec 2022 19:57:01 +0100 Subject: [PATCH 12/17] Fix streampool waiters bug --- common/commonspace/objectsync/streampool.go | 64 +++++++++++---------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index c9b45630..6d550f14 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -246,59 +246,61 @@ func (s *streamPool) Close() (err error) { } func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { - log.With(zap.String("replyId", peerId)).Debug("reading stream from peer") - defer s.wg.Done() + log := log.With(zap.String("peerId", peerId)) + defer func() { + log.Debug("stopped reading stream from peer") + s.removePeer(peerId, stream) + s.wg.Done() + }() + log.Debug("started reading stream from peer") + limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) for i := 0; i < maxSimultaneousOperationsPerStream; i++ { limiter <- struct{}{} } process := func(msg *spacesyncproto.ObjectSyncMessage) { - s.lastUsage.Store(time.Now().Unix()) - log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)). - Debug("getting message with reply id") - if msg.ReplyId == "" { - s.messageHandler(stream.Context(), peerId, msg) - return + log := log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)) + log.Debug("getting message with reply id") + err = s.messageHandler(stream.Context(), peerId, msg) + if err != nil { + log.With(zap.Error(err)).Debug("message handling failed") } - s.waitersMx.Lock() - waiter, exists := s.waiters[msg.ReplyId] - - if !exists { - log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id not exists") - s.waitersMx.Unlock() - s.messageHandler(stream.Context(), peerId, msg) - return - } - log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id exists") - - delete(s.waiters, msg.ReplyId) - s.waitersMx.Unlock() - waiter.ch <- msg } -Loop: for { var msg *spacesyncproto.ObjectSyncMessage msg, err = stream.Recv() s.lastUsage.Store(time.Now().Unix()) if err != nil { - break + return } + + if msg.ReplyId != "" { + s.waitersMx.Lock() + waiter, exists := s.waiters[msg.ReplyId] + if exists { + delete(s.waiters, msg.ReplyId) + s.waitersMx.Unlock() + waiter.ch <- msg + continue + } + s.waitersMx.Unlock() + + log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id does not exist") + } + select { case <-limiter: case <-stream.Context().Done(): - log.Debug("stream context done") - break Loop + return } - go func() { + + go func(msg *spacesyncproto.ObjectSyncMessage) { process(msg) limiter <- struct{}{} - }() + }(msg) } - log.With(zap.String("peerId", peerId)).Debug("stopped reading stream from peer") - s.removePeer(peerId, stream) - return } func (s *streamPool) removePeer(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { From fa076ee83fc5a6a1e96479cd6ef79900526c1b42 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Tue, 27 Dec 2022 19:59:27 +0100 Subject: [PATCH 13/17] Fix waiters in streampool --- common/commonspace/syncservice/streampool.go | 64 ++++++++++---------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/common/commonspace/syncservice/streampool.go b/common/commonspace/syncservice/streampool.go index b1bc0f09..8e5231c7 100644 --- a/common/commonspace/syncservice/streampool.go +++ b/common/commonspace/syncservice/streampool.go @@ -246,59 +246,61 @@ func (s *streamPool) Close() (err error) { } func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.SpaceStream) (err error) { - log.With(zap.String("replyId", peerId)).Debug("reading stream from peer") - defer s.wg.Done() + log := log.With(zap.String("peerId", peerId)) + defer func() { + log.Debug("stopped reading stream from peer") + s.removePeer(peerId, stream) + s.wg.Done() + }() + log.Debug("started reading stream from peer") + limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) for i := 0; i < maxSimultaneousOperationsPerStream; i++ { limiter <- struct{}{} } process := func(msg *spacesyncproto.ObjectSyncMessage) { - s.lastUsage.Store(time.Now().Unix()) - log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)). - Debug("getting message with reply id") - if msg.ReplyId == "" { - s.messageHandler(stream.Context(), peerId, msg) - return + log := log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)) + log.Debug("getting message with reply id") + err = s.messageHandler(stream.Context(), peerId, msg) + if err != nil { + log.With(zap.Error(err)).Debug("message handling failed") } - s.waitersMx.Lock() - waiter, exists := s.waiters[msg.ReplyId] - - if !exists { - log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id not exists") - s.waitersMx.Unlock() - s.messageHandler(stream.Context(), peerId, msg) - return - } - log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id exists") - - delete(s.waiters, msg.ReplyId) - s.waitersMx.Unlock() - waiter.ch <- msg } -Loop: for { var msg *spacesyncproto.ObjectSyncMessage msg, err = stream.Recv() s.lastUsage.Store(time.Now().Unix()) if err != nil { - break + return } + + if msg.ReplyId != "" { + s.waitersMx.Lock() + waiter, exists := s.waiters[msg.ReplyId] + if exists { + delete(s.waiters, msg.ReplyId) + s.waitersMx.Unlock() + waiter.ch <- msg + continue + } + s.waitersMx.Unlock() + + log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id does not exist") + } + select { case <-limiter: case <-stream.Context().Done(): - log.Debug("stream context done") - break Loop + return } - go func() { + + go func(msg *spacesyncproto.ObjectSyncMessage) { process(msg) limiter <- struct{}{} - }() + }(msg) } - log.With(zap.String("peerId", peerId)).Debug("stopped reading stream from peer") - s.removePeer(peerId, stream) - return } func (s *streamPool) removePeer(peerId string, stream spacesyncproto.SpaceStream) (err error) { From 98b8584efc6b278f96fdbfe34951d27883dddba4 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Tue, 27 Dec 2022 22:26:07 +0100 Subject: [PATCH 14/17] Change solution to use queue for better performance --- common/commonspace/objectsync/actionqueue.go | 6 +- common/commonspace/objectsync/streampool.go | 78 ++++++++++++++------ 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/common/commonspace/objectsync/actionqueue.go b/common/commonspace/objectsync/actionqueue.go index bf76334f..740c5b9b 100644 --- a/common/commonspace/objectsync/actionqueue.go +++ b/common/commonspace/objectsync/actionqueue.go @@ -42,13 +42,13 @@ func (q *actionQueue) Run() { } func (q *actionQueue) read() { - limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) - for i := 0; i < maxSimultaneousOperationsPerStream; i++ { + limiter := make(chan struct{}, maxStreamReaders) + for i := 0; i < maxStreamReaders; i++ { limiter <- struct{}{} } defer func() { // wait until all operations are done - for i := 0; i < maxSimultaneousOperationsPerStream; i++ { + for i := 0; i < maxStreamReaders; i++ { <-limiter } close(q.queueDone) diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index 6d550f14..6f150a81 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -16,7 +16,7 @@ import ( var ErrEmptyPeer = errors.New("don't have such a peer") var ErrStreamClosed = errors.New("stream is already closed") -var maxSimultaneousOperationsPerStream = 10 +var maxStreamReaders = 10 var syncWaitPeriod = 2 * time.Second var ErrSyncTimeout = errors.New("too long wait on sync receive") @@ -246,7 +246,14 @@ func (s *streamPool) Close() (err error) { } func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { - log := log.With(zap.String("peerId", peerId)) + var ( + msg *spacesyncproto.ObjectSyncMessage + mx = sync.Mutex{} + maxWaitMsgs = 500 + queue = make([]*spacesyncproto.ObjectSyncMessage, 0, 10) + readers = 0 + log = log.With(zap.String("peerId", peerId)) + ) defer func() { log.Debug("stopped reading stream from peer") s.removePeer(peerId, stream) @@ -254,22 +261,45 @@ func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyn }() log.Debug("started reading stream from peer") - limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) - for i := 0; i < maxSimultaneousOperationsPerStream; i++ { - limiter <- struct{}{} - } + readQueue := func() { + defer func() { + mx.Lock() + readers-- + mx.Unlock() + }() - process := func(msg *spacesyncproto.ObjectSyncMessage) { - log := log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)) - log.Debug("getting message with reply id") - err = s.messageHandler(stream.Context(), peerId, msg) - if err != nil { - log.With(zap.Error(err)).Debug("message handling failed") + for { + select { + case <-stream.Context().Done(): + return + default: + } + + mx.Lock() + if len(queue) == 0 { + mx.Unlock() + return + } + newEl := queue[0] + queue = queue[1:] + mx.Unlock() + + log := log.With(zap.String("replyId", newEl.ReplyId), zap.String("object id", newEl.ObjectId)) + log.Debug("getting message with reply id") + err = s.messageHandler(stream.Context(), peerId, newEl) + if err != nil { + log.With(zap.Error(err)).Debug("message handling failed") + } } } for { - var msg *spacesyncproto.ObjectSyncMessage + select { + case <-stream.Context().Done(): + return + default: + } + msg, err = stream.Recv() s.lastUsage.Store(time.Now().Unix()) if err != nil { @@ -277,6 +307,7 @@ func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyn } if msg.ReplyId != "" { + // then we can send it directly to waiters without adding to queue or starting a reader s.waitersMx.Lock() waiter, exists := s.waiters[msg.ReplyId] if exists { @@ -290,16 +321,21 @@ func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyn log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id does not exist") } - select { - case <-limiter: - case <-stream.Context().Done(): - return + mx.Lock() + queue = append(queue, msg) + if len(queue) > maxWaitMsgs { + queue = queue[len(queue)-maxWaitMsgs:] } + // if we already have max goroutines reading the queue in parallel + if readers >= maxStreamReaders { + mx.Unlock() + continue + } + readers++ + mx.Unlock() - go func(msg *spacesyncproto.ObjectSyncMessage) { - process(msg) - limiter <- struct{}{} - }(msg) + // starting another reader + go readQueue() } } From a103c960a479226c894fedb552cd2c2ff99cb606 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 28 Dec 2022 17:52:10 +0100 Subject: [PATCH 15/17] Some streampool fixes --- common/commonspace/objectsync/actionqueue.go | 6 ++ common/commonspace/objectsync/streampool.go | 91 +++++++------------- 2 files changed, 38 insertions(+), 59 deletions(-) diff --git a/common/commonspace/objectsync/actionqueue.go b/common/commonspace/objectsync/actionqueue.go index 740c5b9b..98409978 100644 --- a/common/commonspace/objectsync/actionqueue.go +++ b/common/commonspace/objectsync/actionqueue.go @@ -61,6 +61,12 @@ func (q *actionQueue) read() { return } for _, msg := range actions { + select { + case <-q.ctx.Done(): + return + default: + } + <-limiter go func(action ActionFunc) { err = action() diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index 6f150a81..0208e253 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -247,50 +247,41 @@ func (s *streamPool) Close() (err error) { func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { var ( - msg *spacesyncproto.ObjectSyncMessage - mx = sync.Mutex{} - maxWaitMsgs = 500 - queue = make([]*spacesyncproto.ObjectSyncMessage, 0, 10) - readers = 0 - log = log.With(zap.String("peerId", peerId)) + log = log.With(zap.String("peerId", peerId)) + queue = NewActionQueue() ) + queue.Run() + defer func() { log.Debug("stopped reading stream from peer") s.removePeer(peerId, stream) + queue.Close() s.wg.Done() }() + log.Debug("started reading stream from peer") - readQueue := func() { - defer func() { - mx.Lock() - readers-- - mx.Unlock() - }() - - for { - select { - case <-stream.Context().Done(): - return - default: - } - - mx.Lock() - if len(queue) == 0 { - mx.Unlock() - return - } - newEl := queue[0] - queue = queue[1:] - mx.Unlock() - - log := log.With(zap.String("replyId", newEl.ReplyId), zap.String("object id", newEl.ObjectId)) - log.Debug("getting message with reply id") - err = s.messageHandler(stream.Context(), peerId, newEl) - if err != nil { - log.With(zap.Error(err)).Debug("message handling failed") - } + stopWaiter := func(msg *spacesyncproto.ObjectSyncMessage) bool { + s.waitersMx.Lock() + waiter, exists := s.waiters[msg.ReplyId] + if exists { + delete(s.waiters, msg.ReplyId) + s.waitersMx.Unlock() + waiter.ch <- msg + return true } + s.waitersMx.Unlock() + return false + } + + process := func(msg *spacesyncproto.ObjectSyncMessage) error { + log := log.With(zap.String("replyId", msg.ReplyId), zap.String("object id", msg.ObjectId)) + log.Debug("getting message with reply id") + err = s.messageHandler(stream.Context(), peerId, msg) + if err != nil { + log.With(zap.Error(err)).Debug("message handling failed") + } + return nil } for { @@ -299,43 +290,25 @@ func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyn return default: } - + var msg *spacesyncproto.ObjectSyncMessage msg, err = stream.Recv() s.lastUsage.Store(time.Now().Unix()) if err != nil { + stream.Close() return } if msg.ReplyId != "" { // then we can send it directly to waiters without adding to queue or starting a reader - s.waitersMx.Lock() - waiter, exists := s.waiters[msg.ReplyId] - if exists { - delete(s.waiters, msg.ReplyId) - s.waitersMx.Unlock() - waiter.ch <- msg + if stopWaiter(msg) { continue } - s.waitersMx.Unlock() - log.With(zap.String("replyId", msg.ReplyId)).Debug("reply id does not exist") } - mx.Lock() - queue = append(queue, msg) - if len(queue) > maxWaitMsgs { - queue = queue[len(queue)-maxWaitMsgs:] - } - // if we already have max goroutines reading the queue in parallel - if readers >= maxStreamReaders { - mx.Unlock() - continue - } - readers++ - mx.Unlock() - - // starting another reader - go readQueue() + queue.Send(func() error { + return process(msg) + }) } } From b5dc56d72c4c3ff27295bf9253e782f00176fff9 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 29 Dec 2022 13:45:55 +0100 Subject: [PATCH 16/17] Update action queue --- common/commonspace/objectsync/actionqueue.go | 84 ++++++++------------ common/commonspace/objectsync/objectsync.go | 2 +- common/commonspace/objectsync/streampool.go | 2 +- 3 files changed, 34 insertions(+), 54 deletions(-) diff --git a/common/commonspace/objectsync/actionqueue.go b/common/commonspace/objectsync/actionqueue.go index 98409978..8c677478 100644 --- a/common/commonspace/objectsync/actionqueue.go +++ b/common/commonspace/objectsync/actionqueue.go @@ -15,79 +15,59 @@ type ActionQueue interface { } type actionQueue struct { - batcher *mb.MB[ActionFunc] - ctx context.Context - cancel context.CancelFunc - queueDone chan struct{} + batcher *mb.MB[ActionFunc] + maxReaders int + maxQueueLen int + readers chan struct{} } -func NewActionQueue() ActionQueue { +func NewActionQueue(maxReaders int, maxQueueLen int) ActionQueue { return &actionQueue{ - batcher: mb.New[ActionFunc](0), - ctx: nil, - cancel: nil, - queueDone: make(chan struct{}), + batcher: mb.New[ActionFunc](maxQueueLen), + maxReaders: maxReaders, + maxQueueLen: maxQueueLen, } } func (q *actionQueue) Send(action ActionFunc) (err error) { log.Debug("adding action to batcher") - return q.batcher.Add(q.ctx, action) + err = q.batcher.TryAdd(action) + if err == nil { + return + } + log.With(zap.Error(err)).Debug("queue returned error") + actions := q.batcher.GetAll() + actions = actions[len(actions)/2:] + return q.batcher.Add(context.Background(), actions...) } func (q *actionQueue) Run() { log.Debug("running the queue") - q.ctx, q.cancel = context.WithCancel(context.Background()) - go q.read() + q.readers = make(chan struct{}, q.maxReaders) + for i := 0; i < q.maxReaders; i++ { + go q.startReading() + } } -func (q *actionQueue) read() { - limiter := make(chan struct{}, maxStreamReaders) - for i := 0; i < maxStreamReaders; i++ { - limiter <- struct{}{} - } +func (q *actionQueue) startReading() { defer func() { - // wait until all operations are done - for i := 0; i < maxStreamReaders; i++ { - <-limiter - } - close(q.queueDone) + q.readers <- struct{}{} }() - doSendActions := func() { - actions, err := q.batcher.Wait(q.ctx) - log.Debug("reading from batcher") - if err != nil { - log.With(zap.Error(err)).Error("queue finished") - return - } - for _, msg := range actions { - select { - case <-q.ctx.Done(): - return - default: - } - - <-limiter - go func(action ActionFunc) { - err = action() - if err != nil { - log.With(zap.Error(err)).Debug("action errored out") - } - limiter <- struct{}{} - }(msg) - } - } for { - select { - case <-q.ctx.Done(): + action, err := q.batcher.WaitOne(context.Background()) + if err != nil { return - default: - doSendActions() + } + err = action() + if err != nil { + log.With(zap.Error(err)).Debug("action errored out") } } } func (q *actionQueue) Close() { - q.cancel() - <-q.queueDone + q.batcher.Close() + for i := 0; i < q.maxReaders; i++ { + <-q.readers + } } diff --git a/common/commonspace/objectsync/objectsync.go b/common/commonspace/objectsync/objectsync.go index 097706c3..f9d1fd86 100644 --- a/common/commonspace/objectsync/objectsync.go +++ b/common/commonspace/objectsync/objectsync.go @@ -86,7 +86,7 @@ func newObjectSync( checker: checker, syncCtx: syncCtx, cancelSync: cancel, - actionQueue: NewActionQueue(), + actionQueue: NewActionQueue(maxStreamReaders, 100), } } diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index 0208e253..46689ab8 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -248,7 +248,7 @@ func (s *streamPool) Close() (err error) { func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { var ( log = log.With(zap.String("peerId", peerId)) - queue = NewActionQueue() + queue = NewActionQueue(maxStreamReaders, 100) ) queue.Run() From a855f02f6328872795e41cbf62d37010f623de2a Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 29 Dec 2022 15:16:30 +0100 Subject: [PATCH 17/17] Add queue test --- common/commonspace/objectsync/actionqueue.go | 7 ++- .../objectsync/actionqueue_test.go | 54 +++++++++++++++++++ common/commonspace/objectsync/objectsync.go | 2 +- common/commonspace/objectsync/streampool.go | 2 +- 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 common/commonspace/objectsync/actionqueue_test.go diff --git a/common/commonspace/objectsync/actionqueue.go b/common/commonspace/objectsync/actionqueue.go index 8c677478..65d5e3af 100644 --- a/common/commonspace/objectsync/actionqueue.go +++ b/common/commonspace/objectsync/actionqueue.go @@ -21,6 +21,10 @@ type actionQueue struct { readers chan struct{} } +func NewDefaultActionQueue() ActionQueue { + return NewActionQueue(10, 200) +} + func NewActionQueue(maxReaders int, maxQueueLen int) ActionQueue { return &actionQueue{ batcher: mb.New[ActionFunc](maxQueueLen), @@ -37,7 +41,7 @@ func (q *actionQueue) Send(action ActionFunc) (err error) { } log.With(zap.Error(err)).Debug("queue returned error") actions := q.batcher.GetAll() - actions = actions[len(actions)/2:] + actions = append(actions[len(actions)/2:], action) return q.batcher.Add(context.Background(), actions...) } @@ -66,6 +70,7 @@ func (q *actionQueue) startReading() { } func (q *actionQueue) Close() { + log.Debug("closing the queue") q.batcher.Close() for i := 0; i < q.maxReaders; i++ { <-q.readers diff --git a/common/commonspace/objectsync/actionqueue_test.go b/common/commonspace/objectsync/actionqueue_test.go new file mode 100644 index 00000000..eef4a952 --- /dev/null +++ b/common/commonspace/objectsync/actionqueue_test.go @@ -0,0 +1,54 @@ +package objectsync + +import ( + "fmt" + "github.com/stretchr/testify/require" + "sync/atomic" + "testing" +) + +func TestActionQueue_Send(t *testing.T) { + maxReaders := 41 + maxLen := 93 + + queue := NewActionQueue(maxReaders, maxLen).(*actionQueue) + counter := atomic.Int32{} + expectedCounter := int32(maxReaders + (maxLen+1)/2 + 1) + blocker := make(chan struct{}, expectedCounter) + waiter := make(chan struct{}, expectedCounter) + increase := func() error { + counter.Add(1) + waiter <- struct{}{} + <-blocker + return nil + } + + queue.Run() + // sending maxReaders messages, so the goroutines will block on `blocker` channel + for i := 0; i < maxReaders; i++ { + queue.Send(increase) + } + // waiting until they all make progress + for i := 0; i < maxReaders; i++ { + <-waiter + } + fmt.Println(counter.Load()) + // check that queue is empty + require.Equal(t, queue.batcher.Len(), 0) + // making queue to overflow while readers are blocked + for i := 0; i < maxLen+1; i++ { + queue.Send(increase) + } + // check that queue was halved after overflow + require.Equal(t, (maxLen+1)/2+1, queue.batcher.Len()) + // unblocking maxReaders waiting + then we should also unblock the new readers to do a bit more readings + for i := 0; i < int(expectedCounter); i++ { + blocker <- struct{}{} + } + // waiting for all readers to finish adding + for i := 0; i < int(expectedCounter)-maxReaders; i++ { + <-waiter + } + queue.Close() + require.Equal(t, expectedCounter, counter.Load()) +} diff --git a/common/commonspace/objectsync/objectsync.go b/common/commonspace/objectsync/objectsync.go index f9d1fd86..b3c482a6 100644 --- a/common/commonspace/objectsync/objectsync.go +++ b/common/commonspace/objectsync/objectsync.go @@ -86,7 +86,7 @@ func newObjectSync( checker: checker, syncCtx: syncCtx, cancelSync: cancel, - actionQueue: NewActionQueue(maxStreamReaders, 100), + actionQueue: NewDefaultActionQueue(), } } diff --git a/common/commonspace/objectsync/streampool.go b/common/commonspace/objectsync/streampool.go index 46689ab8..891c5f5f 100644 --- a/common/commonspace/objectsync/streampool.go +++ b/common/commonspace/objectsync/streampool.go @@ -248,7 +248,7 @@ func (s *streamPool) Close() (err error) { func (s *streamPool) readPeerLoop(peerId string, stream spacesyncproto.ObjectSyncStream) (err error) { var ( log = log.With(zap.String("peerId", peerId)) - queue = NewActionQueue(maxStreamReaders, 100) + queue = NewDefaultActionQueue() ) queue.Run()