From: HAOYUatHZ <haoyu@protonmail.com>
Date: Thu, 29 Aug 2019 07:26:44 +0000 (+0800)
Subject: ix
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=54b337debab5d1ea6ede3cbadbd2ae1e54e517cf

ix
---

diff --git a/docs/precog/config_example.json b/docs/precog/config_example.json
index c8b276b8..8a5f2ece 100644
--- a/docs/precog/config_example.json
+++ b/docs/precog/config_example.json
@@ -16,25 +16,21 @@
     "check_frequency_minutes" : 30,
     "seeds" : [
         {
-            "alias" : "seed1",
             "xpub" : "f2767279cd01ed8793808e0542a18958e1a2f3a6b6fe5328ec79596a022bc6f085951a98a631917563f86bb91db9159dd2969ff9d690fc12b250baff2b6f6a1d",
             "ip": "47.103.79.68",
             "port": 56656
         },
         {
-            "alias" : "seed2",
             "xpub" : "c785deb76af14e918ea05eeab863288c48b16d1816621adf74ada868e8e3246780bf5206dc5a0e3efef0c119978e11ed75eca9d3b50846e37c55cf8d56717c4f",
             "ip": "47.103.13.86",
             "port": 56656
         },
         {
-            "alias" : "seed3",
             "xpub" : "22bc19ec65d4ee524c5130575ddff041e712dbb415740eae314fd3359aa3978319384cd3ded8c4125ca2774716d7285268ebf1d85091eef8e7ad03077857e7ab",
             "ip": "47.102.193.119",
             "port": 56656
         },
         {
-            "alias" : "seed4",
             "xpub" : "214c0e6827346e9fee1056c4c8b96cefd67b75ed1dead59e4e4e3eee8c1fe095dbe7a7fb61bb23b4ab66cde2a1c04466b8d3e8efa21cf7eee064c70fb1525b14",
             "ip": "47.103.17.22",
             "port": 56656
diff --git a/toolbar/precog/config/config.go b/toolbar/precog/config/config.go
index 16facd6b..289f1681 100644
--- a/toolbar/precog/config/config.go
+++ b/toolbar/precog/config/config.go
@@ -48,7 +48,6 @@ type Policy struct {
 }
 
 type Node struct {
-	Alias     string        `json:"alias"`
 	XPub      *chainkd.XPub `json:"xpub"`
 	PublicKey string        `json:"public_key"`
 	IP        string        `json:"ip"`
diff --git a/toolbar/precog/monitor/discover.go b/toolbar/precog/monitor/discover.go
index f855818b..4209ce65 100644
--- a/toolbar/precog/monitor/discover.go
+++ b/toolbar/precog/monitor/discover.go
@@ -28,12 +28,12 @@ func (m *monitor) discoveryRoutine() {
 
 			log.WithFields(log.Fields{"new node": node}).Info("discover")
 
-			if err := m.upSertNode(&config.Node{
+			if err := m.upsertNode(&config.Node{
 				PublicKey: node.ID.String(),
 				IP:        node.IP.String(),
 				Port:      node.TCP,
 			}); err != nil {
-				log.WithFields(log.Fields{"node": node, "err": err}).Error("upSertNode")
+				log.WithFields(log.Fields{"node": node, "err": err}).Error("upsertNode")
 			} else {
 				m.discvMap[node.ID.String()] = node
 			}
diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 92ea48c0..42e5be82 100644
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -95,8 +95,8 @@ func (m *monitor) Run() {
 	var seeds []string
 	for _, node := range m.cfg.Nodes {
 		seeds = append(seeds, fmt.Sprintf("%s:%d", node.IP, node.Port))
-		if err := m.upSertNode(&node); err != nil {
-			log.WithFields(log.Fields{"node": node, "err": err}).Error("upSertNode")
+		if err := m.upsertNode(&node); err != nil {
+			log.WithFields(log.Fields{"node": node, "err": err}).Error("upsertNode")
 		}
 	}
 	m.nodeCfg.P2P.Seeds = strings.Join(seeds, ",")
diff --git a/toolbar/precog/monitor/stats.go b/toolbar/precog/monitor/stats.go
index 3fdfcf93..0264d644 100644
--- a/toolbar/precog/monitor/stats.go
+++ b/toolbar/precog/monitor/stats.go
@@ -17,7 +17,7 @@ import (
 )
 
 // create or update: https://github.com/jinzhu/gorm/issues/1307
-func (m *monitor) upSertNode(node *config.Node) error {
+func (m *monitor) upsertNode(node *config.Node) error {
 	if node.XPub != nil {
 		node.PublicKey = fmt.Sprintf("%v", node.XPub.PublicKey().String())
 	}
@@ -27,9 +27,6 @@ func (m *monitor) upSertNode(node *config.Node) error {
 		return err
 	}
 
-	if node.Alias != "" {
-		ormNode.Alias = node.Alias
-	}
 	if node.XPub != nil {
 		ormNode.Xpub = node.XPub.String()
 	}
@@ -37,10 +34,9 @@ func (m *monitor) upSertNode(node *config.Node) error {
 	ormNode.Port = node.Port
 	return m.db.Where(&orm.Node{PublicKey: ormNode.PublicKey}).
 		Assign(&orm.Node{
-			Xpub:  ormNode.Xpub,
-			Alias: ormNode.Alias,
-			IP:    ormNode.IP,
-			Port:  ormNode.Port,
+			Xpub: ormNode.Xpub,
+			IP:   ormNode.IP,
+			Port: ormNode.Port,
 		}).FirstOrCreate(ormNode).Error
 }