From e205d3e8dbc0e6e8878dd184afcfee931260a11f Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@cobinhood.com>
Date: Sat, 13 Oct 2018 13:53:42 +0800
Subject: dex: pass p2p nodeKey to Dexon instance

---
 dex/governance.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'dex/governance.go')

diff --git a/dex/governance.go b/dex/governance.go
index d2cfe05c6..8993152df 100644
--- a/dex/governance.go
+++ b/dex/governance.go
@@ -2,12 +2,13 @@ package dex
 
 import (
 	"context"
+	"crypto/ecdsa"
 	"math/big"
 	"time"
 
 	coreCommon "github.com/dexon-foundation/dexon-consensus-core/common"
 	coreCrypto "github.com/dexon-foundation/dexon-consensus-core/core/crypto"
-	"github.com/dexon-foundation/dexon-consensus-core/core/crypto/ecdsa"
+	coreEcdsa "github.com/dexon-foundation/dexon-consensus-core/core/crypto/ecdsa"
 	coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types"
 	"github.com/dexon-foundation/dexon/core/vm"
 	"github.com/dexon-foundation/dexon/rlp"
@@ -15,14 +16,16 @@ import (
 )
 
 type DexconGovernance struct {
-	b *DexAPIBackend
+	b          *DexAPIBackend
+	privateKey *ecdsa.PrivateKey
 }
 
 // NewDexconGovernance retruns a governance implementation of the DEXON
 // consensus governance interface.
-func NewDexconGovernance(backend *DexAPIBackend) *DexconGovernance {
+func NewDexconGovernance(backend *DexAPIBackend, privKey *ecdsa.PrivateKey) *DexconGovernance {
 	return &DexconGovernance{
-		b: backend,
+		b:          backend,
+		privateKey: privKey,
 	}
 }
 
@@ -95,11 +98,15 @@ func (d *DexconGovernance) NodeSet(round uint64) []coreCrypto.PublicKey {
 	var pks []coreCrypto.PublicKey
 
 	for _, n := range s.Nodes() {
-		pks = append(pks, ecdsa.NewPublicKeyFromByteSlice(n.PublicKey))
+		pks = append(pks, coreEcdsa.NewPublicKeyFromByteSlice(n.PublicKey))
 	}
 	return pks
 }
 
+// NotifyRoundHeight register the mapping between round and height.
+func (d *DexconGovernance) NotifyRoundHeight(targetRound, consensusHeight uint64) {
+}
+
 // AddDKGComplaint adds a DKGComplaint.
 func (d *DexconGovernance) AddDKGComplaint(round uint64, complaint *coreTypes.DKGComplaint) {
 }
-- 
cgit