From a9f3bdf4abb6c20fb4be31edc01f11dfcc846075 Mon Sep 17 00:00:00 2001 From: Ori Newman Date: Wed, 29 Jul 2020 10:17:13 +0300 Subject: [PATCH] [NOD-1203] Create netadapter outside of protocol manager (#830) --- kaspad.go | 2 +- protocol/manager.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/kaspad.go b/kaspad.go index 649e8579c..821701d60 100644 --- a/kaspad.go +++ b/kaspad.go @@ -129,7 +129,7 @@ func newKaspad(cfg *config.Config, databaseContext *dbaccess.DatabaseContext, in return nil, err } - protocolManager, err := protocol.NewManager(cfg, dag, addressManager, txMempool, connectionManager) + protocolManager, err := protocol.NewManager(cfg, dag, netAdapter, addressManager, txMempool, connectionManager) if err != nil { return nil, err } diff --git a/protocol/manager.go b/protocol/manager.go index 347bb64c3..d0c1d53b0 100644 --- a/protocol/manager.go +++ b/protocol/manager.go @@ -20,15 +20,10 @@ type Manager struct { } // NewManager creates a new instance of the p2p protocol manager -func NewManager(cfg *config.Config, dag *blockdag.BlockDAG, +func NewManager(cfg *config.Config, dag *blockdag.BlockDAG, netAdapter *netadapter.NetAdapter, addressManager *addressmanager.AddressManager, txPool *mempool.TxPool, connectionManager *connmanager.ConnectionManager) (*Manager, error) { - netAdapter, err := netadapter.NewNetAdapter(cfg) - if err != nil { - return nil, err - } - manager := Manager{ context: flowcontext.New(cfg, dag, addressManager, txPool, netAdapter, connectionManager), }