Change bootstrap, remove cycles

cmd/node/node.go

@@ -8,6 +8,7 @@ import (
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/app/logger"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/config"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/account"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/api"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/node"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/document"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/drpcserver"
@@ -77,12 +78,6 @@ func main() {
 	a.Register(conf)
 	a.Register(acc)
 	a.Register(nodes)
-	a.Register(document.New())
-	a.Register(drpcserver.New())
-	a.Register(message.New())
-	a.Register(requesthandler.New())
-	a.Register(transport.New())
-	a.Register(treecache.New())
 	Bootstrap(a)
 
 	// start app
@@ -110,5 +105,10 @@ func main() {
 
 func Bootstrap(a *app.App) {
 	a.Register(transport.New()).
-		Register(drpcserver.New())
+		Register(drpcserver.New()).
+		Register(document.New()).
+		Register(message.New()).
+		Register(requesthandler.New()).
+		Register(treecache.New()).
+		Register(api.New())
 }

go.mod

@@ -4,6 +4,7 @@ go 1.18
 
 require (
 	github.com/awalterschulze/gographviz v0.0.0-20190522210029-fa59802746ab
+	github.com/cheggaaa/mb v1.0.3
 	github.com/goccy/go-graphviz v0.0.9
 	github.com/gogo/protobuf v1.3.2
 	github.com/ipfs/go-cid v0.1.0
@@ -13,7 +14,6 @@ require (
 	github.com/multiformats/go-multibase v0.0.3
 	github.com/multiformats/go-multihash v0.1.0
 	github.com/stretchr/testify v1.7.0
-	github.com/cheggaaa/mb v1.0.3
 	go.uber.org/zap v1.21.0
 	gopkg.in/yaml.v3 v3.0.1
 	storj.io/drpc v0.0.32

go.sum

@@ -8,6 +8,8 @@ github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJ
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/cheggaaa/mb v1.0.3 h1:03ksWum+6kHclB+kjwKMaBtgl5gtNYUwNpxsHQciKe8=
+github.com/cheggaaa/mb v1.0.3/go.mod h1:NUl0GBtFLlfg2o6iZwxzcG7Lslc2wV/ADTFbLXtVPE4=
 github.com/corona10/goimagehash v1.0.2 h1:pUfB0LnsJASMPGEZLj7tGY251vF+qLGqOgEP4rUs6kA=
 github.com/corona10/goimagehash v1.0.2/go.mod h1:/l9umBhvcHQXVtQO1V6Gp1yD20STawkhRnnX0D1bvVI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

service/sync/requesthandler/requesthandler.go

@@ -8,7 +8,6 @@ import (
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/treestorage"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/treestorage/treepb"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/account"
-	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/message"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/syncpb"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/treecache"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice"
@@ -17,7 +16,7 @@ import (
 type requestHandler struct {
 	treeCache      treecache.Service
 	account        account.Service
-	messageService message.Service
+	messageService MessageSender
 }
 
 func New() app.Component {
@@ -28,12 +27,16 @@ type RequestHandler interface {
 	HandleFullSyncContent(ctx context.Context, senderId string, request *syncpb.SyncContent) (err error)
 }
 
+type MessageSender interface {
+	SendMessage(peerId string, msg *syncpb.SyncContent) error
+}
+
 const CName = "SyncRequestHandler"
 
 func (r *requestHandler) Init(ctx context.Context, a *app.App) (err error) {
 	r.treeCache = a.MustComponent(treecache.CName).(treecache.Service)
 	r.account = a.MustComponent(account.CName).(account.Service)
-	r.messageService = a.MustComponent(message.CName).(message.Service)
+	r.messageService = a.MustComponent("MessageService").(MessageSender)
 	return nil
 }