diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-29 09:31:36 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | e350f522e42081e266779d1d6c8d255a120002c4 (patch) | |
| tree | b3ca788a3d0173a718f4ed67468800e4d6d19afc /dex | |
| parent | 84d04454db640bc730445be3ec536d4100ae6ec1 (diff) | |
| download | dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar.gz dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar.bz2 dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar.lz dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar.xz dexon-e350f522e42081e266779d1d6c8d255a120002c4.tar.zst dexon-e350f522e42081e266779d1d6c8d255a120002c4.zip | |
vendor: sync consensus core and fix conflict
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/network.go | 5 |
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) |