From 9ad0e05b15f8b36f38f19cc1b24dc8b93e845844 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Thu, 21 Mar 2019 08:37:33 +0800 Subject: core/vm: remove round from addDKG functions (#279) * vendor: sync to latest core * core/vm: remove addDKG functions * core: fix conflict --- dex/downloader/testchain_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dex/downloader') diff --git a/dex/downloader/testchain_test.go b/dex/downloader/testchain_test.go index 15528c509..b59a83b2c 100644 --- a/dex/downloader/testchain_test.go +++ b/dex/downloader/testchain_test.go @@ -192,7 +192,7 @@ func (tc *testChain) generate(n int, seed byte, parent *types.Block, nodes *dexc // Add DKG MasterPublicKeys for _, node := range testNodes.Nodes(round + 1) { - data, err := vm.PackAddDKGMasterPublicKey(round+1, node.MasterPublicKey(round+1)) + data, err := vm.PackAddDKGMasterPublicKey(node.MasterPublicKey(round + 1)) if err != nil { panic(err) } @@ -201,7 +201,7 @@ func (tc *testChain) generate(n int, seed byte, parent *types.Block, nodes *dexc case half + 2: // Add DKG MPKReady for _, node := range testNodes.Nodes(round + 1) { - data, err := vm.PackAddDKGMPKReady(round+1, node.DKGMPKReady(round+1)) + data, err := vm.PackAddDKGMPKReady(node.DKGMPKReady(round + 1)) if err != nil { panic(err) } @@ -210,7 +210,7 @@ func (tc *testChain) generate(n int, seed byte, parent *types.Block, nodes *dexc case half + 3: // Add DKG Finalize for _, node := range testNodes.Nodes(round + 1) { - data, err := vm.PackAddDKGFinalize(round+1, node.DKGFinalize(round+1)) + data, err := vm.PackAddDKGFinalize(node.DKGFinalize(round + 1)) if err != nil { panic(err) } -- cgit v1.2.3