From b550351c9c99f48466fe7d431e0c9f2347453e6e Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Fri, 30 Aug 2019 14:34:41 +0800
Subject: [PATCH] clean up

---
 toolbar/precog/monitor/discover.go |  6 ++++--
 toolbar/precog/monitor/monitor.go  | 17 +++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/toolbar/precog/monitor/discover.go b/toolbar/precog/monitor/discover.go
index 4209ce65..e7cc8b32 100644
--- a/toolbar/precog/monitor/discover.go
+++ b/toolbar/precog/monitor/discover.go
@@ -15,6 +15,8 @@ var (
 )
 
 func (m *monitor) discoveryRoutine() {
+	// discvMap maps a node's public key to the node itself
+	discvMap := make(map[string]*dht.Node)
 	ticker := time.NewTicker(time.Duration(discvFreqSec) * time.Second)
 	for range ticker.C {
 		m.Lock()
@@ -22,7 +24,7 @@ func (m *monitor) discoveryRoutine() {
 		nodes := make([]*dht.Node, nodesToDiscv)
 		num := m.sw.GetDiscv().ReadRandomNodes(nodes)
 		for _, node := range nodes[:num] {
-			if n, ok := m.discvMap[node.ID.String()]; ok && n.String() == node.String() {
+			if n, ok := discvMap[node.ID.String()]; ok && n.String() == node.String() {
 				continue
 			}
 
@@ -35,7 +37,7 @@ func (m *monitor) discoveryRoutine() {
 			}); err != nil {
 				log.WithFields(log.Fields{"node": node, "err": err}).Error("upsertNode")
 			} else {
-				m.discvMap[node.ID.String()] = node
+				discvMap[node.ID.String()] = node
 			}
 		}
 
diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 3cb075cf..7d455a46 100644
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -36,15 +36,13 @@ import (
 
 type monitor struct {
 	*sync.RWMutex
-	cfg     *config.Config
-	db      *gorm.DB
-	nodeCfg *vaporCfg.Config
-	sw      *p2p.Switch
-	privKey chainkd.XPrv
-	chain   *mock.Chain
-	txPool  *mock.Mempool
-	// discvMap maps a node's public key to the node itself
-	discvMap       map[string]*dht.Node
+	cfg            *config.Config
+	db             *gorm.DB
+	nodeCfg        *vaporCfg.Config
+	sw             *p2p.Switch
+	privKey        chainkd.XPrv
+	chain          *mock.Chain
+	txPool         *mock.Mempool
 	bestHeightSeen uint64
 	peers          *peers.PeerSet
 }
@@ -80,7 +78,6 @@ func NewMonitor(cfg *config.Config, db *gorm.DB) *monitor {
 		privKey:        privKey.(chainkd.XPrv),
 		chain:          chain,
 		txPool:         txPool,
-		discvMap:       make(map[string]*dht.Node),
 		bestHeightSeen: uint64(0),
 	}
 }
-- 
2.11.0