From e83bcc1097d49b46b79131e546f1270b9192cc05 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Wed, 27 Feb 2019 10:41:01 +0800
Subject: core: sync to latest core (#214)

* vendor: sync to latest core
* fix for single chain
---
 dex/handler.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'dex/handler.go')

diff --git a/dex/handler.go b/dex/handler.go
index 474852913..4ffa01244 100644
--- a/dex/handler.go
+++ b/dex/handler.go
@@ -1005,9 +1005,8 @@ func (pm *ProtocolManager) BroadcastVote(vote *coreTypes.Vote) {
 		pm.cache.addVote(vote)
 	}
 	label := peerLabel{
-		set:     notaryset,
-		chainID: vote.Position.ChainID,
-		round:   vote.Position.Round,
+		set:   notaryset,
+		round: vote.Position.Round,
 	}
 	for _, peer := range pm.peers.PeersWithLabel(label) {
 		peer.AsyncSendVotes([]*coreTypes.Vote{vote})
@@ -1038,9 +1037,8 @@ func (pm *ProtocolManager) BroadcastRandomnessResult(
 	pm.cache.addRandomness(randomness)
 	// send to notary nodes first (direct)
 	label := peerLabel{
-		set:     notaryset,
-		chainID: randomness.Position.ChainID,
-		round:   randomness.Position.Round,
+		set:   notaryset,
+		round: randomness.Position.Round,
 	}
 	randomnesses := []*coreTypes.BlockRandomnessResult{randomness}
 	for _, peer := range pm.peers.PeersWithLabel(label) {
@@ -1104,9 +1102,8 @@ func (pm *ProtocolManager) BroadcastPullBlocks(
 func (pm *ProtocolManager) BroadcastPullVotes(
 	pos coreTypes.Position) {
 	label := peerLabel{
-		set:     notaryset,
-		chainID: pos.ChainID,
-		round:   pos.Round,
+		set:   notaryset,
+		round: pos.Round,
 	}
 	for idx, peer := range pm.peers.PeersWithLabel(label) {
 		if idx >= maxPullVotePeers {
-- 
cgit v1.2.3