Fixed route bug

internal/app/sidecar.go

@@ -32,8 +32,9 @@ type App struct {
 	cancel     context.CancelFunc
 	config     *repo.Config
 	logger     logrus.FieldLogger
-	manger     internal.Launcher
-	apiServer  *api.Server
+
+	manger    internal.Launcher
+	apiServer *api.Server
 }
 
 // NewSidecar instantiates sidecar instance.
@@ -62,7 +63,7 @@ func NewSidecar(repoRoot string, config *repo.Config) (internal.Launcher, error)
 	tool.Asset(err)
 	clientPort := appchain.NewPorts(clients, cryptor, logger)
 	r.Adds(clientPort)
-	mg, err := manger.NewManager(addr.String(), r, pm, appchainMgr, loggers.Logger(loggers.Manger))
+	mg, err := manger.NewManager(addr.String(), pm, appchainMgr, loggers.Logger(loggers.Manger))
 	tool.Asset(err)
 	apiServer := api.NewServer(config, pm, loggers.Logger(loggers.ApiServer))
 	ctx, cancel := context.WithCancel(context.Background())

internal/manger/manager.go

@@ -2,11 +2,10 @@ package manger
 
 import (
 	"encoding/json"
-	"github.com/link33/sidecar/internal/port"
-	"github.com/link33/sidecar/internal/router"
-	"github.com/link33/sidecar/model/pb"
 
 	"github.com/link33/sidecar/internal/peermgr"
+	"github.com/link33/sidecar/internal/port"
+	"github.com/link33/sidecar/model/pb"
 	appchainmgr "github.com/meshplus/bitxhub-core/appchain-mgr"
 	"github.com/sirupsen/logrus"
 )
@@ -15,7 +14,7 @@ type Manager struct {
 	logger      logrus.FieldLogger
 	appchainMgr appchainmgr.AppchainMgr
 	pm          peermgr.PeerManager
-	router      router.Router
+	//router      router.Router
 }
 
 func (mgr *Manager) Start() error {
@@ -26,11 +25,10 @@ func (mgr *Manager) Stop() error {
 	return mgr.pm.Stop()
 }
 
-func NewManager(addr string, router router.Router, pm peermgr.PeerManager, Mgr appchainmgr.AppchainMgr, logger logrus.FieldLogger) (*Manager, error) {
+func NewManager(addr string, pm peermgr.PeerManager, Mgr appchainmgr.AppchainMgr, logger logrus.FieldLogger) (*Manager, error) {
 	am := &Manager{
 		appchainMgr: Mgr,
 		logger:      logger,
-		router:      router,
 		pm:          pm,
 	}
 

internal/peermgr/swarm.go

@@ -99,6 +99,10 @@ func (swarm *Swarm) add(p port.Port) {
 }
 
 func (swarm *Swarm) Start() error {
+	err := swarm.router.Start()
+	if err != nil {
+		return err
+	}
 	l := &local{
 		id:      swarm.id,
 		privKey: swarm.privKey,
@@ -245,6 +249,10 @@ func (swarm *Swarm) Stop() error {
 		return err
 	}
 	swarm.cancel()
+	err := swarm.router.Stop()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

internal/router/router.go

@@ -26,10 +26,11 @@ type routeMethod func([]string) []port.Port
 func NewRouter(logger logrus.FieldLogger) Router {
 	ctx, cancel := context.WithCancel(context.Background())
 	return &router{
-		logger:  logger,
-		ctx:     ctx,
-		cancel:  cancel,
-		portMap: port.NewPortMap(),
+		logger:    logger,
+		ctx:       ctx,
+		cancel:    cancel,
+		portMap:   port.NewPortMap(),
+		methodMap: map[string]routeMethod{},
 	}
 }