network: stop p2p server before peer updates executor

pasl-project · Feb 18, 2020 · b712012 · b712012
1 parent 2808446
commit b712012
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 29 deletions.
diff --git a/main.go b/main.go
@@ -255,9 +255,9 @@ func run(cliContext *cli.Context) error {
 		nonce := utils.Serialize(key.Public)
 
 		peers := network.NewPeersList()
-		peerUpdates := make(chan pasl.PeerInfo)
+		peerUpdates := make(chan network.PeerInfo)
 		return pasl.WithManager(nonce, blockchain, p2pPort, peers, peerUpdates, blockchain.BlocksUpdates, blockchain.TxPoolUpdates, defaults.TimeoutRequest, func(manager *pasl.Manager) error {
-			return network.WithNode(config, peers, manager.OnNewConnection, func(node network.Node) error {
+			return network.WithNode(config, peers, peerUpdates, manager.OnNewConnection, func(node network.Node) error {
 				cancel := make(chan os.Signal, 2)
 				coreRPC := api.NewApi(blockchain)
 				RPCBindAddress := fmt.Sprintf("%s:%d", cliContext.GlobalString(rpcIPFlag.GetName()), defaults.RPCPort)
@@ -311,20 +311,6 @@ func run(cliContext *cli.Context) error {
 							})
 						})
 					}()
-
-					updatesListener := concurrent.NewUnboundedExecutor()
-					updatesListener.Go(func(ctx context.Context) {
-						for {
-							select {
-							case peer := <-peerUpdates:
-								//utils.Ftracef(cliContext.App.Writer, "   %s:%d last seen %s ago", peer.Host, peer.Port, time.Since(time.Unix(int64(peer.LastConnect), 0)))
-								node.AddPeer(fmt.Sprintf("tcp://%s:%d", peer.Host, peer.Port))
-							case <-ctx.Done():
-								return
-							}
-						}
-					})
-					defer updatesListener.StopAndWaitForever()
 				}
 
 				RPCHandlers := coreRPC.GetHandlers()

diff --git a/network/network.go b/network/network.go
@@ -64,7 +64,13 @@ type Connection struct {
 	OnStateUpdated func()
 }
 
-func WithNode(config Config, peers *PeersList, onNewConnection func(context.Context, *Connection) error, fn func(node Node) error) error {
+type PeerInfo struct {
+	Host        string
+	Port        uint16
+	LastConnect uint32
+}
+
+func WithNode(config Config, peers *PeersList, peerUpdates <-chan PeerInfo, onNewConnection func(context.Context, *Connection) error, fn func(node Node) error) error {
 	node := Node{
 		config: config,
 		peers:  peers,

diff --git a/network/pasl/connection.go b/network/pasl/connection.go
@@ -47,7 +47,7 @@ type PascalConnection struct {
 	peers          *network.PeersList
 	nonce          []byte
 	remoteNonce    []byte
-	peerUpdates    chan<- PeerInfo
+	peerUpdates    chan<- network.PeerInfo
 	onStateUpdate  chan<- eventConnectionState
 	onNewBlock     chan *eventNewBlock
 	onNewOperation chan<- *eventNewOperation

diff --git a/network/pasl/manager.go b/network/pasl/manager.go
@@ -77,7 +77,7 @@ type Manager struct {
 	onSyncState            chan syncState
 	p2pPort                uint16
 	peers                  *network.PeersList
-	peerUpdates            chan<- PeerInfo
+	peerUpdates            chan<- network.PeerInfo
 	prevSyncState          syncState
 	timeoutRequest         time.Duration
 	txPoolUpdates          <-chan tx.CommonOperation
@@ -89,7 +89,7 @@ func WithManager(
 	blockchain *blockchain.Blockchain,
 	p2pPort uint16,
 	peers *network.PeersList,
-	peerUpdates chan<- PeerInfo,
+	peerUpdates chan<- network.PeerInfo,
 	blocksUpdates <-chan safebox.SerializedBlock,
 	txPoolUpdates <-chan tx.CommonOperation,
 	timeoutRequest time.Duration,

diff --git a/network/pasl/packet_hello.go b/network/pasl/packet_hello.go
@@ -29,23 +29,17 @@ import (
 	"github.com/pasl-project/pasl/utils"
 )
 
-type PeerInfo struct {
-	Host        string
-	Port        uint16
-	LastConnect uint32
-}
-
 type packetHello struct {
 	NodePort  uint16
 	Nonce     []byte
 	Time      uint32
 	Block     safebox.SerializedBlockHeader
-	Peers     []PeerInfo
+	Peers     []network.PeerInfo
 	UserAgent string
 }
 
 func generateHello(nodePort uint16, nonce []byte, pendingBlock safebox.SerializedBlockHeader, peers map[string]network.Peer, userAgent string) []byte {
-	whitePeers := make([]PeerInfo, 0, len(peers))
+	whitePeers := make([]network.PeerInfo, 0, len(peers))
 	for address := range peers {
 		parsed, err := url.Parse(address)
 		if err != nil {
@@ -55,7 +49,7 @@ func generateHello(nodePort uint16, nonce []byte, pendingBlock safebox.Serialize
 		if err != nil {
 			continue
 		}
-		whitePeers = append(whitePeers, PeerInfo{
+		whitePeers = append(whitePeers, network.PeerInfo{
 			Host:        parsed.Hostname(),
 			Port:        uint16(port),
 			LastConnect: peers[address].LastConnectTimestamp,