diff options
author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:17 +0800 |
commit | dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d (patch) | |
tree | 2f186f3a17f5c0241b3e21a07101f18f76ca70f8 /dex/network.go | |
parent | f80216879307f6fa21b5937e3644e417226d9467 (diff) | |
download | go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.gz go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.zst go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.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) } |