diff options
author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:52 +0800 |
commit | 2d1ed5288cab621aba39c3a81aae7042ead14fd5 (patch) | |
tree | 3312352700814c6e97305b84a58672ee1f059e66 /dex/network.go | |
parent | f5fa30b21ea123d66cf5fdaf527f546ef5a2f46b (diff) | |
download | dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.gz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.bz2 dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.lz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.xz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.zst dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.zip |
vendor: sync consensus core and fix conflict
Diffstat (limited to 'dex/network.go')
-rw-r--r-- | dex/network.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dex/network.go b/dex/network.go index e99b4f5b1..0d45973ec 100644 --- a/dex/network.go +++ b/dex/network.go @@ -3,6 +3,7 @@ package dex import ( "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" ) type DexconNetwork struct { @@ -25,20 +26,20 @@ func (n *DexconNetwork) BroadcastBlock(block *types.Block) { // SendDKGPrivateShare sends PrivateShare to a DKG participant. func (n *DexconNetwork) SendDKGPrivateShare( - pub crypto.PublicKey, prvShare *types.DKGPrivateShare) { + pub crypto.PublicKey, prvShare *dkgTypes.PrivateShare) { n.pm.SendDKGPrivateShare(pub, prvShare) } // BroadcastDKGPrivateShare broadcasts PrivateShare to all DKG participants. func (n *DexconNetwork) BroadcastDKGPrivateShare( - prvShare *types.DKGPrivateShare) { + prvShare *dkgTypes.PrivateShare) { n.pm.BroadcastDKGPrivateShare(prvShare) } // BroadcastDKGPartialSignature broadcasts partialSignature to all // DKG participants. func (n *DexconNetwork) BroadcastDKGPartialSignature( - psig *types.DKGPartialSignature) { + psig *dkgTypes.PartialSignature) { n.pm.BroadcastDKGPartialSignature(psig) } |