From 37cfa35454942715f5ff54695a43a5e12e35fc97 Mon Sep 17 00:00:00 2001
From: Sean Young <sean.young@monax.io>
Date: Fri, 1 Jun 2018 08:29:50 +0100
Subject: [PATCH] More review comments
Signed-off-by: Sean Young <sean.young@monax.io>
---
account/account_test.go | 2 +-
config/config.go | 8 ++++----
crypto/crypto.go | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/account/account_test.go b/account/account_test.go
index ecc8a023..ca3e41fd 100644
--- a/account/account_test.go
+++ b/account/account_test.go
@@ -118,7 +118,7 @@ func TestMarshalJSON(t *testing.T) {
acc := concreteAcc.Account()
bs, err := json.Marshal(acc)
- expected := fmt.Sprintf(`{"Address":"%s","PublicKey":{"type":"ed25519","data":"%s"},`+
+ expected := fmt.Sprintf(`{"Address":"%s","PublicKey":{"CurveType":"ed25519","PublicKey":"%s"},`+
`"Sequence":0,"Balance":0,"Code":"3C172D","StorageRoot":"",`+
`"Permissions":{"Base":{"Perms":0,"SetBit":0},"Roles":[]}}`,
concreteAcc.Address, concreteAcc.PublicKey)
diff --git a/config/config.go b/config/config.go
index 24896f06..1a73e9fa 100644
--- a/config/config.go
+++ b/config/config.go
@@ -56,15 +56,15 @@ func (conf *BurrowConfig) Kernel(ctx context.Context) (*core.Kernel, error) {
return nil, fmt.Errorf("could not generate logger from logging config: %v", err)
}
var keyClient keys.KeyClient
- var keyStore *keys.KeyStore
+ var keyStore keys.KeyStore
if conf.Keys.RemoteAddress != "" {
keyClient, err = keys.NewRemoteKeyClient(conf.Keys.RemoteAddress, logger)
if err != nil {
return nil, err
}
} else {
- *keyStore = keys.NewKeyStore(conf.Keys.KeysDirectory)
- keyClient = keys.NewLocalKeyClient(*keyStore, logger)
+ keyStore = keys.NewKeyStore(conf.Keys.KeysDirectory)
+ keyClient = keys.NewLocalKeyClient(keyStore, logger)
}
val, err := keys.Addressable(keyClient, *conf.ValidatorAddress)
@@ -82,7 +82,7 @@ func (conf *BurrowConfig) Kernel(ctx context.Context) (*core.Kernel, error) {
}
return core.NewKernel(ctx, keyClient, privValidator, conf.GenesisDoc, conf.Tendermint.TendermintConfig(), conf.RPC, conf.Keys,
- keyStore, exeOptions, logger)
+ &keyStore, exeOptions, logger)
}
func (conf *BurrowConfig) JSONString() string {
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 400345fc..da0e85dd 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -82,14 +82,14 @@ type PrivateKey struct {
}
type PublicKeyJSON struct {
- Type string `json:"type"`
- Data string `json:"data"`
+ CurveType string
+ PublicKey string
}
func (p PublicKey) MarshalJSON() ([]byte, error) {
jStruct := PublicKeyJSON{
- Type: p.CurveType.String(),
- Data: hex.EncodeUpperToString(p.PublicKey),
+ CurveType: p.CurveType.String(),
+ PublicKey: hex.EncodeUpperToString(p.PublicKey),
}
txt, err := json.Marshal(jStruct)
return txt, err
@@ -105,11 +105,11 @@ func (p *PublicKey) UnmarshalJSON(text []byte) error {
if err != nil {
return err
}
- CurveType, err := CurveTypeFromString(jStruct.Type)
+ CurveType, err := CurveTypeFromString(jStruct.CurveType)
if err != nil {
return err
}
- bs, err := hex.DecodeString(jStruct.Data)
+ bs, err := hex.DecodeString(jStruct.PublicKey)
if err != nil {
return err
}
--
GitLab