aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-10-20 14:49:03 +0800
committerWei-Ning Huang <w@dexon.org>2018-12-19 20:54:27 +0800
commit84fc06a2ae7485f70797406cac70fbd3f5cdd01e (patch)
tree6d543992d34019f945193cfebeee056d6af5488c
parentc6af0d882e16d756ab79d6717e86f7153357e401 (diff)
downloaddexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar.gz
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar.bz2
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar.lz
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar.xz
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.tar.zst
dexon-84fc06a2ae7485f70797406cac70fbd3f5cdd01e.zip
dex: fix DKGMasterPublicKey and DKGComplaints unmarshal
-rw-r--r--dex/governance.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/dex/governance.go b/dex/governance.go
index 50ab7ee14..17f7f0751 100644
--- a/dex/governance.go
+++ b/dex/governance.go
@@ -20,7 +20,6 @@ import (
"github.com/dexon-foundation/dexon/crypto"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/params"
- "github.com/dexon-foundation/dexon/rlp"
"github.com/dexon-foundation/dexon/rpc"
)
@@ -226,7 +225,7 @@ func (d *DexconGovernance) DKGComplaints(round uint64) []*coreTypes.DKGComplaint
var dkgComplaints []*coreTypes.DKGComplaint
for _, pk := range s.DKGComplaints(big.NewInt(int64(round))) {
x := new(coreTypes.DKGComplaint)
- if err := rlp.DecodeBytes(pk, x); err != nil {
+ if err := json.Unmarshal(pk, x); err != nil {
panic(err)
}
dkgComplaints = append(dkgComplaints, x)
@@ -263,7 +262,7 @@ func (d *DexconGovernance) DKGMasterPublicKeys(round uint64) []*coreTypes.DKGMas
var dkgMasterPKs []*coreTypes.DKGMasterPublicKey
for _, pk := range s.DKGMasterPublicKeys(big.NewInt(int64(round))) {
x := new(coreTypes.DKGMasterPublicKey)
- if err := rlp.DecodeBytes(pk, x); err != nil {
+ if err := json.Unmarshal(pk, x); err != nil {
panic(err)
}
dkgMasterPKs = append(dkgMasterPKs, x)