core: run DKG and CRS at background. (#155)

3 files changed, 9 insertions, 7 deletions

diff --git a/core/types/dkg.go b/core/types/dkg.go
index 7738783..df9d8e3 100644
--- a/core/types/dkg.go
+++ b/core/types/dkg.go
@@ -73,6 +73,7 @@ type DKGPartialSignatureType uint32
 const (
 	TSigConfigurationBlock DKGPartialSignatureType = iota
 	TSigNotaryAck
+	TSigCRS
 )
 
 // DKGPartialSignature describe a partial signature in DKG protocol.
diff --git a/core/types/nodeset.go b/core/types/nodeset.go
index 6b78cab..83c64a7 100644
--- a/core/types/nodeset.go
+++ b/core/types/nodeset.go
@@ -22,6 +22,7 @@ import (
 	"encoding/binary"
 	"math/big"
 
+	"github.com/dexon-foundation/dexon-consensus-core/common"
 	"github.com/dexon-foundation/dexon-consensus-core/core/crypto"
 )
 
@@ -71,27 +72,27 @@ func NewNodeSet() *NodeSet {
 }
 
 // NewNotarySetTarget is the target for getting Notary Set.
-func NewNotarySetTarget(crs []byte, shardID, chainID uint32) SubSetTarget {
+func NewNotarySetTarget(crs common.Hash, chainID uint32) SubSetTarget {
 	binaryChainID := make([]byte, 4)
 	binary.LittleEndian.PutUint32(binaryChainID, chainID)
 
-	return newTarget(targetNotarySet, crs, binaryChainID)
+	return newTarget(targetNotarySet, crs[:], binaryChainID)
 }
 
 // NewWitnessSetTarget  is the target for getting DKG Set.
-func NewWitnessSetTarget(crs []byte, round uint64) SubSetTarget {
+func NewWitnessSetTarget(crs common.Hash, round uint64) SubSetTarget {
 	binaryRound := make([]byte, 8)
 	binary.LittleEndian.PutUint64(binaryRound, round)
 
-	return newTarget(targetWitnessSet, crs, binaryRound)
+	return newTarget(targetWitnessSet, crs[:], binaryRound)
 }
 
 // NewDKGSetTarget  is the target for getting DKG Set.
-func NewDKGSetTarget(crs []byte, round uint64) SubSetTarget {
+func NewDKGSetTarget(crs common.Hash, round uint64) SubSetTarget {
 	binaryRound := make([]byte, 8)
 	binary.LittleEndian.PutUint64(binaryRound, round)
 
-	return newTarget(targetDKGSet, crs, binaryRound)
+	return newTarget(targetDKGSet, crs[:], binaryRound)
 }
 
 // Add a NodeID to the set.
diff --git a/core/types/nodeset_test.go b/core/types/nodeset_test.go
index 021a0a4..d6f55c2 100644
--- a/core/types/nodeset_test.go
+++ b/core/types/nodeset_test.go
@@ -35,7 +35,7 @@ func (s *NodeSetTestSuite) TestGetSubSet() {
 	for len(nodes.IDs) < total {
 		nodes.IDs[NodeID{common.NewRandomHash()}] = struct{}{}
 	}
-	target := NewNotarySetTarget(crs[:], 0, 0)
+	target := NewNotarySetTarget(crs, 0)
 	ranks := make(map[NodeID]*nodeRank, len(nodes.IDs))
 	for nID := range nodes.IDs {
 		ranks[nID] = newNodeRank(nID, target)