From 0d514560a4d54d230104b8c50ea242a3dc6983b0 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 19 Apr 2023 22:52:06 +0200 Subject: [PATCH] Simplify request factory --- commonspace/object/tree/synctree/treeremotegetter.go | 3 +-- commonspace/object/tree/synctree/utils_test.go | 8 ++++---- commonspace/objectsync/objectsync.go | 2 +- commonspace/objectsync/requestfactory.go | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/commonspace/object/tree/synctree/treeremotegetter.go b/commonspace/object/tree/synctree/treeremotegetter.go index bcf547b0..3156373f 100644 --- a/commonspace/object/tree/synctree/treeremotegetter.go +++ b/commonspace/object/tree/synctree/treeremotegetter.go @@ -6,7 +6,6 @@ import ( "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" - "github.com/anytypeio/any-sync/commonspace/objectsync" "github.com/anytypeio/any-sync/commonspace/spacestorage" "github.com/anytypeio/any-sync/net/peer" "github.com/anytypeio/any-sync/net/rpc/rpcerr" @@ -47,7 +46,7 @@ func (t treeRemoteGetter) getPeers(ctx context.Context) (peerIds []string, err e } func (t treeRemoteGetter) treeRequest(ctx context.Context, peerId string) (msg *treechangeproto.TreeSyncMessage, err error) { - newTreeRequest := objectsync.GetRequestFactory().CreateNewTreeRequest() + newTreeRequest := t.deps.SyncClient.CreateNewTreeRequest() resp, err := t.deps.SyncClient.SendSync(ctx, peerId, t.treeId, newTreeRequest) if err != nil { return diff --git a/commonspace/object/tree/synctree/utils_test.go b/commonspace/object/tree/synctree/utils_test.go index 451f7536..1d844e90 100644 --- a/commonspace/object/tree/synctree/utils_test.go +++ b/commonspace/object/tree/synctree/utils_test.go @@ -94,7 +94,7 @@ type testSyncHandler struct { // createSyncHandler creates a sync handler when a tree is already created func createSyncHandler(peerId, spaceId string, objTree objecttree.ObjectTree, log *messageLog) *testSyncHandler { - factory := objectsync.GetRequestFactory() + factory := objectsync.NewRequestFactory() syncClient := objectsync.NewSyncClient(spaceId, newTestMessagePool(peerId, log), factory) netTree := &broadcastTree{ ObjectTree: objTree, @@ -106,7 +106,7 @@ func createSyncHandler(peerId, spaceId string, objTree objecttree.ObjectTree, lo // createEmptySyncHandler creates a sync handler when the tree will be provided later (this emulates the situation when we have no tree) func createEmptySyncHandler(peerId, spaceId string, aclList list.AclList, log *messageLog) *testSyncHandler { - factory := objectsync.GetRequestFactory() + factory := objectsync.NewRequestFactory() syncClient := objectsync.NewSyncClient(spaceId, newTestMessagePool(peerId, log), factory) batcher := mb.New[protocolMsg](0) @@ -138,7 +138,7 @@ func (h *testSyncHandler) HandleMessage(ctx context.Context, senderId string, re return } if unmarshalled.Content.GetFullSyncResponse() == nil { - newTreeRequest := objectsync.GetRequestFactory().CreateNewTreeRequest() + newTreeRequest := objectsync.NewRequestFactory().CreateNewTreeRequest() var objMsg *spacesyncproto.ObjectSyncMessage objMsg, err = objectsync.MarshallTreeMessage(newTreeRequest, request.SpaceId, request.ObjectId, "") if err != nil { @@ -165,7 +165,7 @@ func (h *testSyncHandler) HandleMessage(ctx context.Context, senderId string, re } h.SyncHandler = newSyncTreeHandler(request.SpaceId, netTree, h.syncClient, syncstatus.NewNoOpSyncStatus()) var objMsg *spacesyncproto.ObjectSyncMessage - newTreeRequest := objectsync.GetRequestFactory().CreateHeadUpdate(netTree, res.Added) + newTreeRequest := objectsync.NewRequestFactory().CreateHeadUpdate(netTree, res.Added) objMsg, err = objectsync.MarshallTreeMessage(newTreeRequest, request.SpaceId, request.ObjectId, "") if err != nil { return diff --git a/commonspace/objectsync/objectsync.go b/commonspace/objectsync/objectsync.go index 65311e14..0962e132 100644 --- a/commonspace/objectsync/objectsync.go +++ b/commonspace/objectsync/objectsync.go @@ -61,7 +61,7 @@ func NewObjectSync( configuration: configuration, } os.messagePool = newMessagePool(peerManager, os.handleMessage) - os.syncClient = NewSyncClient(spaceId, os.messagePool, GetRequestFactory()) + os.syncClient = NewSyncClient(spaceId, os.messagePool, NewRequestFactory()) return os } diff --git a/commonspace/objectsync/requestfactory.go b/commonspace/objectsync/requestfactory.go index 0608ad33..4d6a9124 100644 --- a/commonspace/objectsync/requestfactory.go +++ b/commonspace/objectsync/requestfactory.go @@ -14,10 +14,8 @@ type RequestFactory interface { CreateFullSyncResponse(t objecttree.ObjectTree, theirHeads, theirSnapshotPath []string) (*treechangeproto.TreeSyncMessage, error) } -var sharedFactory = &requestFactory{} - -func GetRequestFactory() RequestFactory { - return sharedFactory +func NewRequestFactory() RequestFactory { + return &requestFactory{} } type requestFactory struct{}