From 677559bf6c13556e2087d7ba26a4b7659bf37ddd Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Wed, 9 May 2018 18:24:51 -0400
Subject: [PATCH] cwgoes comments

---
 client/context/helpers.go |  2 +-
 store/iavlstore.go        |  4 ++--
 store/iavlstore_test.go   |  6 +++---
 store/types.go            |  2 +-
 types/store.go            |  5 ++---
 x/stake/msg.go            | 10 +++++++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/client/context/helpers.go b/client/context/helpers.go
index 5baf4742e..c3dc0a4ab 100644
--- a/client/context/helpers.go
+++ b/client/context/helpers.go
@@ -47,7 +47,7 @@ func (ctx CoreContext) Query(key cmn.HexBytes, storeName string) (res []byte, er
 }
 
 // Query from Tendermint with the provided storename and subspace
-func (ctx CoreContext) QuerySubspace(cdc *wire.Codec, subspace []byte, storeName string) (res []sdk.KV, err error) {
+func (ctx CoreContext) QuerySubspace(cdc *wire.Codec, subspace []byte, storeName string) (res []sdk.KVPair, err error) {
 	resRaw, err := ctx.query(subspace, storeName, "subspace")
 	if err != nil {
 		return res, err
diff --git a/store/iavlstore.go b/store/iavlstore.go
index 6109d967f..5399b3d5c 100644
--- a/store/iavlstore.go
+++ b/store/iavlstore.go
@@ -179,10 +179,10 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 	case "/subspace":
 		subspace := req.Data
 		res.Key = subspace
-		var KVs []KV
+		var KVs []KVPair
 		iterator := st.SubspaceIterator(subspace)
 		for ; iterator.Valid(); iterator.Next() {
-			KVs = append(KVs, KV{iterator.Key(), iterator.Value()})
+			KVs = append(KVs, KVPair{iterator.Key(), iterator.Value()})
 		}
 		iterator.Close()
 		res.Value = cdc.MustMarshalBinary(KVs)
diff --git a/store/iavlstore_test.go b/store/iavlstore_test.go
index bbccd8ef0..32bc1ebe0 100644
--- a/store/iavlstore_test.go
+++ b/store/iavlstore_test.go
@@ -268,12 +268,12 @@ func TestIAVLStoreQuery(t *testing.T) {
 	v3 := []byte("val3")
 
 	ksub := []byte("key")
-	KVs0 := []KV{}
-	KVs1 := []KV{
+	KVs0 := []KVPair{}
+	KVs1 := []KVPair{
 		{k1, v1},
 		{k2, v2},
 	}
-	KVs2 := []KV{
+	KVs2 := []KVPair{
 		{k1, v3},
 		{k2, v2},
 	}
diff --git a/store/types.go b/store/types.go
index fc355a1b3..e232e6ec7 100644
--- a/store/types.go
+++ b/store/types.go
@@ -13,7 +13,7 @@ type MultiStore = types.MultiStore
 type CacheMultiStore = types.CacheMultiStore
 type CommitMultiStore = types.CommitMultiStore
 type KVStore = types.KVStore
-type KV = types.KV
+type KVPair = types.KVPair
 type Iterator = types.Iterator
 type CacheKVStore = types.CacheKVStore
 type CommitKVStore = types.CommitKVStore
diff --git a/types/store.go b/types/store.go
index 858f0e93c..f8367a126 100644
--- a/types/store.go
+++ b/types/store.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	abci "github.com/tendermint/abci/types"
+	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
 )
 
@@ -260,6 +261,4 @@ func PrefixEndBytes(prefix []byte) []byte {
 //----------------------------------------
 
 // key-value result for iterator queries
-type KV struct {
-	Key, Value []byte
-}
+type KVPair cmn.KVPair
diff --git a/x/stake/msg.go b/x/stake/msg.go
index 8367058c2..4e322e640 100644
--- a/x/stake/msg.go
+++ b/x/stake/msg.go
@@ -20,6 +20,12 @@ const StakingToken = "steak"
 //Verify interface at compile time
 var _, _, _, _ sdk.Msg = &MsgDeclareCandidacy{}, &MsgEditCandidacy{}, &MsgDelegate{}, &MsgUnbond{}
 
+var msgCdc = wire.NewCodec()
+
+func init() {
+	wire.RegisterCrypto(msgCdc)
+}
+
 //______________________________________________________________________
 
 // MsgDeclareCandidacy - struct for unbonding transactions
@@ -46,9 +52,7 @@ func (msg MsgDeclareCandidacy) GetSigners() []sdk.Address { return []sdk.Address
 
 // get the bytes for the message signer to sign on
 func (msg MsgDeclareCandidacy) GetSignBytes() []byte {
-	cdc := wire.NewCodec()
-	wire.RegisterCrypto(cdc)
-	return cdc.MustMarshalBinary(msg)
+	return msgCdc.MustMarshalBinary(msg)
 }
 
 // quick validity check