fixes from review

This commit is contained in:
Ethan Buchman
2018-06-28 19:06:37 -04:00
parent 3a96f8ffd1
commit e8946e9b36
8 changed files with 62 additions and 35 deletions
+1 -1
View File
@@ -106,6 +106,7 @@ func (msg MsgSend) Tags() sdk.Tags {
// Handle MsgSend.
// NOTE: msg.From, msg.To, and msg.Amount were already validated
// in ValidateBasic().
func handleMsgSend(key *sdk.KVStoreKey) sdk.Handler {
return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
sendMsg, ok := msg.(MsgSend)
@@ -115,7 +116,6 @@ func handleMsgSend(key *sdk.KVStoreKey) sdk.Handler {
return sdk.NewError(2, 1, "Send Message is malformed").Result()
}
// Load the store.
store := ctx.KVStore(key)
+6 -7
View File
@@ -1,9 +1,9 @@
package app
import (
"bytes"
"encoding/json"
"fmt"
"reflect"
"github.com/tendermint/go-crypto"
cmn "github.com/tendermint/tmlibs/common"
@@ -76,9 +76,9 @@ type CoinMetadata struct {
// if he is the issuer in Coin Metadata
// Implements sdk.Msg Interface
type MsgIssue struct {
Issuer sdk.Address
Issuer sdk.Address
Receiver sdk.Address
Coin sdk.Coin
Coin sdk.Coin
}
// Implements Msg.
@@ -179,7 +179,7 @@ func handleMetaData(store sdk.KVStore, issuer sdk.Address, coin sdk.Coin) sdk.Re
}
// Msg Issuer is not authorized to issue these coins
if !reflect.DeepEqual(metadata.Issuer, issuer) {
if !bytes.Equal(metadata.Issuer, issuer) {
return sdk.ErrUnauthorized(fmt.Sprintf("Msg Issuer cannot issue tokens: %s", coin.Denom)).Result()
}
@@ -198,11 +198,10 @@ func handleMetaData(store sdk.KVStore, issuer sdk.Address, coin sdk.Coin) sdk.Re
// Update store with new metadata
store.Set([]byte(coin.Denom), val)
return sdk.Result{}
}
//------------------------------------------------------------------
// Tx
@@ -246,7 +245,7 @@ func antehandler(ctx sdk.Context, tx sdk.Tx) (_ sdk.Context, _ sdk.Result, abort
sig := appTx.GetSignatures()[i]
// check that submitted pubkey belongs to required address
if !reflect.DeepEqual(sig.PubKey.Address(), addr) {
if !bytes.Equal(sig.PubKey.Address(), addr) {
return ctx, sdk.ErrUnauthorized("Provided Pubkey does not match required address").Result(), true
}
+4 -4
View File
@@ -1,8 +1,8 @@
package app
import (
"bytes"
"encoding/json"
"reflect"
"fmt"
cmn "github.com/tendermint/tmlibs/common"
@@ -94,13 +94,13 @@ func betterHandleMsgIssue(metadataMapper MetaDataMapper, accountKeeper bank.Keep
if res := betterHandleMetaData(ctx, metadataMapper, issueMsg.Issuer, issueMsg.Coin); !res.IsOK() {
return res
}
// Add newly issued coins to output address
_, _, err := accountKeeper.AddCoins(ctx, issueMsg.Receiver, []sdk.Coin{issueMsg.Coin})
if err != nil {
return err.Result()
}
return sdk.Result{
// Return result with Issue msg tags
Tags: issueMsg.Tags(),
@@ -117,7 +117,7 @@ func betterHandleMetaData(ctx sdk.Context, metadataMapper MetaDataMapper, issuer
}
// Msg Issuer is not authorized to issue these coins
if !reflect.DeepEqual(metadata.Issuer, issuer) {
if !bytes.Equal(metadata.Issuer, issuer) {
return sdk.ErrUnauthorized(fmt.Sprintf("Msg Issuer cannot issue tokens: %s", coin.Denom)).Result()
}
+2 -1
View File
@@ -1,6 +1,7 @@
package app
import (
"bytes"
"encoding/json"
"fmt"
"reflect"
@@ -172,7 +173,7 @@ func evenBetterHandleMetaData(ctx sdk.Context, metadataMapper MetaDataMapper, is
}
// Msg Issuer not authorized to issue these coins
if !reflect.DeepEqual(metadata.Issuer, issuer) {
if !bytes.Equal(metadata.Issuer, issuer) {
return sdk.ErrUnauthorized(fmt.Sprintf("Msg Issuer cannot issue tokens: %s", coin.Denom)).Result()
}