From a6524c1ee79cd962a487dec7eb034bfbd90a81c0 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 26 Apr 2023 18:12:03 +0200 Subject: [PATCH] Remove error in broadcast --- commonspace/object/tree/synctree/synctree.go | 8 +++----- commonspace/object/tree/synctree/synctree_test.go | 6 +++--- .../objectsync/mock_objectsync/mock_objectsync.go | 6 ++---- commonspace/objectsync/syncclient.go | 10 +++++++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/commonspace/object/tree/synctree/synctree.go b/commonspace/object/tree/synctree/synctree.go index dc87a3c4..203d3cac 100644 --- a/commonspace/object/tree/synctree/synctree.go +++ b/commonspace/object/tree/synctree/synctree.go @@ -116,9 +116,7 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t Sy if isFirstBuild { headUpdate := syncTree.syncClient.CreateHeadUpdate(t, nil) // send to everybody, because everybody should know that the node or client got new tree - if e := syncTree.syncClient.Broadcast(ctx, headUpdate); e != nil { - log.ErrorCtx(ctx, "broadcast error", zap.Error(e)) - } + syncTree.syncClient.Broadcast(ctx, headUpdate) } return } @@ -155,7 +153,7 @@ func (s *syncTree) AddContent(ctx context.Context, content objecttree.SignableCh } s.syncStatus.HeadsChange(s.Id(), res.Heads) headUpdate := s.syncClient.CreateHeadUpdate(s, res.Added) - err = s.syncClient.Broadcast(ctx, headUpdate) + s.syncClient.Broadcast(ctx, headUpdate) return } @@ -182,7 +180,7 @@ func (s *syncTree) AddRawChanges(ctx context.Context, changesPayload objecttree. s.notifiable.UpdateHeads(s.Id(), res.Heads) } headUpdate := s.syncClient.CreateHeadUpdate(s, res.Added) - err = s.syncClient.Broadcast(ctx, headUpdate) + s.syncClient.Broadcast(ctx, headUpdate) } return } diff --git a/commonspace/object/tree/synctree/synctree_test.go b/commonspace/object/tree/synctree/synctree_test.go index cfd56a8d..8b4c87ef 100644 --- a/commonspace/object/tree/synctree/synctree_test.go +++ b/commonspace/object/tree/synctree/synctree_test.go @@ -73,7 +73,7 @@ func Test_BuildSyncTree(t *testing.T) { updateListenerMock.EXPECT().Update(tr) syncClientMock.EXPECT().CreateHeadUpdate(gomock.Eq(tr), gomock.Eq(changes)).Return(headUpdate) - syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)).Return(nil) + syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)) res, err := tr.AddRawChanges(ctx, payload) require.NoError(t, err) require.Equal(t, expectedRes, res) @@ -95,7 +95,7 @@ func Test_BuildSyncTree(t *testing.T) { updateListenerMock.EXPECT().Rebuild(tr) syncClientMock.EXPECT().CreateHeadUpdate(gomock.Eq(tr), gomock.Eq(changes)).Return(headUpdate) - syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)).Return(nil) + syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)) res, err := tr.AddRawChanges(ctx, payload) require.NoError(t, err) require.Equal(t, expectedRes, res) @@ -133,7 +133,7 @@ func Test_BuildSyncTree(t *testing.T) { Return(expectedRes, nil) syncClientMock.EXPECT().CreateHeadUpdate(gomock.Eq(tr), gomock.Eq(changes)).Return(headUpdate) - syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)).Return(nil) + syncClientMock.EXPECT().Broadcast(gomock.Any(), gomock.Eq(headUpdate)) res, err := tr.AddContent(ctx, content) require.NoError(t, err) require.Equal(t, expectedRes, res) diff --git a/commonspace/objectsync/mock_objectsync/mock_objectsync.go b/commonspace/objectsync/mock_objectsync/mock_objectsync.go index 29ea2717..cd9724ef 100644 --- a/commonspace/objectsync/mock_objectsync/mock_objectsync.go +++ b/commonspace/objectsync/mock_objectsync/mock_objectsync.go @@ -39,11 +39,9 @@ func (m *MockSyncClient) EXPECT() *MockSyncClientMockRecorder { } // Broadcast mocks base method. -func (m *MockSyncClient) Broadcast(arg0 context.Context, arg1 *treechangeproto.TreeSyncMessage) error { +func (m *MockSyncClient) Broadcast(arg0 context.Context, arg1 *treechangeproto.TreeSyncMessage) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Broadcast", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 + m.ctrl.Call(m, "Broadcast", arg0, arg1) } // Broadcast indicates an expected call of Broadcast. diff --git a/commonspace/objectsync/syncclient.go b/commonspace/objectsync/syncclient.go index e6fd515e..5ba1ab0c 100644 --- a/commonspace/objectsync/syncclient.go +++ b/commonspace/objectsync/syncclient.go @@ -4,11 +4,12 @@ import ( "context" "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/any-sync/commonspace/spacesyncproto" + "go.uber.org/zap" ) type SyncClient interface { RequestFactory - Broadcast(ctx context.Context, msg *treechangeproto.TreeSyncMessage) (err error) + Broadcast(ctx context.Context, msg *treechangeproto.TreeSyncMessage) SendWithReply(ctx context.Context, peerId, objectId string, msg *treechangeproto.TreeSyncMessage, replyId string) (err error) SendSync(ctx context.Context, peerId, objectId string, msg *treechangeproto.TreeSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) MessagePool() MessagePool @@ -31,12 +32,15 @@ func NewSyncClient( } } -func (s *syncClient) Broadcast(ctx context.Context, msg *treechangeproto.TreeSyncMessage) (err error) { +func (s *syncClient) Broadcast(ctx context.Context, msg *treechangeproto.TreeSyncMessage) { objMsg, err := MarshallTreeMessage(msg, s.spaceId, msg.RootChange.Id, "") if err != nil { return } - return s.messagePool.Broadcast(ctx, objMsg) + err = s.messagePool.Broadcast(ctx, objMsg) + if err != nil { + log.DebugCtx(ctx, "broadcast error", zap.Error(err)) + } } func (s *syncClient) SendSync(ctx context.Context, peerId, objectId string, msg *treechangeproto.TreeSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) {