From 54b3726dc9183cbf2b517f71413a2559040ae5e0 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Mon, 8 Oct 2018 18:02:19 +0800
Subject: core: Remove round from gov.ProposeCRS (#183)

---
 core/test/governance.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'core/test/governance.go')

diff --git a/core/test/governance.go b/core/test/governance.go
index 31fe5f4..f013534 100644
--- a/core/test/governance.go
+++ b/core/test/governance.go
@@ -40,7 +40,7 @@ type Governance struct {
 	lambdaBA           time.Duration
 	lambdaDKG          time.Duration
 	privateKeys        map[types.NodeID]crypto.PrivateKey
-	crs                map[uint64]common.Hash
+	crs                []common.Hash
 	tsig               map[uint64]crypto.Signature
 	DKGComplaint       map[uint64][]*types.DKGComplaint
 	DKGMasterPublicKey map[uint64][]*types.DKGMasterPublicKey
@@ -58,7 +58,7 @@ func NewGovernance(nodeCount int, lambda time.Duration) (
 		lambdaBA:           lambda,
 		lambdaDKG:          lambda * 10,
 		privateKeys:        make(map[types.NodeID]crypto.PrivateKey),
-		crs:                map[uint64]common.Hash{0: hashCRS},
+		crs:                []common.Hash{hashCRS},
 		tsig:               make(map[uint64]crypto.Signature),
 		DKGComplaint:       make(map[uint64][]*types.DKGComplaint),
 		DKGMasterPublicKey: make(map[uint64][]*types.DKGMasterPublicKey),
@@ -107,14 +107,21 @@ func (g *Governance) Configuration(_ uint64) *types.Config {
 func (g *Governance) CRS(round uint64) common.Hash {
 	g.lock.RLock()
 	defer g.lock.RUnlock()
+	if round >= uint64(len(g.crs)) {
+		return common.Hash{}
+	}
 	return g.crs[round]
 }
 
 // ProposeCRS propose a CRS.
-func (g *Governance) ProposeCRS(round uint64, signedCRS []byte) {
+func (g *Governance) ProposeCRS(signedCRS []byte) {
 	g.lock.Lock()
 	defer g.lock.Unlock()
-	g.crs[round] = crypto.Keccak256Hash(signedCRS)
+	crs := crypto.Keccak256Hash(signedCRS)
+	if g.crs[len(g.crs)-1].Equal(crs) {
+		return
+	}
+	g.crs = append(g.crs, crs)
 }
 
 // PrivateKeys return the private key for that node, this function
-- 
cgit v1.2.3