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

Refactor spacesyncproto

Browse Source
This commit is contained in:
mcrakhman 2022-12-25 21:12:17 +01:00 committed by Mikhail Iudin
parent a66a356947
commit 98323b0063
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
21 changed files with 509 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/clientspace/rpchandler.go
View File

@ -10,7 +10,7 @@ type rpcHandler struct {
s *service 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) sp, err := r.s.GetSpace(ctx, request.Id)
if err != nil { if err != nil {
if err != spacesyncproto.ErrSpaceMissing { if err != spacesyncproto.ErrSpaceMissing {
@ -25,7 +25,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull
return return
} }
resp = &spacesyncproto.PullSpaceResponse{ resp = &spacesyncproto.SpacePullResponse{
Payload: &spacesyncproto.SpacePayload{ Payload: &spacesyncproto.SpacePayload{
SpaceHeader: spaceDesc.SpaceHeader, SpaceHeader: spaceDesc.SpaceHeader,
AclPayloadId: spaceDesc.AclId, AclPayloadId: spaceDesc.AclId,
@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull
return 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{ description := commonspace.SpaceDescription{
SpaceHeader: req.Payload.SpaceHeader, SpaceHeader: req.Payload.SpaceHeader,
AclId: req.Payload.AclPayloadId, AclId: req.Payload.AclPayloadId,
@ -50,7 +50,7 @@ func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpac
if err != nil { if err != nil {
return return
} }
resp = &spacesyncproto.PushSpaceResponse{} resp = &spacesyncproto.SpacePushResponse{}
return return
} }
@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR
return sp.SpaceSyncRpc().HeadSync(ctx, req) 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() msg, err := stream.Recv()
if err != nil { if err != nil {
return err return err

7
common/Makefile
View File

@ -5,20 +5,17 @@ proto:
@echo 'Generating protobuf packages (Go)...' @echo 'Generating protobuf packages (Go)...'
@$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1) @$(eval GOGO_START := GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1)
@$(eval P_ACL_RECORDS_PATH_PB := pkg/acl/aclrecordproto) @$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto)
@$(eval P_TREE_CHANGES_PATH_PB := pkg/acl/treechangeproto) @$(eval P_TREE_CHANGES_PATH_PB := commonspace/object/tree/treechangeproto)
@$(eval P_SYNC_CHANGES_PATH_PB := syncproto) @$(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_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)) @$(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_ACL_RECORDS_PATH_PB)/protos/*.proto
$(GOGO_START) protoc --gogofaster_out=:. $(P_TREE_CHANGES_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)) $(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:. commonspace/spacesyncproto/protos/*.proto
$(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonfile/fileproto/protos/*.proto $(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonfile/fileproto/protos/*.proto
test: test:
go test ./... --cover go test ./... --cover

4
common/commonspace/headsync/diffsyncer.go
View File

@ -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() aclStorage, err := d.storage.ACLStorage()
if err != nil { if err != nil {
return return
@ -178,7 +178,7 @@ func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, cl spacesyncproto
SpaceSettingsPayload: spaceSettingsRoot.RawChange, SpaceSettingsPayload: spaceSettingsRoot.RawChange,
SpaceSettingsPayloadId: spaceSettingsRoot.Id, SpaceSettingsPayloadId: spaceSettingsRoot.Id,
} }
_, err = cl.PushSpace(ctx, &spacesyncproto.PushSpaceRequest{ _, err = cl.SpacePush(ctx, &spacesyncproto.SpacePushRequest{
Payload: spacePayload, Payload: spacePayload,
}) })
return return

8
common/commonspace/headsync/diffsyncer_test.go
View File

@ -33,7 +33,7 @@ type pushSpaceRequestMatcher struct {
} }
func (p pushSpaceRequestMatcher) Matches(x interface{}) bool { func (p pushSpaceRequestMatcher) Matches(x interface{}) bool {
res, ok := x.(*spacesyncproto.PushSpaceRequest) res, ok := x.(*spacesyncproto.SpacePushRequest)
if !ok { if !ok {
return false return false
} }
@ -101,8 +101,8 @@ func TestDiffSyncer_Sync(t *testing.T) {
connectorMock := mock_nodeconf.NewMockConfConnector(ctrl) connectorMock := mock_nodeconf.NewMockConfConnector(ctrl)
cacheMock := mock_treegetter.NewMockTreeGetter(ctrl) cacheMock := mock_treegetter.NewMockTreeGetter(ctrl)
stMock := mock_spacestorage.NewMockSpaceStorage(ctrl) stMock := mock_spacestorage.NewMockSpaceStorage(ctrl)
clientMock := mock_spacesyncproto.NewMockDRPCSpaceClient(ctrl) clientMock := mock_spacesyncproto.NewMockDRPCSpaceSyncClient(ctrl)
factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceClient { factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceSyncClient {
return clientMock return clientMock
}) })
delState := mock_deletionstate.NewMockDeletionState(ctrl) delState := mock_deletionstate.NewMockDeletionState(ctrl)
@ -186,7 +186,7 @@ func TestDiffSyncer_Sync(t *testing.T) {
Root(). Root().
Return(aclRoot, nil) Return(aclRoot, nil)
clientMock.EXPECT(). clientMock.EXPECT().
PushSpace(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, spaceHeader)). SpacePush(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, spaceHeader)).
Return(nil, nil) Return(nil, nil)
require.NoError(t, diffSyncer.Sync(ctx)) require.NoError(t, diffSyncer.Sync(ctx))

2
common/commonspace/headsync/headsync.go
View File

@ -54,7 +54,7 @@ func NewHeadSync(
diff := ldiff.New(16, 16) diff := ldiff.New(16, 16)
l := log.With(zap.String("spaceId", spaceId)) 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) syncer := newDiffSyncer(spaceId, diff, confConnector, cache, storage, factory, syncStatus, l)
periodicSync := periodicsync.NewPeriodicSync(syncPeriod, time.Minute, syncer.Sync, l) periodicSync := periodicsync.NewPeriodicSync(syncPeriod, time.Minute, syncer.Sync, l)

302
common/commonspace/object/acl/aclrecordproto/aclrecord.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package aclrecordproto
@ -47,7 +47,7 @@ func (x ACLUserPermissions) String() string {
} }
func (ACLUserPermissions) EnumDescriptor() ([]byte, []int) { func (ACLUserPermissions) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{0} return fileDescriptor_c8e9f754f34e929b, []int{0}
} }
type RawACLRecord struct { type RawACLRecord struct {
@ -61,7 +61,7 @@ func (m *RawACLRecord) Reset() { *m = RawACLRecord{} }
func (m *RawACLRecord) String() string { return proto.CompactTextString(m) } func (m *RawACLRecord) String() string { return proto.CompactTextString(m) }
func (*RawACLRecord) ProtoMessage() {} func (*RawACLRecord) ProtoMessage() {}
func (*RawACLRecord) Descriptor() ([]byte, []int) { func (*RawACLRecord) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{0} 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) return m.Unmarshal(b)
@ -127,7 +127,7 @@ func (m *RawACLRecordWithId) Reset() { *m = RawACLRecordWithId{} }
func (m *RawACLRecordWithId) String() string { return proto.CompactTextString(m) } func (m *RawACLRecordWithId) String() string { return proto.CompactTextString(m) }
func (*RawACLRecordWithId) ProtoMessage() {} func (*RawACLRecordWithId) ProtoMessage() {}
func (*RawACLRecordWithId) Descriptor() ([]byte, []int) { func (*RawACLRecordWithId) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{1} 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) return m.Unmarshal(b)
@ -182,7 +182,7 @@ func (m *ACLRecord) Reset() { *m = ACLRecord{} }
func (m *ACLRecord) String() string { return proto.CompactTextString(m) } func (m *ACLRecord) String() string { return proto.CompactTextString(m) }
func (*ACLRecord) ProtoMessage() {} func (*ACLRecord) ProtoMessage() {}
func (*ACLRecord) Descriptor() ([]byte, []int) { func (*ACLRecord) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{2} 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) return m.Unmarshal(b)
@ -260,7 +260,7 @@ func (m *ACLRoot) Reset() { *m = ACLRoot{} }
func (m *ACLRoot) String() string { return proto.CompactTextString(m) } func (m *ACLRoot) String() string { return proto.CompactTextString(m) }
func (*ACLRoot) ProtoMessage() {} func (*ACLRoot) ProtoMessage() {}
func (*ACLRoot) Descriptor() ([]byte, []int) { func (*ACLRoot) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{3} 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) return m.Unmarshal(b)
@ -353,7 +353,7 @@ func (m *ACLContentValue) Reset() { *m = ACLContentValue{} }
func (m *ACLContentValue) String() string { return proto.CompactTextString(m) } func (m *ACLContentValue) String() string { return proto.CompactTextString(m) }
func (*ACLContentValue) ProtoMessage() {} func (*ACLContentValue) ProtoMessage() {}
func (*ACLContentValue) Descriptor() ([]byte, []int) { func (*ACLContentValue) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{4} 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) return m.Unmarshal(b)
@ -471,7 +471,7 @@ func (m *ACLData) Reset() { *m = ACLData{} }
func (m *ACLData) String() string { return proto.CompactTextString(m) } func (m *ACLData) String() string { return proto.CompactTextString(m) }
func (*ACLData) ProtoMessage() {} func (*ACLData) ProtoMessage() {}
func (*ACLData) Descriptor() ([]byte, []int) { func (*ACLData) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{5} 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) return m.Unmarshal(b)
@ -517,7 +517,7 @@ func (m *ACLState) Reset() { *m = ACLState{} }
func (m *ACLState) String() string { return proto.CompactTextString(m) } func (m *ACLState) String() string { return proto.CompactTextString(m) }
func (*ACLState) ProtoMessage() {} func (*ACLState) ProtoMessage() {}
func (*ACLState) Descriptor() ([]byte, []int) { func (*ACLState) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{6} 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) return m.Unmarshal(b)
@ -577,7 +577,7 @@ func (m *ACLUserState) Reset() { *m = ACLUserState{} }
func (m *ACLUserState) String() string { return proto.CompactTextString(m) } func (m *ACLUserState) String() string { return proto.CompactTextString(m) }
func (*ACLUserState) ProtoMessage() {} func (*ACLUserState) ProtoMessage() {}
func (*ACLUserState) Descriptor() ([]byte, []int) { func (*ACLUserState) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{7} 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) return m.Unmarshal(b)
@ -638,7 +638,7 @@ func (m *ACLUserAdd) Reset() { *m = ACLUserAdd{} }
func (m *ACLUserAdd) String() string { return proto.CompactTextString(m) } func (m *ACLUserAdd) String() string { return proto.CompactTextString(m) }
func (*ACLUserAdd) ProtoMessage() {} func (*ACLUserAdd) ProtoMessage() {}
func (*ACLUserAdd) Descriptor() ([]byte, []int) { func (*ACLUserAdd) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{8} 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) return m.Unmarshal(b)
@ -696,20 +696,17 @@ func (m *ACLUserAdd) GetPermissions() ACLUserPermissions {
} }
type ACLUserInvite struct { type ACLUserInvite struct {
AcceptPublicKey []byte `protobuf:"bytes,1,opt,name=acceptPublicKey,proto3" json:"acceptPublicKey,omitempty"` AcceptPublicKey []byte `protobuf:"bytes,1,opt,name=acceptPublicKey,proto3" json:"acceptPublicKey,omitempty"`
// TODO: change to read key EncryptSymKeyHash uint64 `protobuf:"varint,2,opt,name=encryptSymKeyHash,proto3" json:"encryptSymKeyHash,omitempty"`
EncryptPublicKey []byte `protobuf:"bytes,2,opt,name=encryptPublicKey,proto3" json:"encryptPublicKey,omitempty"`
EncryptedReadKeys [][]byte `protobuf:"bytes,3,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,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"`
// TODO: either derive inviteId from pub keys or think if it is possible to just use ACL record id
InviteId string `protobuf:"bytes,5,opt,name=inviteId,proto3" json:"inviteId,omitempty"`
} }
func (m *ACLUserInvite) Reset() { *m = ACLUserInvite{} } func (m *ACLUserInvite) Reset() { *m = ACLUserInvite{} }
func (m *ACLUserInvite) String() string { return proto.CompactTextString(m) } func (m *ACLUserInvite) String() string { return proto.CompactTextString(m) }
func (*ACLUserInvite) ProtoMessage() {} func (*ACLUserInvite) ProtoMessage() {}
func (*ACLUserInvite) Descriptor() ([]byte, []int) { func (*ACLUserInvite) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{9} 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) return m.Unmarshal(b)
@ -745,11 +742,11 @@ func (m *ACLUserInvite) GetAcceptPublicKey() []byte {
return nil return nil
} }
func (m *ACLUserInvite) GetEncryptPublicKey() []byte { func (m *ACLUserInvite) GetEncryptSymKeyHash() uint64 {
if m != nil { if m != nil {
return m.EncryptPublicKey return m.EncryptSymKeyHash
} }
return nil return 0
} }
func (m *ACLUserInvite) GetEncryptedReadKeys() [][]byte { func (m *ACLUserInvite) GetEncryptedReadKeys() [][]byte {
@ -766,18 +763,11 @@ func (m *ACLUserInvite) GetPermissions() ACLUserPermissions {
return ACLUserPermissions_Admin return ACLUserPermissions_Admin
} }
func (m *ACLUserInvite) GetInviteId() string {
if m != nil {
return m.InviteId
}
return ""
}
type ACLUserJoin struct { type ACLUserJoin struct {
Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"`
EncryptionKey []byte `protobuf:"bytes,2,opt,name=encryptionKey,proto3" json:"encryptionKey,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"` AcceptSignature []byte `protobuf:"bytes,3,opt,name=acceptSignature,proto3" json:"acceptSignature,omitempty"`
InviteId string `protobuf:"bytes,4,opt,name=inviteId,proto3" json:"inviteId,omitempty"` AcceptPubKey []byte `protobuf:"bytes,4,opt,name=acceptPubKey,proto3" json:"acceptPubKey,omitempty"`
EncryptedReadKeys [][]byte `protobuf:"bytes,5,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,omitempty"` EncryptedReadKeys [][]byte `protobuf:"bytes,5,rep,name=encryptedReadKeys,proto3" json:"encryptedReadKeys,omitempty"`
} }
@ -785,7 +775,7 @@ func (m *ACLUserJoin) Reset() { *m = ACLUserJoin{} }
func (m *ACLUserJoin) String() string { return proto.CompactTextString(m) } func (m *ACLUserJoin) String() string { return proto.CompactTextString(m) }
func (*ACLUserJoin) ProtoMessage() {} func (*ACLUserJoin) ProtoMessage() {}
func (*ACLUserJoin) Descriptor() ([]byte, []int) { func (*ACLUserJoin) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{10} 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) return m.Unmarshal(b)
@ -835,11 +825,11 @@ func (m *ACLUserJoin) GetAcceptSignature() []byte {
return nil return nil
} }
func (m *ACLUserJoin) GetInviteId() string { func (m *ACLUserJoin) GetAcceptPubKey() []byte {
if m != nil { if m != nil {
return m.InviteId return m.AcceptPubKey
} }
return "" return nil
} }
func (m *ACLUserJoin) GetEncryptedReadKeys() [][]byte { func (m *ACLUserJoin) GetEncryptedReadKeys() [][]byte {
@ -851,14 +841,14 @@ func (m *ACLUserJoin) GetEncryptedReadKeys() [][]byte {
type ACLUserRemove struct { type ACLUserRemove struct {
Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"` Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"`
ReadKeyReplaces []*ACLReadKeyReplace `protobuf:"bytes,3,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) Reset() { *m = ACLUserRemove{} }
func (m *ACLUserRemove) String() string { return proto.CompactTextString(m) } func (m *ACLUserRemove) String() string { return proto.CompactTextString(m) }
func (*ACLUserRemove) ProtoMessage() {} func (*ACLUserRemove) ProtoMessage() {}
func (*ACLUserRemove) Descriptor() ([]byte, []int) { func (*ACLUserRemove) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{11} 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) return m.Unmarshal(b)
@ -911,7 +901,7 @@ func (m *ACLReadKeyReplace) Reset() { *m = ACLReadKeyReplace{} }
func (m *ACLReadKeyReplace) String() string { return proto.CompactTextString(m) } func (m *ACLReadKeyReplace) String() string { return proto.CompactTextString(m) }
func (*ACLReadKeyReplace) ProtoMessage() {} func (*ACLReadKeyReplace) ProtoMessage() {}
func (*ACLReadKeyReplace) Descriptor() ([]byte, []int) { func (*ACLReadKeyReplace) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{12} 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) return m.Unmarshal(b)
@ -970,7 +960,7 @@ func (m *ACLUserPermissionChange) Reset() { *m = ACLUserPermissionChange
func (m *ACLUserPermissionChange) String() string { return proto.CompactTextString(m) } func (m *ACLUserPermissionChange) String() string { return proto.CompactTextString(m) }
func (*ACLUserPermissionChange) ProtoMessage() {} func (*ACLUserPermissionChange) ProtoMessage() {}
func (*ACLUserPermissionChange) Descriptor() ([]byte, []int) { func (*ACLUserPermissionChange) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{13} 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) return m.Unmarshal(b)
@ -1021,7 +1011,7 @@ func (m *ACLSyncMessage) Reset() { *m = ACLSyncMessage{} }
func (m *ACLSyncMessage) String() string { return proto.CompactTextString(m) } func (m *ACLSyncMessage) String() string { return proto.CompactTextString(m) }
func (*ACLSyncMessage) ProtoMessage() {} func (*ACLSyncMessage) ProtoMessage() {}
func (*ACLSyncMessage) Descriptor() ([]byte, []int) { func (*ACLSyncMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{14} 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) return m.Unmarshal(b)
@ -1069,7 +1059,7 @@ func (m *ACLSyncContentValue) Reset() { *m = ACLSyncContentValue{} }
func (m *ACLSyncContentValue) String() string { return proto.CompactTextString(m) } func (m *ACLSyncContentValue) String() string { return proto.CompactTextString(m) }
func (*ACLSyncContentValue) ProtoMessage() {} func (*ACLSyncContentValue) ProtoMessage() {}
func (*ACLSyncContentValue) Descriptor() ([]byte, []int) { func (*ACLSyncContentValue) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{15} 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) return m.Unmarshal(b)
@ -1139,7 +1129,7 @@ func (m *ACLAddRecords) Reset() { *m = ACLAddRecords{} }
func (m *ACLAddRecords) String() string { return proto.CompactTextString(m) } func (m *ACLAddRecords) String() string { return proto.CompactTextString(m) }
func (*ACLAddRecords) ProtoMessage() {} func (*ACLAddRecords) ProtoMessage() {}
func (*ACLAddRecords) Descriptor() ([]byte, []int) { func (*ACLAddRecords) Descriptor() ([]byte, []int) {
return fileDescriptor_14abe0d1b4206d54, []int{16} 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) return m.Unmarshal(b)
@ -1198,71 +1188,72 @@ func init() {
} }
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{ var fileDescriptor_c8e9f754f34e929b = []byte{
// 959 bytes of a gzipped FileDescriptorProto // 965 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, 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, 0xd4, 0x8a, 0x8a, 0x15, 0xad, 0x38, 0x14, 0xf7, 0xac, 0x9d, 0x38, 0x7e, 0x76, 0x13, 0x67, 0x80, 0x76, 0x15, 0x15, 0x2b, 0x5a, 0x81,
0x44, 0x55, 0x71, 0xc1, 0x20, 0xa5, 0xca, 0x01, 0xe4, 0x9a, 0x22, 0xbb, 0x09, 0x52, 0x35, 0x01, 0x14, 0x55, 0x95, 0x23, 0x0c, 0x52, 0xaa, 0x08, 0x51, 0xb9, 0xa6, 0xc8, 0x6e, 0x82, 0x54, 0x4d,
0x8a, 0x7a, 0x9b, 0xee, 0x8e, 0x92, 0x51, 0xed, 0xdd, 0xd5, 0xcc, 0xd8, 0xc8, 0x47, 0xce, 0x5c, 0x80, 0xa2, 0xde, 0x26, 0xbb, 0xa3, 0x64, 0xc1, 0xfb, 0x47, 0x33, 0x63, 0xa3, 0x3d, 0x72, 0xe6,
0xe0, 0x1b, 0xc0, 0x07, 0xe1, 0xc4, 0x85, 0x63, 0x2f, 0x48, 0x1c, 0x51, 0xf2, 0x05, 0xb8, 0x73, 0x02, 0xdf, 0x00, 0x3e, 0x08, 0x77, 0x24, 0x2e, 0xbd, 0x80, 0x38, 0xa2, 0xe4, 0x63, 0x70, 0x41,
0x41, 0x33, 0xb3, 0xff, 0xd7, 0x89, 0xa8, 0x14, 0xf5, 0x90, 0x64, 0xe6, 0xbd, 0xdf, 0x9b, 0xfc, 0x33, 0xfb, 0x7f, 0xd7, 0x89, 0x5a, 0xc9, 0xea, 0x21, 0xc9, 0xcc, 0x7b, 0xbf, 0x37, 0xf9, 0xbd,
0xde, 0xef, 0xbd, 0x79, 0xb3, 0xf0, 0x61, 0xf4, 0xea, 0xfc, 0x21, 0xf5, 0x66, 0xfa, 0x47, 0x30, 0xdf, 0x7b, 0xf3, 0x66, 0xe1, 0x53, 0x3b, 0xf0, 0xbc, 0xc0, 0x17, 0x21, 0xb5, 0xd9, 0x61, 0x70,
0x2f, 0x14, 0x7e, 0x24, 0x42, 0x15, 0x3e, 0x34, 0xbf, 0x65, 0x66, 0x1d, 0x18, 0x03, 0x6e, 0xa5, 0xfe, 0x1d, 0xb3, 0xe5, 0x21, 0xb5, 0xe7, 0xea, 0x87, 0x33, 0x3b, 0xe0, 0x4e, 0xc8, 0x03, 0x19,
0x06, 0xf7, 0x17, 0x04, 0x1d, 0x42, 0xbf, 0x1f, 0x8d, 0x4f, 0x89, 0x31, 0xe0, 0x1e, 0x34, 0x23, 0x1c, 0xea, 0xdf, 0x22, 0xb7, 0x0e, 0xb5, 0x01, 0x77, 0x32, 0x83, 0xf5, 0x2b, 0x82, 0x1e, 0xa1,
0xba, 0x9a, 0x85, 0xd4, 0xef, 0xa1, 0x03, 0x74, 0xd8, 0x21, 0xc9, 0x16, 0xdf, 0x83, 0x96, 0xe4, 0x3f, 0x8c, 0x27, 0xa7, 0x44, 0x1b, 0xb0, 0x09, 0xed, 0x90, 0x46, 0xf3, 0x80, 0x3a, 0x26, 0xda,
0xe7, 0x01, 0x55, 0x0b, 0xc1, 0x7a, 0x8e, 0xf1, 0x65, 0x06, 0x7c, 0x1f, 0xba, 0xd4, 0xf3, 0x58, 0x47, 0x07, 0x3d, 0x92, 0x6e, 0xf1, 0x7d, 0xe8, 0x08, 0xf7, 0xc2, 0xa7, 0x72, 0xc1, 0x99, 0x69,
0xa4, 0x42, 0x31, 0xf5, 0x59, 0xa0, 0xb8, 0x5a, 0xf5, 0xea, 0x06, 0x54, 0xb1, 0xe3, 0x07, 0xb0, 0x68, 0x5f, 0x6e, 0xc0, 0x0f, 0xa0, 0x4f, 0x6d, 0x9b, 0x85, 0x32, 0xe0, 0x33, 0x87, 0xf9, 0xd2,
0x9b, 0xd8, 0xce, 0xd2, 0x13, 0x1b, 0x06, 0x5c, 0x75, 0xb8, 0x9f, 0x01, 0xce, 0x33, 0x7c, 0xce, 0x95, 0x91, 0xd9, 0xd4, 0xa0, 0x9a, 0x1d, 0x3f, 0x84, 0xdd, 0xd4, 0x76, 0x96, 0x9d, 0xd8, 0xd2,
0xd5, 0xc5, 0xf4, 0x26, 0x9e, 0xdb, 0xe0, 0x70, 0xdf, 0x10, 0x6c, 0x11, 0x87, 0xfb, 0xee, 0xaf, 0xe0, 0xba, 0xc3, 0xfa, 0x0c, 0x70, 0x91, 0xe1, 0x0b, 0x57, 0x5e, 0xce, 0x6e, 0xe3, 0xb9, 0x0d,
0x08, 0x5a, 0x59, 0x7e, 0x7b, 0xb0, 0x19, 0x09, 0xb6, 0x9c, 0xda, 0xb0, 0x16, 0x89, 0x77, 0x78, 0x86, 0xeb, 0x68, 0x82, 0x1d, 0x62, 0xb8, 0x8e, 0xf5, 0x1b, 0x82, 0x4e, 0x9e, 0xdf, 0x5d, 0xd8,
0x1f, 0xb6, 0x78, 0xc2, 0xdb, 0x26, 0x97, 0xee, 0x31, 0x86, 0x86, 0x4f, 0x15, 0x8d, 0xf3, 0x31, 0x0c, 0x39, 0x5b, 0xce, 0xe2, 0xb0, 0x0e, 0x49, 0x76, 0x78, 0x0f, 0xb6, 0xdc, 0x94, 0x77, 0x9c,
0x6b, 0x3c, 0x00, 0xec, 0x2d, 0x84, 0x60, 0x81, 0x22, 0x8c, 0xfa, 0x27, 0x6c, 0x35, 0xa1, 0xf2, 0x5c, 0xb6, 0xc7, 0x18, 0x5a, 0x0e, 0x95, 0x34, 0xc9, 0x47, 0xaf, 0xf1, 0x10, 0xb0, 0xbd, 0xe0,
0xc2, 0x24, 0xd1, 0x20, 0x6b, 0x3c, 0x5a, 0x3d, 0xc5, 0xe7, 0x4c, 0x2a, 0x3a, 0x8f, 0x7a, 0x1b, 0x9c, 0xf9, 0x92, 0x30, 0xea, 0x9c, 0xb0, 0x68, 0x4a, 0xc5, 0xa5, 0x4e, 0xa2, 0x45, 0x56, 0x78,
0x07, 0xe8, 0xb0, 0x4e, 0x32, 0x83, 0xfb, 0xa3, 0x03, 0x4d, 0xcd, 0x31, 0x0c, 0x55, 0x81, 0x09, 0x94, 0x7a, 0xd2, 0xf5, 0x98, 0x90, 0xd4, 0x0b, 0xcd, 0x8d, 0x7d, 0x74, 0xd0, 0x24, 0xb9, 0xc1,
0x2a, 0x31, 0xf9, 0x00, 0xee, 0xb0, 0xc0, 0x13, 0xab, 0x48, 0xf1, 0x30, 0x38, 0x61, 0x09, 0xd5, 0xfa, 0xc9, 0x80, 0xb6, 0xe2, 0x18, 0x04, 0xb2, 0xc4, 0x04, 0x55, 0x98, 0x7c, 0x00, 0x77, 0x98,
0xa2, 0x51, 0x6b, 0x23, 0x23, 0xea, 0xb1, 0xa9, 0x6f, 0x28, 0xb7, 0x48, 0xb2, 0xd5, 0x55, 0x8a, 0x6f, 0xf3, 0x28, 0x94, 0x6e, 0xe0, 0x9f, 0xb0, 0x94, 0x6a, 0xd9, 0xa8, 0xb4, 0xd1, 0x9d, 0x31,
0xa1, 0xcc, 0x8f, 0xd9, 0xc5, 0xc2, 0x57, 0xec, 0x1a, 0xeb, 0x33, 0xc1, 0x97, 0x54, 0x1f, 0x7b, 0x73, 0x34, 0xe5, 0x0e, 0x49, 0xb7, 0xaa, 0x4a, 0x09, 0x94, 0x39, 0x09, 0xbb, 0x44, 0xf8, 0x9a,
0xe6, 0x5d, 0xb0, 0x39, 0x33, 0xc4, 0x5b, 0xa4, 0x62, 0xbf, 0x46, 0x8d, 0xcd, 0xff, 0xa7, 0x46, 0x5d, 0x61, 0x1d, 0xc6, 0xdd, 0x25, 0x55, 0xc7, 0x9e, 0xd9, 0x97, 0xcc, 0x63, 0x9a, 0x78, 0x87,
0xb3, 0xac, 0xc6, 0x9f, 0x0e, 0xec, 0x8c, 0xc6, 0xa7, 0xe3, 0x30, 0x50, 0x2c, 0x50, 0xdf, 0xd2, 0xd4, 0xec, 0x37, 0xa8, 0xb1, 0xf9, 0x7a, 0x6a, 0xb4, 0xab, 0x6a, 0xfc, 0x65, 0xc0, 0xce, 0x78,
0xd9, 0x82, 0xe1, 0x8f, 0xa1, 0xb9, 0x90, 0x4c, 0x8c, 0x7c, 0x5b, 0xb8, 0xf6, 0xf0, 0xbd, 0x41, 0x72, 0x3a, 0x09, 0x7c, 0xc9, 0x7c, 0xf9, 0x0d, 0x9d, 0x2f, 0x18, 0xfe, 0x08, 0xda, 0x0b, 0xc1,
0xd6, 0xd6, 0xa3, 0xf1, 0xe9, 0x37, 0xd6, 0x39, 0xa9, 0x91, 0x04, 0x87, 0x8f, 0x01, 0xf4, 0x92, 0xf8, 0xd8, 0x89, 0x0b, 0xd7, 0x1d, 0xbd, 0x37, 0xcc, 0xdb, 0x7a, 0x3c, 0x39, 0xfd, 0x3a, 0x76,
0xb0, 0x79, 0xb8, 0xb4, 0x1d, 0xdb, 0x1e, 0xf6, 0xaa, 0x51, 0xd6, 0x3f, 0xa9, 0x91, 0x1c, 0x1a, 0x4e, 0x1b, 0x24, 0xc5, 0xe1, 0x63, 0x00, 0xb5, 0x24, 0xcc, 0x0b, 0x96, 0x71, 0xc7, 0x76, 0x47,
0x7f, 0x07, 0xef, 0xea, 0xdd, 0x33, 0x26, 0xe6, 0x5c, 0x4a, 0x1e, 0x06, 0xe3, 0x0b, 0x1a, 0x9c, 0x66, 0x3d, 0x2a, 0xf6, 0x4f, 0x1b, 0xa4, 0x80, 0xc6, 0xdf, 0xc2, 0xbb, 0x6a, 0xf7, 0x9c, 0x71,
0x33, 0xa3, 0x67, 0x7b, 0xe8, 0x56, 0x4f, 0x29, 0x23, 0x27, 0x35, 0xb2, 0xf6, 0x84, 0x84, 0xd5, 0xcf, 0x15, 0xc2, 0x0d, 0xfc, 0xc9, 0x25, 0xf5, 0x2f, 0x98, 0xd6, 0xb3, 0x3b, 0xb2, 0xea, 0xa7,
0x34, 0x58, 0x72, 0x65, 0xbb, 0x7e, 0x2d, 0x2b, 0xeb, 0x4f, 0x58, 0xd9, 0x1d, 0xfe, 0x14, 0xb6, 0x54, 0x91, 0xd3, 0x06, 0x59, 0x79, 0x42, 0xca, 0x6a, 0xe6, 0x2f, 0x5d, 0x19, 0x77, 0xfd, 0x4a,
0xf4, 0xee, 0x69, 0xc8, 0x03, 0x53, 0x8a, 0xf6, 0x70, 0xaf, 0x1a, 0xa9, 0xbd, 0x93, 0x1a, 0x49, 0x56, 0xb1, 0x3f, 0x65, 0x15, 0xef, 0xf0, 0x27, 0xb0, 0xa5, 0x76, 0xcf, 0x02, 0xd7, 0xd7, 0xa5,
0x91, 0x8f, 0x9b, 0xb0, 0xb1, 0xd4, 0x1a, 0xba, 0x4f, 0x4c, 0x93, 0x7d, 0xa1, 0xdb, 0xf7, 0x18, 0xe8, 0x8e, 0xee, 0xd6, 0x23, 0x95, 0x77, 0xda, 0x20, 0x19, 0xf2, 0x49, 0x1b, 0x36, 0x96, 0x4a,
0x80, 0x7a, 0xb3, 0x58, 0xe1, 0x1e, 0x3a, 0xa8, 0x1f, 0xb6, 0x87, 0xfb, 0xc5, 0xb3, 0xf2, 0xf2, 0x43, 0xeb, 0xa9, 0x6e, 0xb2, 0xcf, 0x55, 0xfb, 0x1e, 0x03, 0x50, 0x7b, 0x9e, 0x28, 0x6c, 0xa2,
0x93, 0x1c, 0xda, 0xfd, 0x17, 0xc1, 0xd6, 0x68, 0x7c, 0x7a, 0xa6, 0xa8, 0x62, 0xba, 0x23, 0x45, 0xfd, 0xe6, 0x41, 0x77, 0xb4, 0x57, 0x3e, 0xab, 0x28, 0x3f, 0x29, 0xa0, 0xad, 0xff, 0x10, 0x6c,
0x56, 0x58, 0x26, 0xcd, 0x59, 0x0d, 0x52, 0x34, 0xe2, 0x23, 0x9b, 0xb4, 0x09, 0x91, 0x3d, 0xc7, 0x8d, 0x27, 0xa7, 0x67, 0x92, 0x4a, 0xa6, 0x3a, 0x92, 0xe7, 0x85, 0x65, 0x42, 0x9f, 0xd5, 0x22,
0xfc, 0xbb, 0xbb, 0x55, 0xea, 0xc6, 0x4f, 0x72, 0x50, 0x7c, 0x0c, 0x4d, 0x6e, 0x72, 0x97, 0xbd, 0x65, 0x23, 0x3e, 0x8a, 0x93, 0xd6, 0x21, 0xc2, 0x34, 0xf4, 0xbf, 0xbb, 0x57, 0xa7, 0xae, 0xfd,
0xba, 0x89, 0x3a, 0x28, 0x46, 0x19, 0xd8, 0xc0, 0xca, 0x23, 0x9f, 0x04, 0x4a, 0xac, 0x48, 0x12, 0xa4, 0x00, 0xc5, 0xc7, 0xd0, 0x76, 0x75, 0xee, 0xc2, 0x6c, 0xea, 0xa8, 0xfd, 0x72, 0x94, 0x86,
0xb0, 0xff, 0x35, 0x74, 0xf2, 0x0e, 0xdc, 0x85, 0xfa, 0x2b, 0xb6, 0x8a, 0xef, 0xbd, 0x5e, 0xe2, 0x0d, 0x63, 0x79, 0xc4, 0x53, 0x5f, 0xf2, 0x88, 0xa4, 0x01, 0x7b, 0x5f, 0x41, 0xaf, 0xe8, 0xc0,
0x41, 0xac, 0xcc, 0xf5, 0xcd, 0x61, 0x0f, 0x20, 0x16, 0x76, 0xec, 0x3c, 0x42, 0xee, 0xcf, 0x08, 0x7d, 0x68, 0x7e, 0xcf, 0xa2, 0xe4, 0xde, 0xab, 0x25, 0x1e, 0x26, 0xca, 0xdc, 0xdc, 0x1c, 0xf1,
0x3a, 0x79, 0xba, 0xb7, 0x70, 0x5f, 0x3f, 0x87, 0x76, 0x94, 0xb6, 0x89, 0x34, 0x3d, 0xb6, 0x3d, 0x01, 0x24, 0x86, 0x1d, 0x1b, 0x8f, 0x90, 0xf5, 0x0b, 0x82, 0x5e, 0x91, 0xee, 0x1a, 0xee, 0xeb,
0x7c, 0xff, 0xa6, 0x1e, 0x93, 0x24, 0x1f, 0xe1, 0xfe, 0x86, 0x00, 0xb2, 0x3b, 0x70, 0x0b, 0x8c, 0x63, 0xe8, 0x86, 0x59, 0x9b, 0x08, 0xdd, 0x63, 0xdb, 0xa3, 0xf7, 0x6f, 0xeb, 0x31, 0x41, 0x8a,
0x1e, 0xc0, 0x6e, 0x79, 0x1e, 0xd8, 0x02, 0x74, 0x48, 0xd5, 0x51, 0xe6, 0xdf, 0x78, 0x63, 0xfe, 0x11, 0xd6, 0xef, 0x08, 0x20, 0xbf, 0x03, 0x6b, 0x60, 0xf4, 0x10, 0x76, 0xab, 0xf3, 0x20, 0x2e,
0xff, 0x20, 0xb8, 0x53, 0x10, 0x1c, 0x1f, 0xc2, 0x8e, 0x7d, 0x09, 0x9e, 0x2d, 0x5e, 0xce, 0xb8, 0x40, 0x8f, 0xd4, 0x1d, 0x55, 0xfe, 0xad, 0x37, 0xe6, 0xff, 0x37, 0x82, 0x3b, 0x25, 0xc1, 0xf1,
0x77, 0xc2, 0x92, 0x4c, 0xca, 0xe6, 0xdc, 0x48, 0xcb, 0xa0, 0x4e, 0x61, 0xa4, 0x65, 0xd8, 0xb7, 0x01, 0xec, 0xc4, 0x2f, 0xc1, 0xf3, 0xc5, 0xf9, 0xdc, 0xb5, 0x4f, 0x58, 0x9a, 0x49, 0xd5, 0x5c,
0x9b, 0x96, 0xa9, 0x83, 0x49, 0x67, 0xea, 0xc7, 0x93, 0x33, 0xdd, 0xbb, 0xbf, 0x23, 0x68, 0xe7, 0xa0, 0x7a, 0x16, 0x79, 0xe9, 0xe4, 0x31, 0xf4, 0xe4, 0xa9, 0x3b, 0xde, 0x76, 0x62, 0x7f, 0x22,
0x2e, 0xec, 0x2d, 0xd4, 0x2c, 0x95, 0x2c, 0x7b, 0x53, 0xeb, 0x79, 0xc9, 0x52, 0x73, 0x81, 0x57, 0xe8, 0x16, 0xae, 0xe5, 0x1a, 0x2a, 0x93, 0x09, 0x93, 0xbf, 0x9c, 0xcd, 0xa2, 0x30, 0x99, 0x19,
0xa3, 0xc8, 0x6b, 0xbd, 0x44, 0x1b, 0xd7, 0x48, 0xe4, 0xca, 0xb4, 0x6e, 0xf1, 0xdc, 0xbc, 0x29, 0x5b, 0xd0, 0xcb, 0xb4, 0xca, 0xe7, 0x7c, 0xc9, 0xb6, 0x5a, 0x8e, 0x8d, 0x1b, 0xe4, 0xb0, 0x44,
0x8d, 0x2f, 0x61, 0x27, 0x9e, 0x0a, 0x84, 0x45, 0x33, 0xea, 0xa5, 0x77, 0xfa, 0x5e, 0x51, 0x53, 0x56, 0xa5, 0x64, 0x4a, 0xde, 0x96, 0xce, 0x17, 0xb0, 0x93, 0xcc, 0x00, 0xc2, 0xc2, 0x39, 0xb5,
0x52, 0x00, 0x91, 0x72, 0x90, 0xfb, 0x03, 0x82, 0xdd, 0x0a, 0xec, 0x16, 0x04, 0x5c, 0xf7, 0x38, 0xb3, 0x7b, 0x7f, 0xbf, 0xac, 0x1f, 0x29, 0x81, 0x48, 0x35, 0xc8, 0xfa, 0x11, 0xc1, 0x6e, 0x0d,
0xd6, 0xd7, 0x3f, 0x8e, 0xee, 0x12, 0xee, 0x5e, 0x33, 0xf8, 0x6f, 0x24, 0x52, 0x6a, 0x29, 0xe7, 0xb6, 0x06, 0x21, 0x57, 0x3d, 0x85, 0xcd, 0xd5, 0x4f, 0xa1, 0xb5, 0x84, 0x7b, 0x37, 0x8c, 0xf9,
0x8d, 0x6f, 0xca, 0x53, 0xd8, 0xd6, 0x53, 0x6f, 0x15, 0x78, 0x5f, 0x31, 0x29, 0xe9, 0x39, 0xc3, 0x5b, 0x89, 0x54, 0xda, 0xc7, 0x78, 0xe3, 0xf6, 0x79, 0x06, 0xdb, 0x6a, 0xc6, 0x45, 0xbe, 0xfd,
0x8f, 0xa0, 0xe9, 0xc5, 0x63, 0xdc, 0x4e, 0xb1, 0x7e, 0x69, 0x42, 0xae, 0x02, 0xaf, 0x30, 0xca, 0x25, 0x13, 0x82, 0x5e, 0x30, 0xfc, 0x08, 0xda, 0x76, 0x32, 0xb4, 0xe3, 0x99, 0x35, 0xa8, 0xcc,
0x13, 0xb8, 0xfb, 0x02, 0xde, 0x59, 0xe3, 0x37, 0x4f, 0x83, 0xef, 0xdb, 0xcf, 0x25, 0x19, 0x3f, 0xc3, 0xc8, 0xb7, 0x4b, 0x83, 0x3b, 0x85, 0x5b, 0x2f, 0xe1, 0x9d, 0x15, 0x7e, 0xfd, 0x10, 0x38,
0xb6, 0xa5, 0xc9, 0x38, 0x4a, 0xfd, 0xfa, 0x81, 0xca, 0xd0, 0xd9, 0x53, 0x33, 0x31, 0x8d, 0x91, 0x4e, 0xfc, 0x71, 0x24, 0x92, 0xa7, 0xb5, 0x32, 0x07, 0xc7, 0x99, 0x5f, 0x3d, 0x47, 0x39, 0x3a,
0xe1, 0xf0, 0x11, 0x34, 0x45, 0x7a, 0xa4, 0x2e, 0x7a, 0x3e, 0xeb, 0xea, 0xf7, 0x1d, 0x49, 0xd0, 0x7f, 0x58, 0xa6, 0xba, 0x31, 0x72, 0x1c, 0x3e, 0x82, 0x36, 0xcf, 0x8e, 0x54, 0x45, 0x2f, 0x66,
0xf7, 0x8f, 0x00, 0x57, 0x45, 0xc1, 0x2d, 0xd8, 0x18, 0xf9, 0x73, 0x1e, 0x74, 0x6b, 0x18, 0x60, 0x5d, 0xff, 0x9a, 0x23, 0x29, 0xfa, 0xc1, 0x11, 0xe0, 0xba, 0x28, 0xb8, 0x03, 0x1b, 0x63, 0xc7,
0xf3, 0xb9, 0xe0, 0x8a, 0x89, 0x2e, 0xd2, 0x6b, 0x5d, 0x21, 0x26, 0xba, 0xce, 0xe3, 0x8f, 0xfe, 0x73, 0xfd, 0x7e, 0x03, 0x03, 0x6c, 0xbe, 0xe0, 0xae, 0x64, 0xbc, 0x8f, 0xd4, 0x5a, 0x55, 0x88,
0xb8, 0xec, 0xa3, 0xd7, 0x97, 0x7d, 0xf4, 0xf7, 0x65, 0x1f, 0xfd, 0x74, 0xd5, 0xaf, 0xbd, 0xbe, 0xf1, 0xbe, 0xf1, 0xe4, 0xf1, 0x1f, 0x57, 0x03, 0xf4, 0xea, 0x6a, 0x80, 0xfe, 0xbd, 0x1a, 0xa0,
0xea, 0xd7, 0xfe, 0xba, 0xea, 0xd7, 0x5e, 0xec, 0xad, 0xff, 0x5c, 0x7e, 0xb9, 0x69, 0xfe, 0x7c, 0x9f, 0xaf, 0x07, 0x8d, 0x57, 0xd7, 0x83, 0xc6, 0x3f, 0xd7, 0x83, 0xc6, 0xcb, 0x0f, 0x5f, 0xeb,
0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x9d, 0x20, 0x5d, 0x4f, 0x0b, 0x00, 0x00, 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) { func (m *RawACLRecord) Marshal() (dAtA []byte, err error) {
@ -1843,13 +1834,6 @@ func (m *ACLUserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if len(m.InviteId) > 0 {
i -= len(m.InviteId)
copy(dAtA[i:], m.InviteId)
i = encodeVarintAclrecord(dAtA, i, uint64(len(m.InviteId)))
i--
dAtA[i] = 0x2a
}
if m.Permissions != 0 { if m.Permissions != 0 {
i = encodeVarintAclrecord(dAtA, i, uint64(m.Permissions)) i = encodeVarintAclrecord(dAtA, i, uint64(m.Permissions))
i-- i--
@ -1864,12 +1848,10 @@ func (m *ACLUserInvite) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a dAtA[i] = 0x1a
} }
} }
if len(m.EncryptPublicKey) > 0 { if m.EncryptSymKeyHash != 0 {
i -= len(m.EncryptPublicKey) i = encodeVarintAclrecord(dAtA, i, uint64(m.EncryptSymKeyHash))
copy(dAtA[i:], m.EncryptPublicKey)
i = encodeVarintAclrecord(dAtA, i, uint64(len(m.EncryptPublicKey)))
i-- i--
dAtA[i] = 0x12 dAtA[i] = 0x10
} }
if len(m.AcceptPublicKey) > 0 { if len(m.AcceptPublicKey) > 0 {
i -= len(m.AcceptPublicKey) i -= len(m.AcceptPublicKey)
@ -1910,10 +1892,10 @@ func (m *ACLUserJoin) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x2a dAtA[i] = 0x2a
} }
} }
if len(m.InviteId) > 0 { if len(m.AcceptPubKey) > 0 {
i -= len(m.InviteId) i -= len(m.AcceptPubKey)
copy(dAtA[i:], m.InviteId) copy(dAtA[i:], m.AcceptPubKey)
i = encodeVarintAclrecord(dAtA, i, uint64(len(m.InviteId))) i = encodeVarintAclrecord(dAtA, i, uint64(len(m.AcceptPubKey)))
i-- i--
dAtA[i] = 0x22 dAtA[i] = 0x22
} }
@ -1972,7 +1954,7 @@ func (m *ACLUserRemove) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintAclrecord(dAtA, i, uint64(size)) i = encodeVarintAclrecord(dAtA, i, uint64(size))
} }
i-- i--
dAtA[i] = 0x1a dAtA[i] = 0x12
} }
} }
if len(m.Identity) > 0 { if len(m.Identity) > 0 {
@ -2482,9 +2464,8 @@ func (m *ACLUserInvite) Size() (n int) {
if l > 0 { if l > 0 {
n += 1 + l + sovAclrecord(uint64(l)) n += 1 + l + sovAclrecord(uint64(l))
} }
l = len(m.EncryptPublicKey) if m.EncryptSymKeyHash != 0 {
if l > 0 { n += 1 + sovAclrecord(uint64(m.EncryptSymKeyHash))
n += 1 + l + sovAclrecord(uint64(l))
} }
if len(m.EncryptedReadKeys) > 0 { if len(m.EncryptedReadKeys) > 0 {
for _, b := range m.EncryptedReadKeys { for _, b := range m.EncryptedReadKeys {
@ -2495,10 +2476,6 @@ func (m *ACLUserInvite) Size() (n int) {
if m.Permissions != 0 { if m.Permissions != 0 {
n += 1 + sovAclrecord(uint64(m.Permissions)) n += 1 + sovAclrecord(uint64(m.Permissions))
} }
l = len(m.InviteId)
if l > 0 {
n += 1 + l + sovAclrecord(uint64(l))
}
return n return n
} }
@ -2520,7 +2497,7 @@ func (m *ACLUserJoin) Size() (n int) {
if l > 0 { if l > 0 {
n += 1 + l + sovAclrecord(uint64(l)) n += 1 + l + sovAclrecord(uint64(l))
} }
l = len(m.InviteId) l = len(m.AcceptPubKey)
if l > 0 { if l > 0 {
n += 1 + l + sovAclrecord(uint64(l)) n += 1 + l + sovAclrecord(uint64(l))
} }
@ -4359,10 +4336,10 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error {
} }
iNdEx = postIndex iNdEx = postIndex
case 2: case 2:
if wireType != 2 { if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field EncryptPublicKey", wireType) return fmt.Errorf("proto: wrong wireType = %d for field EncryptSymKeyHash", wireType)
} }
var byteLen int m.EncryptSymKeyHash = 0
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
if shift >= 64 { if shift >= 64 {
return ErrIntOverflowAclrecord return ErrIntOverflowAclrecord
@ -4372,26 +4349,11 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
byteLen |= int(b&0x7F) << shift m.EncryptSymKeyHash |= uint64(b&0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
} }
if byteLen < 0 {
return ErrInvalidLengthAclrecord
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthAclrecord
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.EncryptPublicKey = append(m.EncryptPublicKey[:0], dAtA[iNdEx:postIndex]...)
if m.EncryptPublicKey == nil {
m.EncryptPublicKey = []byte{}
}
iNdEx = postIndex
case 3: case 3:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field EncryptedReadKeys", wireType) return fmt.Errorf("proto: wrong wireType = %d for field EncryptedReadKeys", wireType)
@ -4443,38 +4405,6 @@ func (m *ACLUserInvite) Unmarshal(dAtA []byte) error {
break break
} }
} }
case 5:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field InviteId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowAclrecord
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthAclrecord
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthAclrecord
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.InviteId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipAclrecord(dAtA[iNdEx:]) skippy, err := skipAclrecord(dAtA[iNdEx:])
@ -4629,9 +4559,9 @@ func (m *ACLUserJoin) Unmarshal(dAtA []byte) error {
iNdEx = postIndex iNdEx = postIndex
case 4: case 4:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field InviteId", wireType) return fmt.Errorf("proto: wrong wireType = %d for field AcceptPubKey", wireType)
} }
var stringLen uint64 var byteLen int
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
if shift >= 64 { if shift >= 64 {
return ErrIntOverflowAclrecord return ErrIntOverflowAclrecord
@ -4641,23 +4571,25 @@ func (m *ACLUserJoin) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
stringLen |= uint64(b&0x7F) << shift byteLen |= int(b&0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
} }
intStringLen := int(stringLen) if byteLen < 0 {
if intStringLen < 0 {
return ErrInvalidLengthAclrecord return ErrInvalidLengthAclrecord
} }
postIndex := iNdEx + intStringLen postIndex := iNdEx + byteLen
if postIndex < 0 { if postIndex < 0 {
return ErrInvalidLengthAclrecord return ErrInvalidLengthAclrecord
} }
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.InviteId = string(dAtA[iNdEx:postIndex]) m.AcceptPubKey = append(m.AcceptPubKey[:0], dAtA[iNdEx:postIndex]...)
if m.AcceptPubKey == nil {
m.AcceptPubKey = []byte{}
}
iNdEx = postIndex iNdEx = postIndex
case 5: case 5:
if wireType != 2 { if wireType != 2 {
@ -4775,7 +4707,7 @@ func (m *ACLUserRemove) Unmarshal(dAtA []byte) error {
m.Identity = []byte{} m.Identity = []byte{}
} }
iNdEx = postIndex iNdEx = postIndex
case 3: case 2:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ReadKeyReplaces", wireType) return fmt.Errorf("proto: wrong wireType = %d for field ReadKeyReplaces", wireType)
} }

2
common/commonspace/object/acl/aclrecordproto/protos/aclrecord.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
package aclrecord; package aclrecord;
option go_package = "pkg/acl/aclrecordproto"; option go_package = "commonspace/object/acl/aclrecordproto";
message RawACLRecord { message RawACLRecord {
bytes payload = 1; bytes payload = 1;

2
common/commonspace/object/tree/treechangeproto/protos/treechange.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
package treechange; package treechange;
option go_package = "pkg/acl/treechangeproto"; option go_package = "commonspace/object/tree/treechangeproto";
// RootChange is a root of a tree // RootChange is a root of a tree
message RootChange { message RootChange {

106
common/commonspace/object/tree/treechangeproto/treechange.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // 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 package treechangeproto
@ -42,7 +42,7 @@ func (m *RootChange) Reset() { *m = RootChange{} }
func (m *RootChange) String() string { return proto.CompactTextString(m) } func (m *RootChange) String() string { return proto.CompactTextString(m) }
func (*RootChange) ProtoMessage() {} func (*RootChange) ProtoMessage() {}
func (*RootChange) Descriptor() ([]byte, []int) { func (*RootChange) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{0} return fileDescriptor_5033f0301ef9b772, []int{0}
} }
func (m *RootChange) XXX_Unmarshal(b []byte) error { func (m *RootChange) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -137,7 +137,7 @@ func (m *TreeChange) Reset() { *m = TreeChange{} }
func (m *TreeChange) String() string { return proto.CompactTextString(m) } func (m *TreeChange) String() string { return proto.CompactTextString(m) }
func (*TreeChange) ProtoMessage() {} func (*TreeChange) ProtoMessage() {}
func (*TreeChange) Descriptor() ([]byte, []int) { func (*TreeChange) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{1} return fileDescriptor_5033f0301ef9b772, []int{1}
} }
func (m *TreeChange) XXX_Unmarshal(b []byte) error { func (m *TreeChange) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -234,7 +234,7 @@ func (m *RawTreeChange) Reset() { *m = RawTreeChange{} }
func (m *RawTreeChange) String() string { return proto.CompactTextString(m) } func (m *RawTreeChange) String() string { return proto.CompactTextString(m) }
func (*RawTreeChange) ProtoMessage() {} func (*RawTreeChange) ProtoMessage() {}
func (*RawTreeChange) Descriptor() ([]byte, []int) { func (*RawTreeChange) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{2} return fileDescriptor_5033f0301ef9b772, []int{2}
} }
func (m *RawTreeChange) XXX_Unmarshal(b []byte) error { func (m *RawTreeChange) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -289,7 +289,7 @@ func (m *RawTreeChangeWithId) Reset() { *m = RawTreeChangeWithId{} }
func (m *RawTreeChangeWithId) String() string { return proto.CompactTextString(m) } func (m *RawTreeChangeWithId) String() string { return proto.CompactTextString(m) }
func (*RawTreeChangeWithId) ProtoMessage() {} func (*RawTreeChangeWithId) ProtoMessage() {}
func (*RawTreeChangeWithId) Descriptor() ([]byte, []int) { func (*RawTreeChangeWithId) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{3} return fileDescriptor_5033f0301ef9b772, []int{3}
} }
func (m *RawTreeChangeWithId) XXX_Unmarshal(b []byte) error { func (m *RawTreeChangeWithId) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -341,7 +341,7 @@ func (m *TreeSyncMessage) Reset() { *m = TreeSyncMessage{} }
func (m *TreeSyncMessage) String() string { return proto.CompactTextString(m) } func (m *TreeSyncMessage) String() string { return proto.CompactTextString(m) }
func (*TreeSyncMessage) ProtoMessage() {} func (*TreeSyncMessage) ProtoMessage() {}
func (*TreeSyncMessage) Descriptor() ([]byte, []int) { func (*TreeSyncMessage) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{4} return fileDescriptor_5033f0301ef9b772, []int{4}
} }
func (m *TreeSyncMessage) XXX_Unmarshal(b []byte) error { func (m *TreeSyncMessage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -399,7 +399,7 @@ func (m *TreeSyncContentValue) Reset() { *m = TreeSyncContentValue{} }
func (m *TreeSyncContentValue) String() string { return proto.CompactTextString(m) } func (m *TreeSyncContentValue) String() string { return proto.CompactTextString(m) }
func (*TreeSyncContentValue) ProtoMessage() {} func (*TreeSyncContentValue) ProtoMessage() {}
func (*TreeSyncContentValue) Descriptor() ([]byte, []int) { func (*TreeSyncContentValue) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{5} return fileDescriptor_5033f0301ef9b772, []int{5}
} }
func (m *TreeSyncContentValue) XXX_Unmarshal(b []byte) error { func (m *TreeSyncContentValue) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -508,7 +508,7 @@ func (m *TreeHeadUpdate) Reset() { *m = TreeHeadUpdate{} }
func (m *TreeHeadUpdate) String() string { return proto.CompactTextString(m) } func (m *TreeHeadUpdate) String() string { return proto.CompactTextString(m) }
func (*TreeHeadUpdate) ProtoMessage() {} func (*TreeHeadUpdate) ProtoMessage() {}
func (*TreeHeadUpdate) Descriptor() ([]byte, []int) { func (*TreeHeadUpdate) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{6} return fileDescriptor_5033f0301ef9b772, []int{6}
} }
func (m *TreeHeadUpdate) XXX_Unmarshal(b []byte) error { func (m *TreeHeadUpdate) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -569,7 +569,7 @@ func (m *TreeFullSyncRequest) Reset() { *m = TreeFullSyncRequest{} }
func (m *TreeFullSyncRequest) String() string { return proto.CompactTextString(m) } func (m *TreeFullSyncRequest) String() string { return proto.CompactTextString(m) }
func (*TreeFullSyncRequest) ProtoMessage() {} func (*TreeFullSyncRequest) ProtoMessage() {}
func (*TreeFullSyncRequest) Descriptor() ([]byte, []int) { func (*TreeFullSyncRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{7} return fileDescriptor_5033f0301ef9b772, []int{7}
} }
func (m *TreeFullSyncRequest) XXX_Unmarshal(b []byte) error { func (m *TreeFullSyncRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -630,7 +630,7 @@ func (m *TreeFullSyncResponse) Reset() { *m = TreeFullSyncResponse{} }
func (m *TreeFullSyncResponse) String() string { return proto.CompactTextString(m) } func (m *TreeFullSyncResponse) String() string { return proto.CompactTextString(m) }
func (*TreeFullSyncResponse) ProtoMessage() {} func (*TreeFullSyncResponse) ProtoMessage() {}
func (*TreeFullSyncResponse) Descriptor() ([]byte, []int) { func (*TreeFullSyncResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{8} return fileDescriptor_5033f0301ef9b772, []int{8}
} }
func (m *TreeFullSyncResponse) XXX_Unmarshal(b []byte) error { func (m *TreeFullSyncResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -689,7 +689,7 @@ func (m *TreeErrorResponse) Reset() { *m = TreeErrorResponse{} }
func (m *TreeErrorResponse) String() string { return proto.CompactTextString(m) } func (m *TreeErrorResponse) String() string { return proto.CompactTextString(m) }
func (*TreeErrorResponse) ProtoMessage() {} func (*TreeErrorResponse) ProtoMessage() {}
func (*TreeErrorResponse) Descriptor() ([]byte, []int) { func (*TreeErrorResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_f177d8514fae978f, []int{9} return fileDescriptor_5033f0301ef9b772, []int{9}
} }
func (m *TreeErrorResponse) XXX_Unmarshal(b []byte) error { func (m *TreeErrorResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -739,52 +739,52 @@ func init() {
} }
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{ var fileDescriptor_5033f0301ef9b772 = []byte{
// 647 bytes of a gzipped FileDescriptorProto // 656 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xc1, 0x6e, 0xd3, 0x40, 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, 0x10, 0xf5, 0x3a, 0x69, 0xd3, 0x4e, 0xd3, 0x16, 0xb6, 0x3d, 0x58, 0x15, 0x18, 0xcb, 0x07, 0x08,
0x5c, 0x1a, 0x51, 0x4e, 0x20, 0x24, 0xa4, 0x96, 0x16, 0x57, 0x15, 0x08, 0x6d, 0x0b, 0x48, 0xdc, 0x97, 0x56, 0x2a, 0x27, 0x10, 0x52, 0x45, 0x4b, 0x8b, 0xab, 0x0a, 0x84, 0xb6, 0x05, 0x24, 0x6e,
0x16, 0x7b, 0x48, 0x2c, 0x52, 0xdb, 0x78, 0x37, 0x54, 0xf9, 0x00, 0x2e, 0x20, 0x21, 0x3e, 0x81, 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, 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, 0x0e, 0xbd, 0xf5, 0xb2, 0xc9, 0xbc, 0x9d, 0x79, 0xfb, 0xe6, 0xcd, 0x6e, 0x02, 0x3b, 0x61, 0xda,
0xd7, 0xe5, 0xe1, 0xa0, 0x2b, 0x73, 0xc4, 0xb0, 0xcf, 0x93, 0x1e, 0x66, 0x79, 0x2a, 0xd3, 0xae, 0xef, 0xa7, 0x89, 0xc8, 0x78, 0x88, 0x5b, 0xe9, 0xe9, 0x47, 0x0c, 0xe5, 0x96, 0xcc, 0x11, 0xf5,
0xfe, 0x15, 0x06, 0xbc, 0xad, 0x11, 0x0a, 0x33, 0xc4, 0xff, 0x41, 0x00, 0x58, 0x9a, 0xca, 0x3d, 0x12, 0x76, 0x79, 0x72, 0x86, 0x59, 0x9e, 0xca, 0x74, 0x4b, 0xaf, 0xc2, 0x80, 0x37, 0x35, 0x42,
0x1d, 0xd2, 0x9b, 0xb0, 0xcc, 0xc3, 0x41, 0x80, 0x3c, 0x3a, 0x8c, 0x1c, 0xe2, 0x91, 0xce, 0x32, 0x61, 0x8a, 0xf8, 0xbf, 0x08, 0x00, 0x4b, 0x53, 0xb9, 0xa7, 0x43, 0x7a, 0x07, 0x16, 0x79, 0xd8,
0x9b, 0x01, 0xd4, 0x81, 0x96, 0xc8, 0x78, 0x88, 0x87, 0x91, 0x63, 0xeb, 0xb5, 0x32, 0xa4, 0x2e, 0x0b, 0x90, 0x47, 0x87, 0x91, 0x43, 0x3c, 0xd2, 0x59, 0x64, 0x53, 0x80, 0x3a, 0xd0, 0xd2, 0xa7,
0x40, 0x41, 0x78, 0x32, 0xca, 0xd0, 0x69, 0xe8, 0x45, 0x03, 0x51, 0xbc, 0x32, 0x3e, 0x45, 0x21, 0x1e, 0x46, 0x8e, 0xad, 0xf7, 0xca, 0x90, 0xba, 0x00, 0x05, 0xe1, 0xc9, 0x30, 0x43, 0xa7, 0xa1,
0xf9, 0x69, 0xe6, 0x34, 0x3d, 0xd2, 0x69, 0xb0, 0x19, 0x40, 0x29, 0x34, 0x05, 0x62, 0xe4, 0x2c, 0x37, 0x0d, 0x44, 0xf1, 0xca, 0xb8, 0x8f, 0x42, 0xf2, 0x7e, 0xe6, 0x34, 0x3d, 0xd2, 0x69, 0xb0,
0x78, 0xa4, 0xd3, 0x66, 0xfa, 0x99, 0x6e, 0xc1, 0x52, 0x1c, 0x61, 0x22, 0x63, 0x39, 0x72, 0x16, 0x29, 0x40, 0x29, 0x34, 0x05, 0x62, 0xe4, 0xcc, 0x79, 0xa4, 0xd3, 0x66, 0xfa, 0x3b, 0xdd, 0x80,
0x35, 0x3e, 0x8d, 0xfd, 0xef, 0x36, 0xc0, 0x49, 0x8e, 0x38, 0x11, 0xed, 0xc1, 0x8a, 0xea, 0xa8, 0x85, 0x38, 0xc2, 0x44, 0xc6, 0x72, 0xe8, 0xcc, 0x6b, 0x7c, 0x12, 0xfb, 0x3f, 0x6d, 0x80, 0x93,
0x10, 0x29, 0x1c, 0xe2, 0x35, 0x3a, 0xcb, 0xcc, 0x84, 0xaa, 0x6d, 0xd9, 0xf5, 0xb6, 0xee, 0xc0, 0x1c, 0x71, 0x2c, 0xda, 0x83, 0x25, 0xd5, 0x51, 0x21, 0x52, 0x38, 0xc4, 0x6b, 0x74, 0x16, 0x99,
0x9a, 0x48, 0x78, 0x26, 0xfa, 0xa9, 0xdc, 0xe5, 0x42, 0x75, 0x57, 0x34, 0x50, 0x43, 0xd5, 0x3e, 0x09, 0x55, 0xdb, 0xb2, 0xeb, 0x6d, 0xdd, 0x87, 0x15, 0x91, 0xf0, 0x4c, 0x74, 0x53, 0xb9, 0xcb,
0x45, 0x4b, 0xe2, 0x09, 0x97, 0x5c, 0xb7, 0xd1, 0x66, 0x26, 0x44, 0xb7, 0x81, 0x86, 0xc3, 0x3c, 0x85, 0xea, 0xae, 0x68, 0xa0, 0x86, 0xaa, 0x73, 0x8a, 0x96, 0xc4, 0x73, 0x2e, 0xb9, 0x6e, 0xa3,
0xc7, 0x44, 0x32, 0xe4, 0xd1, 0x11, 0x8e, 0x02, 0x2e, 0xfa, 0xba, 0xad, 0x26, 0x9b, 0xb3, 0x52, 0xcd, 0x4c, 0x88, 0x6e, 0x02, 0x0d, 0x07, 0x79, 0x8e, 0x89, 0x64, 0xc8, 0xa3, 0x23, 0x1c, 0x06,
0xb5, 0x65, 0xb1, 0x6e, 0x8b, 0x69, 0x41, 0xab, 0x6a, 0x81, 0x32, 0x3c, 0x16, 0xc7, 0x13, 0x7d, 0x5c, 0x74, 0x75, 0x5b, 0x4d, 0x36, 0x63, 0xa7, 0x6a, 0xcb, 0x7c, 0xdd, 0x16, 0xd3, 0x82, 0x56,
0xce, 0x92, 0x47, 0x3a, 0x4b, 0xcc, 0x40, 0xfc, 0xa7, 0xb0, 0xca, 0xf8, 0x99, 0x61, 0x92, 0x03, 0xd5, 0x02, 0x65, 0x78, 0x2c, 0x8e, 0xc7, 0xfa, 0x9c, 0x05, 0x8f, 0x74, 0x16, 0x98, 0x81, 0xf8,
0xad, 0x8c, 0x8f, 0x06, 0x29, 0x2f, 0xe6, 0xda, 0x66, 0x65, 0xa8, 0x44, 0x88, 0xb8, 0x97, 0x70, 0x2f, 0x60, 0x99, 0xf1, 0x73, 0xc3, 0x24, 0x07, 0x5a, 0x19, 0x1f, 0xf6, 0x52, 0x5e, 0xcc, 0xb5,
0x39, 0xcc, 0x51, 0x9b, 0xd3, 0x66, 0x33, 0xc0, 0xdf, 0x83, 0x8d, 0x0a, 0xd1, 0xeb, 0x58, 0xf6, 0xcd, 0xca, 0x50, 0x89, 0x10, 0xf1, 0x59, 0xc2, 0xe5, 0x20, 0x47, 0x6d, 0x4e, 0x9b, 0x4d, 0x01,
0x0f, 0x75, 0x51, 0xce, 0xcf, 0x0a, 0x68, 0x42, 0x38, 0x03, 0xe8, 0x1a, 0xd8, 0x71, 0x69, 0xb4, 0x7f, 0x0f, 0xd6, 0x2a, 0x44, 0xef, 0x62, 0xd9, 0x3d, 0xd4, 0x45, 0x39, 0x3f, 0x2f, 0xa0, 0x31,
0x1d, 0x47, 0xfe, 0x57, 0x02, 0xeb, 0x8a, 0xe2, 0x78, 0x94, 0x84, 0xcf, 0x50, 0x08, 0xde, 0x43, 0xe1, 0x14, 0xa0, 0x2b, 0x60, 0xc7, 0xa5, 0xd1, 0x76, 0x1c, 0xf9, 0xdf, 0x09, 0xac, 0x2a, 0x8a,
0xfa, 0x10, 0x5a, 0x61, 0x9a, 0x48, 0x4c, 0xa4, 0xae, 0x5f, 0xd9, 0xf1, 0xb6, 0x8d, 0x93, 0x5a, 0xe3, 0x61, 0x12, 0xbe, 0x44, 0x21, 0xf8, 0x19, 0xd2, 0x27, 0xd0, 0x0a, 0xd3, 0x44, 0x62, 0x22,
0x66, 0xef, 0x15, 0x29, 0xaf, 0xf8, 0x60, 0x88, 0xac, 0x2c, 0xa0, 0x8f, 0x01, 0xf2, 0xe9, 0xa1, 0x75, 0xfd, 0xd2, 0xb6, 0xb7, 0x69, 0xdc, 0xd4, 0x32, 0x7b, 0xaf, 0x48, 0x79, 0xcb, 0x7b, 0x03,
0xd5, 0xfb, 0xac, 0xec, 0xdc, 0x36, 0xcb, 0xe7, 0x48, 0x66, 0x46, 0x89, 0xff, 0xd3, 0x86, 0xcd, 0x64, 0x65, 0x01, 0xdd, 0x01, 0xc8, 0x27, 0x97, 0x56, 0x9f, 0xb3, 0xb4, 0x7d, 0xcf, 0x2c, 0x9f,
0x79, 0x5b, 0xd0, 0x47, 0x00, 0x7d, 0xe4, 0xd1, 0xcb, 0x2c, 0xe2, 0x12, 0x27, 0xc2, 0xb6, 0xea, 0x21, 0x99, 0x19, 0x25, 0xfe, 0x6f, 0x1b, 0xd6, 0x67, 0x1d, 0x41, 0x9f, 0x02, 0x74, 0x91, 0x47,
0xc2, 0x82, 0x69, 0x46, 0x60, 0x31, 0x23, 0x9f, 0x1e, 0xc1, 0xfa, 0xbb, 0xe1, 0x60, 0xa0, 0x58, 0x6f, 0xb2, 0x88, 0x4b, 0x1c, 0x0b, 0xdb, 0xa8, 0x0b, 0x0b, 0x26, 0x19, 0x81, 0xc5, 0x8c, 0x7c,
0x19, 0x7e, 0x18, 0xa2, 0x90, 0xf3, 0xc4, 0x29, 0x8a, 0x83, 0x6a, 0x5a, 0x60, 0xb1, 0x7a, 0x25, 0x7a, 0x04, 0xab, 0x1f, 0x06, 0xbd, 0x9e, 0x62, 0x65, 0xf8, 0x69, 0x80, 0x42, 0xce, 0x12, 0xa7,
0x7d, 0x0e, 0xd7, 0x66, 0x90, 0xc8, 0xd2, 0x44, 0x14, 0x37, 0x6b, 0x8e, 0x53, 0x07, 0xb5, 0xbc, 0x28, 0x0e, 0xaa, 0x69, 0x81, 0xc5, 0xea, 0x95, 0xf4, 0x15, 0xdc, 0x9a, 0x42, 0x22, 0x4b, 0x13,
0xc0, 0x62, 0x97, 0x6a, 0xe9, 0x3e, 0xac, 0x62, 0x9e, 0xa7, 0xf9, 0x94, 0xac, 0xa9, 0xc9, 0x6e, 0x51, 0xbc, 0xac, 0x19, 0x4e, 0x1d, 0xd4, 0xf2, 0x02, 0x8b, 0x5d, 0xa9, 0xa5, 0xfb, 0xb0, 0x8c,
0xd5, 0xc9, 0xf6, 0xcd, 0xa4, 0xc0, 0x62, 0xd5, 0xaa, 0xdd, 0x16, 0x2c, 0x7c, 0x54, 0x56, 0xf9, 0x79, 0x9e, 0xe6, 0x13, 0xb2, 0xa6, 0x26, 0xbb, 0x5b, 0x27, 0xdb, 0x37, 0x93, 0x02, 0x8b, 0x55,
0x9f, 0x08, 0xac, 0x55, 0xdd, 0xa0, 0x9b, 0xb0, 0xa0, 0xdc, 0x28, 0xef, 0x60, 0x11, 0xd0, 0x07, 0xab, 0x76, 0x5b, 0x30, 0xf7, 0x59, 0x59, 0xe5, 0x7f, 0x21, 0xb0, 0x52, 0x75, 0x83, 0xae, 0xc3,
0xd0, 0x9a, 0x5c, 0x12, 0xc7, 0xf6, 0x1a, 0xff, 0x33, 0xaa, 0x32, 0x9f, 0xfa, 0xd0, 0x2e, 0x2f, 0x9c, 0x72, 0xa3, 0x7c, 0x83, 0x45, 0x40, 0x1f, 0x43, 0x6b, 0xfc, 0x48, 0x1c, 0xdb, 0x6b, 0x5c,
0xe1, 0x0b, 0x2e, 0xfb, 0x4e, 0x43, 0xf3, 0x56, 0x30, 0xff, 0x33, 0x81, 0x8d, 0x39, 0x96, 0x5e, 0x67, 0x54, 0x65, 0x3e, 0xf5, 0xa1, 0x5d, 0x3e, 0xc2, 0xd7, 0x5c, 0x76, 0x9d, 0x86, 0xe6, 0xad,
0x8d, 0x98, 0x2f, 0xa4, 0x38, 0x58, 0xf5, 0x89, 0x5c, 0x8d, 0x9a, 0xbb, 0x70, 0xfd, 0xd2, 0x44, 0x60, 0xfe, 0x57, 0x02, 0x6b, 0x33, 0x2c, 0xbd, 0x19, 0x31, 0xdf, 0x48, 0x71, 0xb1, 0xea, 0x13,
0x95, 0x12, 0x3d, 0xd1, 0xc9, 0xfb, 0xbd, 0x08, 0x76, 0xef, 0xfd, 0xba, 0x70, 0xc9, 0xf9, 0x85, 0xb9, 0x19, 0x35, 0x0f, 0xe1, 0xf6, 0x95, 0x89, 0x2a, 0x25, 0x7a, 0xa2, 0xe3, 0xdf, 0xf7, 0x22,
0x4b, 0xfe, 0x5c, 0xb8, 0xe4, 0xdb, 0xd8, 0xb5, 0xce, 0xc7, 0xae, 0xf5, 0x7b, 0xec, 0x5a, 0x6f, 0xd8, 0x7d, 0xf6, 0xe7, 0xd2, 0x25, 0x17, 0x97, 0x2e, 0xf9, 0x77, 0xe9, 0x92, 0x1f, 0x23, 0xd7,
0x6e, 0xfc, 0xe3, 0xfb, 0xf2, 0x76, 0x51, 0xff, 0xdd, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xca, 0xba, 0x18, 0xb9, 0xd6, 0xdf, 0x91, 0x6b, 0xbd, 0x7f, 0x70, 0xcd, 0xff, 0x9b, 0xd3, 0x79, 0xfd,
0xe3, 0xc1, 0xeb, 0x81, 0x06, 0x00, 0x00, 0xf1, 0xe8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xa5, 0xe2, 0x7c, 0xa1, 0x06, 0x00, 0x00,
} }
func (m *RootChange) Marshal() (dAtA []byte, err error) { func (m *RootChange) Marshal() (dAtA []byte, err error) {

2
common/commonspace/objectsync/objectsync.go
View File

@ -47,7 +47,7 @@ func NewObjectSync(
streamPool := newStreamPool(func(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) { streamPool := newStreamPool(func(ctx context.Context, senderId string, message *spacesyncproto.ObjectSyncMessage) (err error) {
return objectSync.HandleMessage(ctx, senderId, message) return objectSync.HandleMessage(ctx, senderId, message)
}) })
clientFactory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceClient) clientFactory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceSyncClient)
syncLog := log.With(zap.String("id", spaceId)) syncLog := log.With(zap.String("id", spaceId))
syncCtx, cancel := context.WithCancel(context.Background()) syncCtx, cancel := context.WithCancel(context.Background())
checker := NewStreamChecker( checker := NewStreamChecker(

2
common/commonspace/objectsync/streamchecker.go
View File

@ -110,7 +110,7 @@ func (s *streamChecker) CheckPeerConnection(peerId string) (err error) {
} }
func (s *streamChecker) createStream(p peer.Peer) (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 { if err != nil {
// so here probably the request is failed because there is no such space, // so here probably the request is failed because there is no such space,
// but diffService should handle such cases by sending pushSpace // but diffService should handle such cases by sending pushSpace

24
common/commonspace/objectsync/streampool.go
View File

@ -24,8 +24,8 @@ var ErrSyncTimeout = errors.New("too long wait on sync receive")
// StreamPool can be made generic to work with different streams // StreamPool can be made generic to work with different streams
type StreamPool interface { type StreamPool interface {
ocache.ObjectLastUsage ocache.ObjectLastUsage
AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (err error) AddAndReadStreamSync(stream spacesyncproto.ObjectSyncStream) (err error)
AddAndReadStreamAsync(stream spacesyncproto.SpaceStream) (err error) AddAndReadStreamAsync(stream spacesyncproto.ObjectSyncStream) (err error)
SendSync(peerId string, message *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) SendSync(peerId string, message *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error)
SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error) SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error)
@ -43,7 +43,7 @@ type responseWaiter struct {
type streamPool struct { type streamPool struct {
sync.Mutex sync.Mutex
peerStreams map[string]spacesyncproto.SpaceStream peerStreams map[string]spacesyncproto.ObjectSyncStream
messageHandler MessageHandler messageHandler MessageHandler
wg *sync.WaitGroup wg *sync.WaitGroup
waiters map[string]responseWaiter waiters map[string]responseWaiter
@ -54,7 +54,7 @@ type streamPool struct {
func newStreamPool(messageHandler MessageHandler) StreamPool { func newStreamPool(messageHandler MessageHandler) StreamPool {
s := &streamPool{ s := &streamPool{
peerStreams: make(map[string]spacesyncproto.SpaceStream), peerStreams: make(map[string]spacesyncproto.ObjectSyncStream),
messageHandler: messageHandler, messageHandler: messageHandler,
waiters: make(map[string]responseWaiter), waiters: make(map[string]responseWaiter),
wg: &sync.WaitGroup{}, wg: &sync.WaitGroup{},
@ -110,7 +110,7 @@ func (s *streamPool) SendSync(
func (s *streamPool) SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error) { func (s *streamPool) SendAsync(peers []string, message *spacesyncproto.ObjectSyncMessage) (err error) {
s.lastUsage.Store(time.Now().Unix()) s.lastUsage.Store(time.Now().Unix())
getStreams := func() (streams []spacesyncproto.SpaceStream) { getStreams := func() (streams []spacesyncproto.ObjectSyncStream) {
for _, pId := range peers { for _, pId := range peers {
stream, err := s.getOrDeleteStream(pId) stream, err := s.getOrDeleteStream(pId)
if err != nil { if err != nil {
@ -139,7 +139,7 @@ func (s *streamPool) SendAsync(peers []string, message *spacesyncproto.ObjectSyn
return err 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] stream, exists := s.peerStreams[id]
if !exists { if !exists {
err = ErrEmptyPeer err = ErrEmptyPeer
@ -156,7 +156,7 @@ func (s *streamPool) getOrDeleteStream(id string) (stream spacesyncproto.SpaceSt
return return
} }
func (s *streamPool) getAllStreams() (streams []spacesyncproto.SpaceStream) { func (s *streamPool) getAllStreams() (streams []spacesyncproto.ObjectSyncStream) {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
Loop: Loop:
@ -188,7 +188,7 @@ func (s *streamPool) BroadcastAsync(message *spacesyncproto.ObjectSyncMessage) (
return nil 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) peerId, err := s.addStream(stream)
if err != nil { if err != nil {
return return
@ -197,7 +197,7 @@ func (s *streamPool) AddAndReadStreamAsync(stream spacesyncproto.SpaceStream) (e
return return
} }
func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (err error) { func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.ObjectSyncStream) (err error) {
peerId, err := s.addStream(stream) peerId, err := s.addStream(stream)
if err != nil { if err != nil {
return return
@ -205,7 +205,7 @@ func (s *streamPool) AddAndReadStreamSync(stream spacesyncproto.SpaceStream) (er
return s.readPeerLoop(peerId, stream) 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() s.Lock()
peerId, err = peer.CtxPeerId(stream.Context()) peerId, err = peer.CtxPeerId(stream.Context())
if err != nil { if err != nil {
@ -245,7 +245,7 @@ func (s *streamPool) Close() (err error) {
return nil 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") log.With(zap.String("replyId", peerId)).Debug("reading stream from peer")
defer s.wg.Done() defer s.wg.Done()
limiter := make(chan struct{}, maxSimultaneousOperationsPerStream) limiter := make(chan struct{}, maxSimultaneousOperationsPerStream)
@ -301,7 +301,7 @@ Loop:
return 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() s.Lock()
defer s.Unlock() defer s.Unlock()
mapStream, ok := s.peerStreams[peerId] mapStream, ok := s.peerStreams[peerId]

24
common/commonspace/objectsync/streampool_test.go
View File

@ -12,7 +12,7 @@ import (
) )
type testServer struct { type testServer struct {
stream chan spacesyncproto.DRPCSpace_StreamStream stream chan spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream
addLog func(ctx context.Context, req *consensusproto.AddLogRequest) error addLog func(ctx context.Context, req *consensusproto.AddLogRequest) error
addRecord func(ctx context.Context, req *consensusproto.AddRecordRequest) error addRecord func(ctx context.Context, req *consensusproto.AddRecordRequest) error
releaseStream chan error releaseStream chan error
@ -23,20 +23,20 @@ func (t *testServer) HeadSync(ctx context.Context, request *spacesyncproto.HeadS
panic("implement me") 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") 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") panic("implement me")
} }
func (t *testServer) Stream(stream spacesyncproto.DRPCSpace_StreamStream) error { func (t *testServer) ObjectSyncStream(stream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream) error {
t.stream <- stream t.stream <- stream
return <-t.releaseStream return <-t.releaseStream
} }
func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpace_StreamStream { func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream {
select { select {
case <-time.After(time.Second * 5): case <-time.After(time.Second * 5):
test.Fatalf("waiteStream timeout") test.Fatalf("waiteStream timeout")
@ -49,9 +49,9 @@ func (t *testServer) waitStream(test *testing.T) spacesyncproto.DRPCSpace_Stream
type fixture struct { type fixture struct {
testServer *testServer testServer *testServer
drpcTS *rpctest.TesServer drpcTS *rpctest.TesServer
client spacesyncproto.DRPCSpaceClient client spacesyncproto.DRPCSpaceSyncClient
clientStream spacesyncproto.DRPCSpace_StreamStream clientStream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream
serverStream spacesyncproto.DRPCSpace_StreamStream serverStream spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream
pool *streamPool pool *streamPool
clientId string clientId string
serverId string serverId string
@ -64,12 +64,12 @@ func newFixture(t *testing.T, clientId, serverId string, handler MessageHandler)
clientId: clientId, clientId: clientId,
serverId: serverId, serverId: serverId,
} }
fx.testServer.stream = make(chan spacesyncproto.DRPCSpace_StreamStream, 1) fx.testServer.stream = make(chan spacesyncproto.DRPCSpaceSync_ObjectSyncStreamStream, 1)
require.NoError(t, spacesyncproto.DRPCRegisterSpace(fx.drpcTS.Mux, fx.testServer)) require.NoError(t, spacesyncproto.DRPCRegisterSpaceSync(fx.drpcTS.Mux, fx.testServer))
fx.client = spacesyncproto.NewDRPCSpaceClient(fx.drpcTS.Dial(peer.CtxWithPeerId(context.Background(), clientId))) fx.client = spacesyncproto.NewDRPCSpaceSyncClient(fx.drpcTS.Dial(peer.CtxWithPeerId(context.Background(), clientId)))
var err error 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) require.NoError(t, err)
fx.serverStream = fx.testServer.waitStream(t) fx.serverStream = fx.testServer.waitStream(t)
fx.pool = newStreamPool(handler).(*streamPool) fx.pool = newStreamPool(handler).(*streamPool)

4
common/commonspace/rpchandler.go
View File

@ -7,7 +7,7 @@ import (
type RpcHandler interface { type RpcHandler interface {
HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncRequest) (*spacesyncproto.HeadSyncResponse, error) 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 { type rpcHandler struct {
@ -18,7 +18,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR
return r.s.HeadSync().HandleRangeRequest(ctx, req) 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 // TODO: if needed we can launch full sync here
return r.s.ObjectSync().StreamPool().AddAndReadStreamSync(stream) return r.s.ObjectSync().StreamPool().AddAndReadStreamSync(stream)
} }

4
common/commonspace/spaceservice.go
View File

@ -169,8 +169,8 @@ func (s *spaceService) getSpaceStorageFromRemote(ctx context.Context, id string)
return return
} }
cl := spacesyncproto.NewDRPCSpaceClient(p) cl := spacesyncproto.NewDRPCSpaceSyncClient(p)
res, err := cl.PullSpace(ctx, &spacesyncproto.PullSpaceRequest{Id: id}) res, err := cl.SpacePull(ctx, &spacesyncproto.SpacePullRequest{Id: id})
if err != nil { if err != nil {
return return
} }

78
common/commonspace/spacesyncproto/mock_spacesyncproto/mock_spacesyncproto.go
View File

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT. // 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 is a generated GoMock package.
package mock_spacesyncproto package mock_spacesyncproto
@ -13,31 +13,31 @@ import (
drpc "storj.io/drpc" drpc "storj.io/drpc"
) )
// MockDRPCSpaceClient is a mock of DRPCSpaceClient interface. // MockDRPCSpaceSyncClient is a mock of DRPCSpaceSyncClient interface.
type MockDRPCSpaceClient struct { type MockDRPCSpaceSyncClient struct {
ctrl *gomock.Controller ctrl *gomock.Controller
recorder *MockDRPCSpaceClientMockRecorder recorder *MockDRPCSpaceSyncClientMockRecorder
} }
// MockDRPCSpaceClientMockRecorder is the mock recorder for MockDRPCSpaceClient. // MockDRPCSpaceSyncClientMockRecorder is the mock recorder for MockDRPCSpaceSyncClient.
type MockDRPCSpaceClientMockRecorder struct { type MockDRPCSpaceSyncClientMockRecorder struct {
mock *MockDRPCSpaceClient mock *MockDRPCSpaceSyncClient
} }
// NewMockDRPCSpaceClient creates a new mock instance. // NewMockDRPCSpaceSyncClient creates a new mock instance.
func NewMockDRPCSpaceClient(ctrl *gomock.Controller) *MockDRPCSpaceClient { func NewMockDRPCSpaceSyncClient(ctrl *gomock.Controller) *MockDRPCSpaceSyncClient {
mock := &MockDRPCSpaceClient{ctrl: ctrl} mock := &MockDRPCSpaceSyncClient{ctrl: ctrl}
mock.recorder = &MockDRPCSpaceClientMockRecorder{mock} mock.recorder = &MockDRPCSpaceSyncClientMockRecorder{mock}
return mock return mock
} }
// EXPECT returns an object that allows the caller to indicate expected use. // 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 return m.recorder
} }
// DRPCConn mocks base method. // DRPCConn mocks base method.
func (m *MockDRPCSpaceClient) DRPCConn() drpc.Conn { func (m *MockDRPCSpaceSyncClient) DRPCConn() drpc.Conn {
m.ctrl.T.Helper() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "DRPCConn") ret := m.ctrl.Call(m, "DRPCConn")
ret0, _ := ret[0].(drpc.Conn) ret0, _ := ret[0].(drpc.Conn)
@ -45,13 +45,13 @@ func (m *MockDRPCSpaceClient) DRPCConn() drpc.Conn {
} }
// DRPCConn indicates an expected call of DRPCConn. // DRPCConn indicates an expected call of DRPCConn.
func (mr *MockDRPCSpaceClientMockRecorder) DRPCConn() *gomock.Call { func (mr *MockDRPCSpaceSyncClientMockRecorder) DRPCConn() *gomock.Call {
mr.mock.ctrl.T.Helper() 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. // 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() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "HeadSync", arg0, arg1) ret := m.ctrl.Call(m, "HeadSync", arg0, arg1)
ret0, _ := ret[0].(*spacesyncproto.HeadSyncResponse) 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. // 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() 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. // ObjectSyncStream mocks base method.
func (m *MockDRPCSpaceClient) PullSpace(arg0 context.Context, arg1 *spacesyncproto.PullSpaceRequest) (*spacesyncproto.PullSpaceResponse, error) { func (m *MockDRPCSpaceSyncClient) ObjectSyncStream(arg0 context.Context) (spacesyncproto.DRPCSpaceSync_ObjectSyncStreamClient, error) {
m.ctrl.T.Helper() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "PullSpace", arg0, arg1) ret := m.ctrl.Call(m, "ObjectSyncStream", arg0)
ret0, _ := ret[0].(*spacesyncproto.PullSpaceResponse) ret0, _ := ret[0].(spacesyncproto.DRPCSpaceSync_ObjectSyncStreamClient)
ret1, _ := ret[1].(error) ret1, _ := ret[1].(error)
return ret0, ret1 return ret0, ret1
} }
// PullSpace indicates an expected call of PullSpace. // ObjectSyncStream indicates an expected call of ObjectSyncStream.
func (mr *MockDRPCSpaceClientMockRecorder) PullSpace(arg0, arg1 interface{}) *gomock.Call { func (mr *MockDRPCSpaceSyncClientMockRecorder) ObjectSyncStream(arg0 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper() 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. // SpacePull mocks base method.
func (m *MockDRPCSpaceClient) PushSpace(arg0 context.Context, arg1 *spacesyncproto.PushSpaceRequest) (*spacesyncproto.PushSpaceResponse, error) { func (m *MockDRPCSpaceSyncClient) SpacePull(arg0 context.Context, arg1 *spacesyncproto.SpacePullRequest) (*spacesyncproto.SpacePullResponse, error) {
m.ctrl.T.Helper() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "PushSpace", arg0, arg1) ret := m.ctrl.Call(m, "SpacePull", arg0, arg1)
ret0, _ := ret[0].(*spacesyncproto.PushSpaceResponse) ret0, _ := ret[0].(*spacesyncproto.SpacePullResponse)
ret1, _ := ret[1].(error) ret1, _ := ret[1].(error)
return ret0, ret1 return ret0, ret1
} }
// PushSpace indicates an expected call of PushSpace. // SpacePull indicates an expected call of SpacePull.
func (mr *MockDRPCSpaceClientMockRecorder) PushSpace(arg0, arg1 interface{}) *gomock.Call { func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePull(arg0, arg1 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper() 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. // SpacePush mocks base method.
func (m *MockDRPCSpaceClient) Stream(arg0 context.Context) (spacesyncproto.DRPCSpace_StreamClient, error) { func (m *MockDRPCSpaceSyncClient) SpacePush(arg0 context.Context, arg1 *spacesyncproto.SpacePushRequest) (*spacesyncproto.SpacePushResponse, error) {
m.ctrl.T.Helper() m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Stream", arg0) ret := m.ctrl.Call(m, "SpacePush", arg0, arg1)
ret0, _ := ret[0].(spacesyncproto.DRPCSpace_StreamClient) ret0, _ := ret[0].(*spacesyncproto.SpacePushResponse)
ret1, _ := ret[1].(error) ret1, _ := ret[1].(error)
return ret0, ret1 return ret0, ret1
} }
// Stream indicates an expected call of Stream. // SpacePush indicates an expected call of SpacePush.
func (mr *MockDRPCSpaceClientMockRecorder) Stream(arg0 interface{}) *gomock.Call { func (mr *MockDRPCSpaceSyncClientMockRecorder) SpacePush(arg0, arg1 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper() 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)
} }

18
common/commonspace/spacesyncproto/protos/spacesync.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
package anySpace; package spacesync;
option go_package = "commonspace/spacesyncproto"; option go_package = "commonspace/spacesyncproto";
@ -10,15 +10,15 @@ enum ErrCodes {
ErrorOffset = 100; ErrorOffset = 100;
} }
service Space { service SpaceSync {
// HeadSync compares all objects and their hashes in a space // HeadSync compares all objects and their hashes in a space
rpc HeadSync(HeadSyncRequest) returns (HeadSyncResponse); rpc HeadSync(HeadSyncRequest) returns (HeadSyncResponse);
// PushSpace sends new space to the node // PushSpace sends new space to the node
rpc PushSpace(PushSpaceRequest) returns (PushSpaceResponse); rpc SpacePush(SpacePushRequest) returns (SpacePushResponse);
// PullSpace gets space from the remote peer // 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 // 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 // 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 // PushSpaceRequest is a request to add space on a node containing only one acl record
message PushSpaceRequest { message SpacePushRequest {
SpacePayload payload = 1; SpacePayload payload = 1;
} }
// PushSpaceResponse is an empty response // 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 // PullSpaceRequest is a request to request a space on a node that doesn't have it
message PullSpaceRequest { message SpacePullRequest {
string id = 1; string id = 1;
} }
// PullSpaceResponse is a response with header and acl root // PullSpaceResponse is a response with header and acl root
message PullSpaceResponse { message SpacePullResponse {
SpacePayload payload = 1; SpacePayload payload = 1;
} }

10
common/commonspace/spacesyncproto/spacesync.go
View File

@ -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 package spacesyncproto
import ( import (
"storj.io/drpc" "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) return c(cc)
} }
type ClientFactory interface { type ClientFactory interface {
Client(cc drpc.Conn) DRPCSpaceClient Client(cc drpc.Conn) DRPCSpaceSyncClient
} }

326
common/commonspace/spacesyncproto/spacesync.pb.go
View File

@ -396,22 +396,22 @@ func (m *ObjectSyncMessage) GetObjectId() string {
} }
// PushSpaceRequest is a request to add space on a node containing only one acl record // 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"` Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
} }
func (m *PushSpaceRequest) Reset() { *m = PushSpaceRequest{} } func (m *SpacePushRequest) Reset() { *m = SpacePushRequest{} }
func (m *PushSpaceRequest) String() string { return proto.CompactTextString(m) } func (m *SpacePushRequest) String() string { return proto.CompactTextString(m) }
func (*PushSpaceRequest) ProtoMessage() {} func (*SpacePushRequest) ProtoMessage() {}
func (*PushSpaceRequest) Descriptor() ([]byte, []int) { func (*SpacePushRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{6} 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) 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 { if deterministic {
return xxx_messageInfo_PushSpaceRequest.Marshal(b, m, deterministic) return xxx_messageInfo_SpacePushRequest.Marshal(b, m, deterministic)
} else { } else {
b = b[:cap(b)] b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(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 return b[:n], nil
} }
} }
func (m *PushSpaceRequest) XXX_Merge(src proto.Message) { func (m *SpacePushRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_PushSpaceRequest.Merge(m, src) xxx_messageInfo_SpacePushRequest.Merge(m, src)
} }
func (m *PushSpaceRequest) XXX_Size() int { func (m *SpacePushRequest) XXX_Size() int {
return m.Size() return m.Size()
} }
func (m *PushSpaceRequest) XXX_DiscardUnknown() { func (m *SpacePushRequest) XXX_DiscardUnknown() {
xxx_messageInfo_PushSpaceRequest.DiscardUnknown(m) 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 { if m != nil {
return m.Payload return m.Payload
} }
@ -441,21 +441,21 @@ func (m *PushSpaceRequest) GetPayload() *SpacePayload {
} }
// PushSpaceResponse is an empty response // PushSpaceResponse is an empty response
type PushSpaceResponse struct { type SpacePushResponse struct {
} }
func (m *PushSpaceResponse) Reset() { *m = PushSpaceResponse{} } func (m *SpacePushResponse) Reset() { *m = SpacePushResponse{} }
func (m *PushSpaceResponse) String() string { return proto.CompactTextString(m) } func (m *SpacePushResponse) String() string { return proto.CompactTextString(m) }
func (*PushSpaceResponse) ProtoMessage() {} func (*SpacePushResponse) ProtoMessage() {}
func (*PushSpaceResponse) Descriptor() ([]byte, []int) { func (*SpacePushResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{7} 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) 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 { if deterministic {
return xxx_messageInfo_PushSpaceResponse.Marshal(b, m, deterministic) return xxx_messageInfo_SpacePushResponse.Marshal(b, m, deterministic)
} else { } else {
b = b[:cap(b)] b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(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 return b[:n], nil
} }
} }
func (m *PushSpaceResponse) XXX_Merge(src proto.Message) { func (m *SpacePushResponse) XXX_Merge(src proto.Message) {
xxx_messageInfo_PushSpaceResponse.Merge(m, src) xxx_messageInfo_SpacePushResponse.Merge(m, src)
} }
func (m *PushSpaceResponse) XXX_Size() int { func (m *SpacePushResponse) XXX_Size() int {
return m.Size() return m.Size()
} }
func (m *PushSpaceResponse) XXX_DiscardUnknown() { func (m *SpacePushResponse) XXX_DiscardUnknown() {
xxx_messageInfo_PushSpaceResponse.DiscardUnknown(m) 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 // 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"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
} }
func (m *PullSpaceRequest) Reset() { *m = PullSpaceRequest{} } func (m *SpacePullRequest) Reset() { *m = SpacePullRequest{} }
func (m *PullSpaceRequest) String() string { return proto.CompactTextString(m) } func (m *SpacePullRequest) String() string { return proto.CompactTextString(m) }
func (*PullSpaceRequest) ProtoMessage() {} func (*SpacePullRequest) ProtoMessage() {}
func (*PullSpaceRequest) Descriptor() ([]byte, []int) { func (*SpacePullRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{8} 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) 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 { if deterministic {
return xxx_messageInfo_PullSpaceRequest.Marshal(b, m, deterministic) return xxx_messageInfo_SpacePullRequest.Marshal(b, m, deterministic)
} else { } else {
b = b[:cap(b)] b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(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 return b[:n], nil
} }
} }
func (m *PullSpaceRequest) XXX_Merge(src proto.Message) { func (m *SpacePullRequest) XXX_Merge(src proto.Message) {
xxx_messageInfo_PullSpaceRequest.Merge(m, src) xxx_messageInfo_SpacePullRequest.Merge(m, src)
} }
func (m *PullSpaceRequest) XXX_Size() int { func (m *SpacePullRequest) XXX_Size() int {
return m.Size() return m.Size()
} }
func (m *PullSpaceRequest) XXX_DiscardUnknown() { func (m *SpacePullRequest) XXX_DiscardUnknown() {
xxx_messageInfo_PullSpaceRequest.DiscardUnknown(m) 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 { if m != nil {
return m.Id return m.Id
} }
@ -523,22 +523,22 @@ func (m *PullSpaceRequest) GetId() string {
} }
// PullSpaceResponse is a response with header and acl root // 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"` Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
} }
func (m *PullSpaceResponse) Reset() { *m = PullSpaceResponse{} } func (m *SpacePullResponse) Reset() { *m = SpacePullResponse{} }
func (m *PullSpaceResponse) String() string { return proto.CompactTextString(m) } func (m *SpacePullResponse) String() string { return proto.CompactTextString(m) }
func (*PullSpaceResponse) ProtoMessage() {} func (*SpacePullResponse) ProtoMessage() {}
func (*PullSpaceResponse) Descriptor() ([]byte, []int) { func (*SpacePullResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_80e49f1f4ac27799, []int{9} 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) 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 { if deterministic {
return xxx_messageInfo_PullSpaceResponse.Marshal(b, m, deterministic) return xxx_messageInfo_SpacePullResponse.Marshal(b, m, deterministic)
} else { } else {
b = b[:cap(b)] b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(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 return b[:n], nil
} }
} }
func (m *PullSpaceResponse) XXX_Merge(src proto.Message) { func (m *SpacePullResponse) XXX_Merge(src proto.Message) {
xxx_messageInfo_PullSpaceResponse.Merge(m, src) xxx_messageInfo_SpacePullResponse.Merge(m, src)
} }
func (m *PullSpaceResponse) XXX_Size() int { func (m *SpacePullResponse) XXX_Size() int {
return m.Size() return m.Size()
} }
func (m *PullSpaceResponse) XXX_DiscardUnknown() { func (m *SpacePullResponse) XXX_DiscardUnknown() {
xxx_messageInfo_PullSpaceResponse.DiscardUnknown(m) 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 { if m != nil {
return m.Payload return m.Payload
} }
@ -1038,25 +1038,25 @@ func (m *SettingsData) GetSnapshot() *SpaceSettingsSnapshot {
} }
func init() { func init() {
proto.RegisterEnum("anySpace.ErrCodes", ErrCodes_name, ErrCodes_value) proto.RegisterEnum("spacesync.ErrCodes", ErrCodes_name, ErrCodes_value)
proto.RegisterType((*HeadSyncRange)(nil), "anySpace.HeadSyncRange") proto.RegisterType((*HeadSyncRange)(nil), "spacesync.HeadSyncRange")
proto.RegisterType((*HeadSyncResult)(nil), "anySpace.HeadSyncResult") proto.RegisterType((*HeadSyncResult)(nil), "spacesync.HeadSyncResult")
proto.RegisterType((*HeadSyncResultElement)(nil), "anySpace.HeadSyncResultElement") proto.RegisterType((*HeadSyncResultElement)(nil), "spacesync.HeadSyncResultElement")
proto.RegisterType((*HeadSyncRequest)(nil), "anySpace.HeadSyncRequest") proto.RegisterType((*HeadSyncRequest)(nil), "spacesync.HeadSyncRequest")
proto.RegisterType((*HeadSyncResponse)(nil), "anySpace.HeadSyncResponse") proto.RegisterType((*HeadSyncResponse)(nil), "spacesync.HeadSyncResponse")
proto.RegisterType((*ObjectSyncMessage)(nil), "anySpace.ObjectSyncMessage") proto.RegisterType((*ObjectSyncMessage)(nil), "spacesync.ObjectSyncMessage")
proto.RegisterType((*PushSpaceRequest)(nil), "anySpace.PushSpaceRequest") proto.RegisterType((*SpacePushRequest)(nil), "spacesync.SpacePushRequest")
proto.RegisterType((*PushSpaceResponse)(nil), "anySpace.PushSpaceResponse") proto.RegisterType((*SpacePushResponse)(nil), "spacesync.SpacePushResponse")
proto.RegisterType((*PullSpaceRequest)(nil), "anySpace.PullSpaceRequest") proto.RegisterType((*SpacePullRequest)(nil), "spacesync.SpacePullRequest")
proto.RegisterType((*PullSpaceResponse)(nil), "anySpace.PullSpaceResponse") proto.RegisterType((*SpacePullResponse)(nil), "spacesync.SpacePullResponse")
proto.RegisterType((*SpacePayload)(nil), "anySpace.SpacePayload") proto.RegisterType((*SpacePayload)(nil), "spacesync.SpacePayload")
proto.RegisterType((*SpaceHeader)(nil), "anySpace.SpaceHeader") proto.RegisterType((*SpaceHeader)(nil), "spacesync.SpaceHeader")
proto.RegisterType((*RawSpaceHeader)(nil), "anySpace.RawSpaceHeader") proto.RegisterType((*RawSpaceHeader)(nil), "spacesync.RawSpaceHeader")
proto.RegisterType((*RawSpaceHeaderWithId)(nil), "anySpace.RawSpaceHeaderWithId") proto.RegisterType((*RawSpaceHeaderWithId)(nil), "spacesync.RawSpaceHeaderWithId")
proto.RegisterType((*SpaceSettingsContent)(nil), "anySpace.SpaceSettingsContent") proto.RegisterType((*SpaceSettingsContent)(nil), "spacesync.SpaceSettingsContent")
proto.RegisterType((*ObjectDelete)(nil), "anySpace.ObjectDelete") proto.RegisterType((*ObjectDelete)(nil), "spacesync.ObjectDelete")
proto.RegisterType((*SpaceSettingsSnapshot)(nil), "anySpace.SpaceSettingsSnapshot") proto.RegisterType((*SpaceSettingsSnapshot)(nil), "spacesync.SpaceSettingsSnapshot")
proto.RegisterType((*SettingsData)(nil), "anySpace.SettingsData") proto.RegisterType((*SettingsData)(nil), "spacesync.SettingsData")
} }
func init() { func init() {
@ -1064,63 +1064,63 @@ func init() {
} }
var fileDescriptor_80e49f1f4ac27799 = []byte{ var fileDescriptor_80e49f1f4ac27799 = []byte{
// 882 bytes of a gzipped FileDescriptorProto // 887 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0x1b, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
0x14, 0xf7, 0x6e, 0x9c, 0xc4, 0x7e, 0xd9, 0xba, 0xee, 0x90, 0x96, 0xc5, 0x45, 0x4b, 0x34, 0x07, 0x18, 0xf6, 0x6e, 0x9c, 0x26, 0x7e, 0xb3, 0x75, 0xdd, 0x21, 0x85, 0xc5, 0x8d, 0x5c, 0x6b, 0x0e,
0x14, 0x71, 0x48, 0x8a, 0x41, 0x80, 0x54, 0x0e, 0xd0, 0xda, 0x55, 0x2d, 0x54, 0x12, 0x8d, 0x41, 0x28, 0xe2, 0xd0, 0x8f, 0x14, 0x81, 0x10, 0x70, 0xa0, 0x89, 0x4b, 0x2d, 0x54, 0x52, 0x8d, 0x41,
0x48, 0x08, 0x0e, 0xd3, 0xdd, 0x89, 0xbd, 0x68, 0xbd, 0xb3, 0xec, 0x8c, 0x49, 0x7d, 0x40, 0xe2, 0x48, 0x48, 0x20, 0x4d, 0x77, 0xdf, 0xd8, 0x8b, 0xd6, 0x33, 0xcb, 0xce, 0x98, 0xc6, 0x07, 0x0e,
0xc2, 0x9d, 0x4f, 0x80, 0xc4, 0xb7, 0xe1, 0xd8, 0x23, 0x47, 0x94, 0x7c, 0x11, 0x34, 0x6f, 0xff, 0x9c, 0xb8, 0xf2, 0x17, 0xf8, 0x0f, 0xfc, 0x08, 0x8e, 0x3d, 0x72, 0x44, 0xc9, 0x1f, 0x41, 0x33,
0x3b, 0x9b, 0x4a, 0x5c, 0xd6, 0xf3, 0xfe, 0xfd, 0xde, 0x9f, 0x79, 0xf3, 0x93, 0xe1, 0x43, 0x5f, 0xfb, 0x1d, 0x6f, 0x7a, 0xe8, 0x65, 0x33, 0xef, 0xd7, 0xf3, 0x7e, 0xcc, 0x3b, 0x4f, 0x0c, 0x8f,
0xae, 0x56, 0x32, 0x56, 0x09, 0xf7, 0xc5, 0x29, 0x7e, 0xd5, 0x26, 0xf6, 0x93, 0x54, 0x6a, 0x79, 0x02, 0xb9, 0x5c, 0x4a, 0xa1, 0x12, 0x1e, 0xe0, 0x03, 0xfb, 0x55, 0x6b, 0x11, 0x24, 0xa9, 0xd4,
0x8a, 0x5f, 0x55, 0x69, 0x4f, 0x50, 0x41, 0x7a, 0x3c, 0xde, 0xcc, 0x8d, 0x8e, 0xce, 0xe0, 0xce, 0xf2, 0x81, 0xfd, 0xaa, 0x4a, 0x7b, 0xdf, 0x2a, 0x48, 0xaf, 0x54, 0xd0, 0x29, 0xdc, 0x7c, 0x86,
0x73, 0xc1, 0x83, 0xf9, 0x26, 0xf6, 0x19, 0x8f, 0x17, 0x82, 0x10, 0xe8, 0x5e, 0xa4, 0x72, 0xe5, 0x3c, 0x9c, 0xad, 0x45, 0xc0, 0xb8, 0x98, 0x23, 0x21, 0xd0, 0x3d, 0x4b, 0xe5, 0xd2, 0x77, 0xc6,
0x5a, 0x47, 0xd6, 0x71, 0x97, 0xe1, 0x99, 0x0c, 0xc0, 0xd6, 0xd2, 0xb5, 0x51, 0x63, 0x6b, 0x49, 0xce, 0x61, 0x97, 0xd9, 0x33, 0xe9, 0x83, 0xab, 0xa5, 0xef, 0x5a, 0x8d, 0xab, 0x25, 0xd9, 0x87,
0x0e, 0x61, 0x37, 0x0a, 0x57, 0xa1, 0x76, 0x77, 0x8e, 0xac, 0xe3, 0x3b, 0x2c, 0x13, 0xe8, 0x25, 0xed, 0x38, 0x5a, 0x46, 0xda, 0xdf, 0x1a, 0x3b, 0x87, 0x37, 0x59, 0x26, 0xd0, 0x73, 0xe8, 0x97,
0x0c, 0x4a, 0x28, 0xa1, 0xd6, 0x91, 0x36, 0x58, 0x4b, 0xae, 0x96, 0x88, 0xe5, 0x30, 0x3c, 0x93, 0x50, 0xa8, 0x56, 0xb1, 0x36, 0x58, 0x0b, 0xae, 0x16, 0x16, 0xcb, 0x63, 0xf6, 0x4c, 0x3e, 0x87,
0xc7, 0xd0, 0x13, 0x91, 0x58, 0x89, 0x58, 0x2b, 0xd7, 0x3e, 0xda, 0x39, 0x3e, 0x18, 0xbf, 0x77, 0x5d, 0x8c, 0x71, 0x89, 0x42, 0x2b, 0xdf, 0x1d, 0x6f, 0x1d, 0xee, 0x1d, 0x8d, 0xef, 0x57, 0xf5,
0x52, 0x54, 0x73, 0xd2, 0x8c, 0x9f, 0x66, 0x7e, 0xac, 0x0c, 0x30, 0x89, 0x7d, 0xb9, 0x8e, 0xcb, 0x35, 0x01, 0x26, 0x99, 0x23, 0x2b, 0x23, 0x4c, 0xe6, 0x40, 0xae, 0x44, 0x99, 0xd9, 0x0a, 0xf4,
0xc4, 0x28, 0xd0, 0xc7, 0x70, 0xbf, 0x35, 0xd0, 0xd4, 0x1d, 0x06, 0x98, 0xbd, 0xcf, 0xec, 0x30, 0x33, 0xb8, 0xd3, 0x1a, 0x68, 0x0a, 0x8f, 0x42, 0x9b, 0xbe, 0xc7, 0xdc, 0x28, 0xb4, 0x05, 0x21,
0xc0, 0x7a, 0x04, 0x0f, 0xb0, 0x93, 0x3e, 0xc3, 0x33, 0xfd, 0x01, 0xee, 0x56, 0xc1, 0x3f, 0xaf, 0x0f, 0x6d, 0x2b, 0x3d, 0x66, 0xcf, 0xf4, 0x47, 0xb8, 0x55, 0x05, 0xff, 0xb2, 0x42, 0xa5, 0x89,
0x85, 0xd2, 0xc4, 0x85, 0x7d, 0x1c, 0xd8, 0xac, 0x88, 0x2d, 0x44, 0x72, 0x0a, 0x7b, 0xa9, 0x99, 0x0f, 0x3b, 0xb6, 0xa4, 0x69, 0x11, 0x5b, 0x88, 0xe4, 0x21, 0xdc, 0x48, 0xcd, 0x98, 0x8a, 0xda,
0x52, 0x51, 0xfa, 0xdb, 0x2d, 0xa5, 0x1b, 0x3b, 0xcb, 0xdd, 0xe8, 0x33, 0x18, 0xd6, 0x4a, 0x4b, 0xfd, 0xb6, 0xda, 0x8d, 0x03, 0xcb, 0xfd, 0xe8, 0x57, 0x30, 0xa8, 0xd5, 0x96, 0x48, 0xa1, 0x90,
0x64, 0xac, 0x04, 0x19, 0xc3, 0x7e, 0x8a, 0x65, 0x2a, 0xd7, 0x42, 0x14, 0xf7, 0xb6, 0x01, 0xb0, 0x3c, 0x86, 0x9d, 0xd4, 0xd6, 0xa9, 0x7c, 0xc7, 0xc2, 0xbc, 0x7f, 0xed, 0x08, 0x58, 0xe1, 0x49,
0xc2, 0x91, 0xfe, 0x0a, 0xf7, 0xce, 0x5e, 0xfe, 0x24, 0x7c, 0x6d, 0x8c, 0x2f, 0x84, 0x52, 0x7c, 0x7f, 0x83, 0xdb, 0xa7, 0x2f, 0x7f, 0xc6, 0x40, 0x1b, 0xe3, 0x73, 0x54, 0x8a, 0xcf, 0xf1, 0x0d,
0x21, 0xde, 0x50, 0xa7, 0x6b, 0x52, 0x24, 0xd1, 0x66, 0x56, 0xf4, 0x5a, 0x88, 0xc6, 0x92, 0xf0, 0x95, 0xfa, 0x26, 0x47, 0x12, 0xaf, 0xa7, 0x45, 0xb7, 0x85, 0x68, 0x2c, 0x09, 0x5f, 0xc7, 0x92,
0x4d, 0x24, 0x79, 0x80, 0x33, 0x74, 0x58, 0x21, 0x92, 0x11, 0xf4, 0x24, 0xa6, 0x98, 0x05, 0x6e, 0x87, 0x76, 0x8a, 0x1e, 0x2b, 0x44, 0x32, 0x84, 0x5d, 0x69, 0x53, 0x4c, 0x43, 0xbf, 0x6b, 0x83,
0x17, 0x83, 0x4a, 0x99, 0x4e, 0x60, 0x78, 0xbe, 0x56, 0x4b, 0xac, 0xb1, 0x98, 0xd2, 0xa3, 0x0a, 0x4a, 0x99, 0x4e, 0x60, 0x30, 0x33, 0xd0, 0x2f, 0x56, 0x6a, 0x51, 0xcc, 0xe9, 0x51, 0x85, 0x64,
0xc9, 0x64, 0x3f, 0x18, 0x3f, 0xa8, 0xda, 0xc0, 0xef, 0x79, 0x66, 0x2d, 0x33, 0xd0, 0xb7, 0xe0, 0xb2, 0xef, 0x1d, 0xbd, 0x57, 0xeb, 0x23, 0xf3, 0xce, 0xcc, 0x65, 0x0a, 0xfa, 0x0e, 0xdc, 0xae,
0x5e, 0x0d, 0x25, 0x9b, 0x06, 0xa5, 0x06, 0x3a, 0x8a, 0x1a, 0xd0, 0x5b, 0xf7, 0x46, 0xa7, 0x26, 0xc1, 0x64, 0xf3, 0xa0, 0xb4, 0xc4, 0x8e, 0xe3, 0x02, 0xfb, 0xca, 0xd5, 0xd1, 0xa7, 0x65, 0xa0,
0xb0, 0xf4, 0xc9, 0xc7, 0xf8, 0xff, 0xf3, 0xff, 0x66, 0x83, 0x53, 0xb7, 0x90, 0x2f, 0xe0, 0x00, 0xf1, 0xc9, 0x07, 0xf9, 0x16, 0x05, 0xfc, 0xee, 0x82, 0x57, 0xb7, 0x90, 0x2f, 0x61, 0xcf, 0xc6,
0x27, 0x66, 0xa6, 0x2e, 0xd2, 0x1c, 0xc6, 0xab, 0x60, 0x18, 0xbf, 0x9c, 0x57, 0xf6, 0xef, 0x42, 0x98, 0xb9, 0x63, 0x9a, 0xe3, 0xdc, 0xab, 0xe1, 0x30, 0xfe, 0x6a, 0x56, 0x39, 0x7c, 0x1f, 0xe9,
0xbd, 0x9c, 0x05, 0xac, 0x1e, 0x42, 0x3c, 0x00, 0xee, 0x47, 0x39, 0x1e, 0xce, 0xda, 0x61, 0x35, 0xc5, 0x34, 0x64, 0xf5, 0x18, 0x32, 0x02, 0xe0, 0x41, 0x9c, 0x03, 0xda, 0x71, 0x7b, 0xac, 0xa6,
0x0d, 0xa1, 0xe0, 0x54, 0xd2, 0x2c, 0x9b, 0x79, 0x9f, 0x35, 0x74, 0x64, 0x0c, 0x87, 0x08, 0x39, 0x21, 0x14, 0xbc, 0x4a, 0x9a, 0x66, 0x63, 0xef, 0xb1, 0x86, 0x8e, 0x1c, 0xc1, 0xbe, 0x85, 0x9c,
0x17, 0x5a, 0x87, 0xf1, 0x42, 0x15, 0x68, 0x5d, 0x44, 0x6b, 0xb5, 0x91, 0x4f, 0xe0, 0x41, 0x9b, 0xa1, 0xd6, 0x91, 0x98, 0xab, 0x02, 0xad, 0x6b, 0xd1, 0x5a, 0x6d, 0xe4, 0x63, 0x78, 0xb7, 0x4d,
0x7e, 0x16, 0xb8, 0xbb, 0x98, 0xe1, 0x16, 0x2b, 0xfd, 0xcb, 0x82, 0x83, 0x5a, 0x4b, 0xe6, 0xd2, 0x3f, 0x0d, 0xfd, 0x6d, 0x9b, 0xe1, 0x1a, 0x2b, 0xfd, 0xcb, 0x81, 0xbd, 0x5a, 0x4b, 0xe6, 0xde,
0xc3, 0x40, 0xc4, 0x3a, 0xd4, 0x9b, 0xfc, 0x95, 0x96, 0x32, 0x79, 0x17, 0xfa, 0x3a, 0x5c, 0x09, 0xa3, 0x10, 0x85, 0x8e, 0xf4, 0x3a, 0x7f, 0xab, 0xa5, 0x4c, 0x0e, 0xa0, 0xa7, 0xa3, 0x25, 0x2a,
0xa5, 0xf9, 0x2a, 0xc1, 0xd6, 0x76, 0x58, 0xa5, 0x30, 0x56, 0xcc, 0xf1, 0xcd, 0x26, 0x11, 0x79, 0xcd, 0x97, 0x89, 0x6d, 0x6d, 0x8b, 0x55, 0x0a, 0x63, 0xb5, 0x39, 0xbe, 0x5d, 0x27, 0x98, 0xb7,
0x5b, 0x95, 0x82, 0xbc, 0x0f, 0x03, 0xb3, 0x71, 0xa1, 0xcf, 0x75, 0x28, 0xe3, 0xaf, 0xc4, 0x06, 0x55, 0x29, 0xc8, 0x07, 0xd0, 0x37, 0x4b, 0x17, 0x05, 0x5c, 0x47, 0x52, 0x7c, 0x8d, 0x6b, 0xdb,
0xbb, 0xe9, 0xb2, 0x2d, 0xad, 0x79, 0x91, 0x4a, 0x88, 0xac, 0x6a, 0x87, 0xe1, 0x99, 0x9e, 0xc3, 0x4d, 0x97, 0x5d, 0xd1, 0x9a, 0x67, 0xa9, 0x10, 0xb3, 0xaa, 0x3d, 0x66, 0xcf, 0xf4, 0x05, 0xf4,
0xa0, 0x39, 0x78, 0x72, 0x74, 0xf3, 0x9e, 0x9c, 0xe6, 0x3d, 0x98, 0x6a, 0xc2, 0x45, 0xcc, 0xf5, 0x9b, 0x83, 0x27, 0xe3, 0xcd, 0x8b, 0xf2, 0x9a, 0xf7, 0x60, 0xaa, 0x89, 0xe6, 0x82, 0xeb, 0x55,
0x3a, 0x15, 0xf9, 0x35, 0x54, 0x0a, 0x3a, 0x81, 0xc3, 0xb6, 0xab, 0x34, 0x51, 0x29, 0xbf, 0x6c, 0x8a, 0xf9, 0x35, 0x54, 0x0a, 0x7a, 0x02, 0xfb, 0x6d, 0x57, 0x69, 0xa2, 0x52, 0xfe, 0xaa, 0x81,
0xa0, 0x56, 0x8a, 0x7c, 0x0b, 0xed, 0x72, 0x0b, 0x7f, 0x84, 0xc3, 0x79, 0x7d, 0xaa, 0x4f, 0x65, 0x5a, 0x29, 0xf2, 0x3d, 0x74, 0xcb, 0x3d, 0xfc, 0x09, 0xf6, 0x67, 0xf5, 0xa9, 0x1e, 0x4b, 0xa1,
0xac, 0x0d, 0xcb, 0x7c, 0x0e, 0x4e, 0xf6, 0x50, 0x26, 0x22, 0x12, 0x5a, 0xdc, 0xdc, 0xc6, 0xb3, 0x0d, 0xd5, 0x7c, 0x01, 0x5e, 0xf6, 0x56, 0x4e, 0x30, 0x46, 0x8d, 0x2d, 0xfb, 0x78, 0x5a, 0x33,
0x9a, 0xf5, 0x79, 0x87, 0x35, 0xbc, 0x9f, 0xec, 0xc3, 0xee, 0x2f, 0x3c, 0x5a, 0x0b, 0xea, 0x81, 0x3f, 0xeb, 0xb0, 0x86, 0xfb, 0x93, 0x1d, 0xd8, 0xfe, 0x95, 0xc7, 0x2b, 0xa4, 0x23, 0xf0, 0xea,
0x53, 0x77, 0xbc, 0xf1, 0x08, 0x3e, 0x85, 0xfb, 0x8d, 0xf4, 0xf3, 0x98, 0x27, 0x6a, 0x29, 0xb5, 0x8e, 0x1b, 0xef, 0xe0, 0x13, 0xb8, 0xd3, 0xc8, 0x3f, 0x13, 0x3c, 0x51, 0x0b, 0xa9, 0xcd, 0x12,
0xd9, 0xc1, 0x00, 0x43, 0x82, 0x59, 0x90, 0x51, 0x4a, 0x9f, 0xd5, 0x34, 0xf4, 0x77, 0x0b, 0x9c, 0x86, 0x36, 0x24, 0x9c, 0x86, 0x19, 0xaf, 0xf4, 0x58, 0x4d, 0x43, 0xff, 0x70, 0xc0, 0x2b, 0x82,
0x22, 0x68, 0xc2, 0x35, 0x27, 0x9f, 0xc1, 0xbe, 0x9f, 0xd5, 0x9e, 0x13, 0x90, 0xb7, 0xf5, 0x72, 0x4e, 0xb8, 0xe6, 0xe4, 0x53, 0xd8, 0x09, 0xb2, 0xe2, 0x73, 0x16, 0xba, 0x77, 0xf5, 0xf1, 0x5c,
0xb6, 0x3a, 0x64, 0x85, 0xbb, 0x21, 0x6f, 0x95, 0xa7, 0xc5, 0xc1, 0x34, 0xc8, 0xbb, 0xb5, 0x3a, 0xe9, 0x91, 0x15, 0xfe, 0x86, 0xc4, 0x55, 0x9e, 0xd7, 0x8e, 0xa6, 0x49, 0xe2, 0xad, 0xf5, 0xb1,
0x56, 0x06, 0x7c, 0xf0, 0x35, 0xf4, 0xa6, 0x69, 0xfa, 0x54, 0x06, 0x42, 0x91, 0x01, 0xc0, 0xb7, 0x32, 0xe2, 0xc3, 0x6f, 0x60, 0x77, 0x92, 0xa6, 0xc7, 0x32, 0x44, 0x45, 0xfa, 0x00, 0xdf, 0x09,
0xb1, 0x78, 0x95, 0x08, 0x5f, 0x8b, 0x60, 0xd8, 0x21, 0xc3, 0xfc, 0x65, 0xbe, 0x08, 0x95, 0x0a, 0x3c, 0x4f, 0x30, 0xd0, 0x18, 0x0e, 0x3a, 0x64, 0x90, 0xbf, 0xce, 0xe7, 0x91, 0x52, 0x91, 0x98,
0xe3, 0xc5, 0xd0, 0x22, 0x77, 0xf3, 0x45, 0x9d, 0xbe, 0x0a, 0x95, 0x56, 0x43, 0xdb, 0x28, 0xa6, 0x0f, 0x1c, 0x72, 0x2b, 0xdf, 0xd5, 0xc9, 0x79, 0xa4, 0xb4, 0x1a, 0xb8, 0x46, 0x31, 0x49, 0x53,
0x69, 0x2a, 0xd3, 0xb3, 0x8b, 0x0b, 0x25, 0xf4, 0x30, 0x18, 0xff, 0x69, 0xc3, 0x2e, 0xba, 0x90, 0x99, 0x9e, 0x9e, 0x9d, 0x29, 0xd4, 0x83, 0xf0, 0xe8, 0x6f, 0x17, 0x7a, 0x59, 0xce, 0xb5, 0x08,
0x2f, 0xa1, 0x57, 0x10, 0x27, 0x79, 0xa7, 0x8d, 0x4c, 0x91, 0x56, 0x46, 0xa3, 0x56, 0x9e, 0xcd, 0xc8, 0x31, 0xec, 0x16, 0x14, 0x4a, 0x86, 0xad, 0xbc, 0x6a, 0x09, 0x66, 0x78, 0xb7, 0x9d, 0x73,
0xd8, 0x64, 0x02, 0xfd, 0x92, 0x9b, 0x48, 0xcd, 0x71, 0x9b, 0xf6, 0x46, 0x0f, 0x5b, 0x6d, 0x75, 0x33, 0x62, 0x79, 0x9a, 0x23, 0x1a, 0x9a, 0x22, 0x77, 0x37, 0x48, 0xa5, 0xe2, 0xc0, 0xe1, 0x41,
0x94, 0x9c, 0xa8, 0x9a, 0x28, 0x4d, 0x86, 0x6b, 0xa2, 0x6c, 0x33, 0xdb, 0x33, 0xd8, 0x9b, 0xeb, 0xbb, 0x71, 0x03, 0x27, 0x8e, 0xdb, 0x70, 0x4a, 0xbe, 0x6b, 0xc3, 0xa9, 0x11, 0x1d, 0x83, 0x41,
0x54, 0xf0, 0x15, 0x79, 0xb8, 0xbd, 0x44, 0x35, 0xfa, 0x1f, 0xbd, 0xc9, 0x78, 0x6c, 0x3d, 0xb2, 0x45, 0xfe, 0x33, 0x9d, 0x22, 0x5f, 0x92, 0x83, 0x8d, 0xdd, 0xaa, 0xfd, 0x67, 0x18, 0xbe, 0xd1,
0x9e, 0x7c, 0xfc, 0xf7, 0x95, 0x67, 0xbd, 0xbe, 0xf2, 0xac, 0x7f, 0xaf, 0x3c, 0xeb, 0x8f, 0x6b, 0x7a, 0xe8, 0x3c, 0x74, 0x9e, 0x7c, 0xf4, 0xcf, 0xc5, 0xc8, 0x79, 0x7d, 0x31, 0x72, 0xfe, 0xbb,
0xaf, 0xf3, 0xfa, 0xda, 0xeb, 0xfc, 0x73, 0xed, 0x75, 0xbe, 0x1f, 0xdd, 0xfe, 0x97, 0xe1, 0xe5, 0x18, 0x39, 0x7f, 0x5e, 0x8e, 0x3a, 0xaf, 0x2f, 0x47, 0x9d, 0x7f, 0x2f, 0x47, 0x9d, 0x1f, 0x86,
0x1e, 0xfe, 0x7c, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x86, 0xe7, 0xfa, 0x57, 0x08, 0xd7, 0xff, 0xa4, 0x78, 0x79, 0xc3, 0xfe, 0x79, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b,
0x00, 0x00, 0xf0, 0x9f, 0x14, 0x77, 0x08, 0x00, 0x00,
} }
func (m *HeadSyncRange) Marshal() (dAtA []byte, err error) { 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 return len(dAtA) - i, nil
} }
func (m *PushSpaceRequest) Marshal() (dAtA []byte, err error) { func (m *SpacePushRequest) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size]) n, err := m.MarshalToSizedBuffer(dAtA[:size])
@ -1389,12 +1389,12 @@ func (m *PushSpaceRequest) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil return dAtA[:n], nil
} }
func (m *PushSpaceRequest) MarshalTo(dAtA []byte) (int, error) { func (m *SpacePushRequest) MarshalTo(dAtA []byte) (int, error) {
size := m.Size() size := m.Size()
return m.MarshalToSizedBuffer(dAtA[: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 := len(dAtA)
_ = i _ = i
var l int var l int
@ -1414,7 +1414,7 @@ func (m *PushSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *PushSpaceResponse) Marshal() (dAtA []byte, err error) { func (m *SpacePushResponse) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size]) n, err := m.MarshalToSizedBuffer(dAtA[:size])
@ -1424,12 +1424,12 @@ func (m *PushSpaceResponse) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil return dAtA[:n], nil
} }
func (m *PushSpaceResponse) MarshalTo(dAtA []byte) (int, error) { func (m *SpacePushResponse) MarshalTo(dAtA []byte) (int, error) {
size := m.Size() size := m.Size()
return m.MarshalToSizedBuffer(dAtA[: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 := len(dAtA)
_ = i _ = i
var l int var l int
@ -1437,7 +1437,7 @@ func (m *PushSpaceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *PullSpaceRequest) Marshal() (dAtA []byte, err error) { func (m *SpacePullRequest) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size]) n, err := m.MarshalToSizedBuffer(dAtA[:size])
@ -1447,12 +1447,12 @@ func (m *PullSpaceRequest) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil return dAtA[:n], nil
} }
func (m *PullSpaceRequest) MarshalTo(dAtA []byte) (int, error) { func (m *SpacePullRequest) MarshalTo(dAtA []byte) (int, error) {
size := m.Size() size := m.Size()
return m.MarshalToSizedBuffer(dAtA[: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 := len(dAtA)
_ = i _ = i
var l int var l int
@ -1467,7 +1467,7 @@ func (m *PullSpaceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *PullSpaceResponse) Marshal() (dAtA []byte, err error) { func (m *SpacePullResponse) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size]) n, err := m.MarshalToSizedBuffer(dAtA[:size])
@ -1477,12 +1477,12 @@ func (m *PullSpaceResponse) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil return dAtA[:n], nil
} }
func (m *PullSpaceResponse) MarshalTo(dAtA []byte) (int, error) { func (m *SpacePullResponse) MarshalTo(dAtA []byte) (int, error) {
size := m.Size() size := m.Size()
return m.MarshalToSizedBuffer(dAtA[: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 := len(dAtA)
_ = i _ = i
var l int var l int
@ -1984,7 +1984,7 @@ func (m *ObjectSyncMessage) Size() (n int) {
return n return n
} }
func (m *PushSpaceRequest) Size() (n int) { func (m *SpacePushRequest) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
} }
@ -1997,7 +1997,7 @@ func (m *PushSpaceRequest) Size() (n int) {
return n return n
} }
func (m *PushSpaceResponse) Size() (n int) { func (m *SpacePushResponse) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
} }
@ -2006,7 +2006,7 @@ func (m *PushSpaceResponse) Size() (n int) {
return n return n
} }
func (m *PullSpaceRequest) Size() (n int) { func (m *SpacePullRequest) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
} }
@ -2019,7 +2019,7 @@ func (m *PullSpaceRequest) Size() (n int) {
return n return n
} }
func (m *PullSpaceResponse) Size() (n int) { func (m *SpacePullResponse) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
} }
@ -2937,7 +2937,7 @@ func (m *ObjectSyncMessage) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error { func (m *SpacePushRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -2960,10 +2960,10 @@ func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3) fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7) wireType := int(wire & 0x7)
if wireType == 4 { 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 { 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 { switch fieldNum {
case 1: case 1:
@ -3023,7 +3023,7 @@ func (m *PushSpaceRequest) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error { func (m *SpacePushResponse) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -3046,10 +3046,10 @@ func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3) fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7) wireType := int(wire & 0x7)
if wireType == 4 { 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 { 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 { switch fieldNum {
default: default:
@ -3073,7 +3073,7 @@ func (m *PushSpaceResponse) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error { func (m *SpacePullRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -3096,10 +3096,10 @@ func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3) fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7) wireType := int(wire & 0x7)
if wireType == 4 { 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 { 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 { switch fieldNum {
case 1: case 1:
@ -3155,7 +3155,7 @@ func (m *PullSpaceRequest) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *PullSpaceResponse) Unmarshal(dAtA []byte) error { func (m *SpacePullResponse) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -3178,10 +3178,10 @@ func (m *PullSpaceResponse) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3) fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7) wireType := int(wire & 0x7)
if wireType == 4 { 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 { 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 { switch fieldNum {
case 1: case 1:

144
common/commonspace/spacesyncproto/spacesync_drpc.pb.go
View File

@ -37,76 +37,76 @@ func (drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto) JSONU
return jsonpb.Unmarshal(bytes.NewReader(buf), msg.(proto.Message)) return jsonpb.Unmarshal(bytes.NewReader(buf), msg.(proto.Message))
} }
type DRPCSpaceClient interface { type DRPCSpaceSyncClient interface {
DRPCConn() drpc.Conn DRPCConn() drpc.Conn
HeadSync(ctx context.Context, in *HeadSyncRequest) (*HeadSyncResponse, error) HeadSync(ctx context.Context, in *HeadSyncRequest) (*HeadSyncResponse, error)
PushSpace(ctx context.Context, in *PushSpaceRequest) (*PushSpaceResponse, error) SpacePush(ctx context.Context, in *SpacePushRequest) (*SpacePushResponse, error)
PullSpace(ctx context.Context, in *PullSpaceRequest) (*PullSpaceResponse, error) SpacePull(ctx context.Context, in *SpacePullRequest) (*SpacePullResponse, error)
Stream(ctx context.Context) (DRPCSpace_StreamClient, error) ObjectSyncStream(ctx context.Context) (DRPCSpaceSync_ObjectSyncStreamClient, error)
} }
type drpcSpaceClient struct { type drpcSpaceSyncClient struct {
cc drpc.Conn cc drpc.Conn
} }
func NewDRPCSpaceClient(cc drpc.Conn) DRPCSpaceClient { func NewDRPCSpaceSyncClient(cc drpc.Conn) DRPCSpaceSyncClient {
return &drpcSpaceClient{cc} 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) 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 { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *drpcSpaceClient) PushSpace(ctx context.Context, in *PushSpaceRequest) (*PushSpaceResponse, error) { func (c *drpcSpaceSyncClient) SpacePush(ctx context.Context, in *SpacePushRequest) (*SpacePushResponse, error) {
out := new(PushSpaceResponse) out := new(SpacePushResponse)
err := c.cc.Invoke(ctx, "/anySpace.Space/PushSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) err := c.cc.Invoke(ctx, "/spacesync.SpaceSync/SpacePush", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *drpcSpaceClient) PullSpace(ctx context.Context, in *PullSpaceRequest) (*PullSpaceResponse, error) { func (c *drpcSpaceSyncClient) SpacePull(ctx context.Context, in *SpacePullRequest) (*SpacePullResponse, error) {
out := new(PullSpaceResponse) out := new(SpacePullResponse)
err := c.cc.Invoke(ctx, "/anySpace.Space/PullSpace", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out) err := c.cc.Invoke(ctx, "/spacesync.SpaceSync/SpacePull", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}, in, out)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
func (c *drpcSpaceClient) Stream(ctx context.Context) (DRPCSpace_StreamClient, error) { func (c *drpcSpaceSyncClient) ObjectSyncStream(ctx context.Context) (DRPCSpaceSync_ObjectSyncStreamClient, error) {
stream, err := c.cc.NewStream(ctx, "/anySpace.Space/Stream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}) stream, err := c.cc.NewStream(ctx, "/spacesync.SpaceSync/ObjectSyncStream", drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{})
if err != nil { if err != nil {
return nil, err return nil, err
} }
x := &drpcSpace_StreamClient{stream} x := &drpcSpaceSync_ObjectSyncStreamClient{stream}
return x, nil return x, nil
} }
type DRPCSpace_StreamClient interface { type DRPCSpaceSync_ObjectSyncStreamClient interface {
drpc.Stream drpc.Stream
Send(*ObjectSyncMessage) error Send(*ObjectSyncMessage) error
Recv() (*ObjectSyncMessage, error) Recv() (*ObjectSyncMessage, error)
} }
type drpcSpace_StreamClient struct { type drpcSpaceSync_ObjectSyncStreamClient struct {
drpc.Stream 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{}) 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) m := new(ObjectSyncMessage)
if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil {
return nil, err return nil, err
@ -114,148 +114,148 @@ func (x *drpcSpace_StreamClient) Recv() (*ObjectSyncMessage, error) {
return m, nil 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{}) return x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{})
} }
type DRPCSpaceServer interface { type DRPCSpaceSyncServer interface {
HeadSync(context.Context, *HeadSyncRequest) (*HeadSyncResponse, error) HeadSync(context.Context, *HeadSyncRequest) (*HeadSyncResponse, error)
PushSpace(context.Context, *PushSpaceRequest) (*PushSpaceResponse, error) SpacePush(context.Context, *SpacePushRequest) (*SpacePushResponse, error)
PullSpace(context.Context, *PullSpaceRequest) (*PullSpaceResponse, error) SpacePull(context.Context, *SpacePullRequest) (*SpacePullResponse, error)
Stream(DRPCSpace_StreamStream) 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) 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) 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) 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) 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 { switch n {
case 0: 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) { func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
return srv.(DRPCSpaceServer). return srv.(DRPCSpaceSyncServer).
HeadSync( HeadSync(
ctx, ctx,
in1.(*HeadSyncRequest), in1.(*HeadSyncRequest),
) )
}, DRPCSpaceServer.HeadSync, true }, DRPCSpaceSyncServer.HeadSync, true
case 1: 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) { func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
return srv.(DRPCSpaceServer). return srv.(DRPCSpaceSyncServer).
PushSpace( SpacePush(
ctx, ctx,
in1.(*PushSpaceRequest), in1.(*SpacePushRequest),
) )
}, DRPCSpaceServer.PushSpace, true }, DRPCSpaceSyncServer.SpacePush, true
case 2: 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) { func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
return srv.(DRPCSpaceServer). return srv.(DRPCSpaceSyncServer).
PullSpace( SpacePull(
ctx, ctx,
in1.(*PullSpaceRequest), in1.(*SpacePullRequest),
) )
}, DRPCSpaceServer.PullSpace, true }, DRPCSpaceSyncServer.SpacePull, true
case 3: 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) { func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
return nil, srv.(DRPCSpaceServer). return nil, srv.(DRPCSpaceSyncServer).
Stream( ObjectSyncStream(
&drpcSpace_StreamStream{in1.(drpc.Stream)}, &drpcSpaceSync_ObjectSyncStreamStream{in1.(drpc.Stream)},
) )
}, DRPCSpaceServer.Stream, true }, DRPCSpaceSyncServer.ObjectSyncStream, true
default: default:
return "", nil, nil, nil, false return "", nil, nil, nil, false
} }
} }
func DRPCRegisterSpace(mux drpc.Mux, impl DRPCSpaceServer) error { func DRPCRegisterSpaceSync(mux drpc.Mux, impl DRPCSpaceSyncServer) error {
return mux.Register(impl, DRPCSpaceDescription{}) return mux.Register(impl, DRPCSpaceSyncDescription{})
} }
type DRPCSpace_HeadSyncStream interface { type DRPCSpaceSync_HeadSyncStream interface {
drpc.Stream drpc.Stream
SendAndClose(*HeadSyncResponse) error SendAndClose(*HeadSyncResponse) error
} }
type drpcSpace_HeadSyncStream struct { type drpcSpaceSync_HeadSyncStream struct {
drpc.Stream 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 { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil {
return err return err
} }
return x.CloseSend() return x.CloseSend()
} }
type DRPCSpace_PushSpaceStream interface { type DRPCSpaceSync_SpacePushStream interface {
drpc.Stream drpc.Stream
SendAndClose(*PushSpaceResponse) error SendAndClose(*SpacePushResponse) error
} }
type drpcSpace_PushSpaceStream struct { type drpcSpaceSync_SpacePushStream struct {
drpc.Stream 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 { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil {
return err return err
} }
return x.CloseSend() return x.CloseSend()
} }
type DRPCSpace_PullSpaceStream interface { type DRPCSpaceSync_SpacePullStream interface {
drpc.Stream drpc.Stream
SendAndClose(*PullSpaceResponse) error SendAndClose(*SpacePullResponse) error
} }
type drpcSpace_PullSpaceStream struct { type drpcSpaceSync_SpacePullStream struct {
drpc.Stream 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 { if err := x.MsgSend(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil {
return err return err
} }
return x.CloseSend() return x.CloseSend()
} }
type DRPCSpace_StreamStream interface { type DRPCSpaceSync_ObjectSyncStreamStream interface {
drpc.Stream drpc.Stream
Send(*ObjectSyncMessage) error Send(*ObjectSyncMessage) error
Recv() (*ObjectSyncMessage, error) Recv() (*ObjectSyncMessage, error)
} }
type drpcSpace_StreamStream struct { type drpcSpaceSync_ObjectSyncStreamStream struct {
drpc.Stream 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{}) 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) m := new(ObjectSyncMessage)
if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil { if err := x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{}); err != nil {
return nil, err return nil, err
@ -263,6 +263,6 @@ func (x *drpcSpace_StreamStream) Recv() (*ObjectSyncMessage, error) {
return m, nil 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{}) return x.MsgRecv(m, drpcEncoding_File_commonspace_spacesyncproto_protos_spacesync_proto{})
} }

10
node/nodespace/rpchandler.go
View File

@ -10,7 +10,7 @@ type rpcHandler struct {
s *service 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) sp, err := r.s.GetSpace(ctx, request.Id)
if err != nil { if err != nil {
if err != spacesyncproto.ErrSpaceMissing { if err != spacesyncproto.ErrSpaceMissing {
@ -25,7 +25,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull
return return
} }
resp = &spacesyncproto.PullSpaceResponse{ resp = &spacesyncproto.SpacePullResponse{
Payload: &spacesyncproto.SpacePayload{ Payload: &spacesyncproto.SpacePayload{
SpaceHeader: spaceDesc.SpaceHeader, SpaceHeader: spaceDesc.SpaceHeader,
AclPayloadId: spaceDesc.AclId, AclPayloadId: spaceDesc.AclId,
@ -37,7 +37,7 @@ func (r *rpcHandler) PullSpace(ctx context.Context, request *spacesyncproto.Pull
return 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{ description := commonspace.SpaceDescription{
SpaceHeader: req.Payload.SpaceHeader, SpaceHeader: req.Payload.SpaceHeader,
AclId: req.Payload.AclPayloadId, AclId: req.Payload.AclPayloadId,
@ -50,7 +50,7 @@ func (r *rpcHandler) PushSpace(ctx context.Context, req *spacesyncproto.PushSpac
if err != nil { if err != nil {
return return
} }
resp = &spacesyncproto.PushSpaceResponse{} resp = &spacesyncproto.SpacePushResponse{}
return return
} }
@ -62,7 +62,7 @@ func (r *rpcHandler) HeadSync(ctx context.Context, req *spacesyncproto.HeadSyncR
return sp.SpaceSyncRpc().HeadSync(ctx, req) 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() msg, err := stream.Recv()
if err != nil { if err != nil {
return err return err