From e350f522e42081e266779d1d6c8d255a120002c4 Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@dexon.org>
Date: Mon, 29 Oct 2018 09:31:36 +0800
Subject: vendor: sync consensus core and fix conflict
---
dex/network.go | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'dex')
diff --git a/dex/network.go b/dex/network.go
index 0d45973ec..cb22340f3 100644
--- a/dex/network.go
+++ b/dex/network.go
@@ -1,6 +1,7 @@
package dex
import (
+ coreCommon "github.com/dexon-foundation/dexon-consensus-core/common"
"github.com/dexon-foundation/dexon-consensus-core/core/crypto"
"github.com/dexon-foundation/dexon-consensus-core/core/types"
dkgTypes "github.com/dexon-foundation/dexon-consensus-core/core/types/dkg"
@@ -14,6 +15,10 @@ func NewDexconNetwork(pm *ProtocolManager) *DexconNetwork {
return &DexconNetwork{pm: pm}
}
+// PullBlocks tries to pull blocks from the DEXON network.
+func (n *DexconNetwork) PullBlocks(hashes coreCommon.Hashes) {
+}
+
// BroadcastVote broadcasts vote to all nodes in DEXON network.
func (n *DexconNetwork) BroadcastVote(vote *types.Vote) {
n.pm.BroadcastVote(vote)
--
cgit v1.2.3