From 8412215c167cfb606260ae206871ed7b757fdab2 Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Mon, 2 Apr 2018 14:13:13 +0200 Subject: [PATCH] Additional module cleanup --- x/bank/commands/sendtx.go | 5 +---- x/ibc/commands/ibctx.go | 4 +--- x/simplestake/commands/commands.go | 5 ++--- x/stake/commands/tx.go | 12 ++++-------- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/x/bank/commands/sendtx.go b/x/bank/commands/sendtx.go index a543ce829c..ee4625eac2 100644 --- a/x/bank/commands/sendtx.go +++ b/x/bank/commands/sendtx.go @@ -61,14 +61,11 @@ func (c Commander) sendTxCmd(cmd *cobra.Command, args []string) error { } to := sdk.Address(bz) - // get account name - name := viper.GetString(client.FlagName) - // build message msg := BuildMsg(from, to, coins) // build and sign the transaction, then broadcast to Tendermint - res, err := ctx.SignBuildBroadcast(name, msg, c.Cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, c.Cdc) if err != nil { return err } diff --git a/x/ibc/commands/ibctx.go b/x/ibc/commands/ibctx.go index c760292ad4..689a983181 100644 --- a/x/ibc/commands/ibctx.go +++ b/x/ibc/commands/ibctx.go @@ -54,9 +54,7 @@ func (c sendCommander) sendIBCTransfer(cmd *cobra.Command, args []string) error } // get password - name := viper.GetString(client.FlagName) - - res, err := ctx.SignBuildBroadcast(name, msg, c.cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, c.cdc) if err != nil { return err } diff --git a/x/simplestake/commands/commands.go b/x/simplestake/commands/commands.go index f23da4bd85..ce89801d88 100644 --- a/x/simplestake/commands/commands.go +++ b/x/simplestake/commands/commands.go @@ -9,7 +9,6 @@ import ( crypto "github.com/tendermint/go-crypto" - "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" @@ -95,8 +94,8 @@ func (co commander) unbondTxCmd(cmd *cobra.Command, args []string) error { } func (co commander) sendMsg(msg sdk.Msg) error { - name := viper.GetString(client.FlagName) - res, err := context.NewCoreContextFromViper().SignBuildBroadcast(name, msg, co.cdc) + ctx := context.NewCoreContextFromViper() + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, co.cdc) if err != nil { return err } diff --git a/x/stake/commands/tx.go b/x/stake/commands/tx.go index dbc4dfdf35..d1dec6dce9 100644 --- a/x/stake/commands/tx.go +++ b/x/stake/commands/tx.go @@ -92,9 +92,8 @@ func GetCmdDeclareCandidacy(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgDeclareCandidacy(candidateAddr, pk, amount, description) // build and sign the transaction, then broadcast to Tendermint - name := viper.GetString(client.FlagName) ctx := context.NewCoreContextFromViper() - res, err := ctx.SignBuildBroadcast(name, msg, cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, cdc) if err != nil { return err } @@ -130,9 +129,8 @@ func GetCmdEditCandidacy(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgEditCandidacy(candidateAddr, description) // build and sign the transaction, then broadcast to Tendermint - name := viper.GetString(client.FlagName) ctx := context.NewCoreContextFromViper() - res, err := ctx.SignBuildBroadcast(name, msg, cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, cdc) if err != nil { return err } @@ -167,9 +165,8 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgDelegate(delegatorAddr, candidateAddr, amount) // build and sign the transaction, then broadcast to Tendermint - name := viper.GetString(client.FlagName) ctx := context.NewCoreContextFromViper() - res, err := ctx.SignBuildBroadcast(name, msg, cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, cdc) if err != nil { return err } @@ -215,9 +212,8 @@ func GetCmdUnbond(cdc *wire.Codec) *cobra.Command { msg := stake.NewMsgUnbond(delegatorAddr, candidateAddr, sharesStr) // build and sign the transaction, then broadcast to Tendermint - name := viper.GetString(client.FlagName) ctx := context.NewCoreContextFromViper() - res, err := ctx.SignBuildBroadcast(name, msg, cdc) + res, err := ctx.SignBuildBroadcast(ctx.FromAddressName, msg, cdc) if err != nil { return err }