vendor: sync consensus core and fix conflic

1 files changed, 21 insertions, 0 deletions

diff --git a/dex/network.go b/dex/network.go
index cb22340f3..58d6fd855 100644
--- a/dex/network.go
+++ b/dex/network.go
@@ -1,3 +1,20 @@
+// Copyright 2018 The dexon-consensus-core Authors
+// This file is part of the dexon-consensus-core library.
+//
+// The dexon-consensus-core library is free software: you can redistribute it
+// and/or modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the License,
+// or (at your option) any later version.
+//
+// The dexon-consensus-core library is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+// General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the dexon-consensus-core library. If not, see
+// <http://www.gnu.org/licenses/>.
+
 package dex
 
 import (
@@ -19,6 +36,10 @@ func NewDexconNetwork(pm *ProtocolManager) *DexconNetwork {
 func (n *DexconNetwork) PullBlocks(hashes coreCommon.Hashes) {
 }
 
+// PullVotes tries to pull votes from the DEXON network.
+func (n *DexconNetwork) PullVotes(pos types.Position) {
+}
+
 // BroadcastVote broadcasts vote to all nodes in DEXON network.
 func (n *DexconNetwork) BroadcastVote(vote *types.Vote) {
 	n.pm.BroadcastVote(vote)