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 13:49:55 +0800 |
commit | 986fccb29575a2fd91c6cd5de4d63244d35afd44 (patch) | |
tree | 36e803782359a4eafea99d500b6be3f4eec93891 /dex/network.go | |
parent | 54475de2eab21d798d39b372efb8e9381f32fbc2 (diff) | |
download | dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar.gz dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar.bz2 dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar.lz dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar.xz dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.tar.zst dexon-986fccb29575a2fd91c6cd5de4d63244d35afd44.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) } |