From 718df194febe17e29f59980123c8696c4daae7c4 Mon Sep 17 00:00:00 2001
From: mcrakhman <rakhmanov.m@gmail.com>
Date: Tue, 2 Aug 2022 17:36:37 +0200
Subject: [PATCH] Add component registration on start

---
 cmd/node/node.go                              | 32 ++++++++++++++-----
 service/sync/document/service.go              |  2 +-
 service/sync/message/service.go               |  2 +-
 service/sync/requesthandler/requesthandler.go |  2 +-
 service/treecache/service.go                  |  2 +-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/cmd/node/node.go b/cmd/node/node.go
index 618aceb6..a911ada6 100644
--- a/cmd/node/node.go
+++ b/cmd/node/node.go
@@ -8,7 +8,11 @@ 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/node"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/document"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/drpcserver"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/message"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/requesthandler"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/transport"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/treecache"
 	"go.uber.org/zap"
@@ -23,10 +27,10 @@ import (
 var log = logger.NewNamed("main")
 
 var (
-	flagConfigFile  = flag.String("c", "etc/config.yml", "path to config file")
-	flagAccountFile = flag.String("a", "etc/account.yaml", "path to account file")
-	flagVersion     = flag.Bool("v", false, "show version and exit")
-	flagHelp        = flag.Bool("h", false, "show help and exit")
+	flagConfigFile = flag.String("c", "etc/config.yml", "path to config file")
+	flagNodesFile  = flag.String("a", "etc/nodes.yml", "path to account file")
+	flagVersion    = flag.Bool("v", false, "show version and exit")
+	flagHelp       = flag.Bool("h", false, "show help and exit")
 )
 
 func main() {
@@ -57,16 +61,28 @@ func main() {
 		log.Fatal("can't open config file", zap.Error(err))
 	}
 
-	// open account file with node's keys
-	acc, err := account.NewFromFile(*flagAccountFile)
+	// open nodes file with node's keys
+	acc, err := account.NewFromFile(*flagNodesFile)
 	if err != nil {
-		log.Fatal("can't open account file", zap.Error(err))
+		log.Fatal("can't open nodes file", zap.Error(err))
+	}
+
+	// open nodes file with data related to other nodes
+	nodes, err := node.NewFromFile(*flagNodesFile)
+	if err != nil {
+		log.Fatal("can't open nodes file", zap.Error(err))
 	}
 
 	// bootstrap components
 	a.Register(conf)
 	a.Register(acc)
-	a.Register(treecache.NewTreeCache())
+	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
diff --git a/service/sync/document/service.go b/service/sync/document/service.go
index 7b8e8f08..24843a25 100644
--- a/service/sync/document/service.go
+++ b/service/sync/document/service.go
@@ -27,7 +27,7 @@ type Service interface {
 	CreateDocument(ctx context.Context, text string) (string, error)
 }
 
-func NewService() app.Component {
+func New() app.Component {
 	return &service{}
 }
 
diff --git a/service/sync/message/service.go b/service/sync/message/service.go
index 7a51ce23..57dc0d79 100644
--- a/service/sync/message/service.go
+++ b/service/sync/message/service.go
@@ -28,7 +28,7 @@ type message struct {
 	content *syncpb.SyncContent
 }
 
-func NewMessageService() app.Component {
+func New() app.Component {
 	return &service{}
 }
 
diff --git a/service/sync/requesthandler/requesthandler.go b/service/sync/requesthandler/requesthandler.go
index 83269ee5..2b4635ec 100644
--- a/service/sync/requesthandler/requesthandler.go
+++ b/service/sync/requesthandler/requesthandler.go
@@ -20,7 +20,7 @@ type requestHandler struct {
 	messageService message.Service
 }
 
-func NewRequestHandler() app.Component {
+func New() app.Component {
 	return &requestHandler{}
 }
 
diff --git a/service/treecache/service.go b/service/treecache/service.go
index d832e40c..85e370fe 100644
--- a/service/treecache/service.go
+++ b/service/treecache/service.go
@@ -28,7 +28,7 @@ type service struct {
 	cache        ocache.OCache
 }
 
-func NewTreeCache() app.ComponentRunnable {
+func New() app.ComponentRunnable {
 	return &service{}
 }