aboutsummaryrefslogtreecommitdiffstats
path: root/dex
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-10-29 09:31:36 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 13:49:55 +0800
commit624c4a952de8f4406ade329e620650c809fa88d6 (patch)
tree690c48d4e7b8a836705590745c991deae052cbdb /dex
parent787a5cbf7d73a002e94d3773a2cba4a64f8149db (diff)
downloaddexon-624c4a952de8f4406ade329e620650c809fa88d6.tar
dexon-624c4a952de8f4406ade329e620650c809fa88d6.tar.gz
dexon-624c4a952de8f4406ade329e620650c809fa88d6.tar.bz2
dexon-624c4a952de8f4406ade329e620650c809fa88d6.tar.lz
dexon-624c4a952de8f4406ade329e620650c809fa88d6.tar.xz
dexon-624c4a952de8f4406ade329e620650c809fa88d6.tar.zst
dexon-624c4a952de8f4406ade329e620650c809fa88d6.zip
vendor: sync consensus core and fix conflict
Diffstat (limited to 'dex')
-rw-r--r--dex/network.go5
1 files changed, 5 insertions, 0 deletions
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)