From: muscle_boy <shenao.78@163.com>
Date: Sat, 1 Jun 2019 08:13:42 +0000 (+0800)
Subject: 临时排坑 (#111)
X-Git-Tag: v1.0.5~208^2~83
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=4ec54a2924dcfde48f4b6e5904d017f2ef4bd920

临时排坑 (#111)
---

diff --git a/netsync/peers/peer.go b/netsync/peers/peer.go
index ee5068a0..0f62149e 100644
--- a/netsync/peers/peer.go
+++ b/netsync/peers/peer.go
@@ -254,7 +254,7 @@ func (p *Peer) markSign(signature []byte) {
 	for p.knownSignatures.Size() >= maxKnownSignatures {
 		p.knownSignatures.Pop()
 	}
-	p.knownSignatures.Add(signature)
+	p.knownSignatures.Add(hex.EncodeToString(signature))
 }
 
 func (p *Peer) markTransaction(hash *bc.Hash) {
@@ -286,7 +286,7 @@ func (ps *PeerSet) PeersWithoutSign(signature []byte) []string {
 
 	var peers []string
 	for _, peer := range ps.peers {
-		if !peer.knownSignatures.Has(signature) {
+		if !peer.knownSignatures.Has(hex.EncodeToString(signature)) {
 			peers = append(peers, peer.ID())
 		}
 	}
diff --git a/p2p/switch.go b/p2p/switch.go
index a0e00503..cfae5120 100644
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -2,6 +2,7 @@ package p2p
 
 import (
 	"encoding/binary"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -9,7 +10,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/tendermint/go-crypto"
+	crypto "github.com/tendermint/go-crypto"
 	cmn "github.com/tendermint/tmlibs/common"
 
 	cfg "github.com/vapor/config"
@@ -99,7 +100,13 @@ func NewSwitch(config *cfg.Config) (*Switch, error) {
 
 	blacklistDB := dbm.NewDB("trusthistory", config.DBBackend, config.DBDir())
 
-	bytes := config.PrivateKey()[:]
+	_, yyy, _ := ed25519.GenerateKey(nil)
+	zzz := yyy.String()
+
+	bytes, err := hex.DecodeString(zzz)
+	if err != nil {
+		return nil, err
+	}
 	var newKey [64]byte
 	copy(newKey[:], bytes)
 	privKey := crypto.PrivKeyEd25519(newKey)