From 430c4ce281569a4f61841b9ccc3c0282614b6437 Mon Sep 17 00:00:00 2001 From: Segue Date: Mon, 18 Jan 2021 13:59:42 +0800 Subject: [PATCH 1/2] fix tx --- app/app.go | 7 +++---- cmd/iris/cmd/keys.go | 1 + cmd/iris/cmd/root.go | 2 -- simapp/app.go | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/app.go b/app/app.go index d31eb75e2..4d4c488be 100644 --- a/app/app.go +++ b/app/app.go @@ -5,10 +5,6 @@ import ( "os" "path/filepath" - "github.com/cosmos/cosmos-sdk/client" - servertypes "github.com/cosmos/cosmos-sdk/server/types" - authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/log" @@ -17,12 +13,14 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/client/rpc" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" + servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -32,6 +30,7 @@ import ( authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation" + authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" "github.com/cosmos/cosmos-sdk/x/bank" diff --git a/cmd/iris/cmd/keys.go b/cmd/iris/cmd/keys.go index e59ef9227..ea9c105a0 100644 --- a/cmd/iris/cmd/keys.go +++ b/cmd/iris/cmd/keys.go @@ -6,6 +6,7 @@ import ( "io/ioutil" "github.com/spf13/cobra" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client" diff --git a/cmd/iris/cmd/root.go b/cmd/iris/cmd/root.go index b346d9587..9894cf720 100644 --- a/cmd/iris/cmd/root.go +++ b/cmd/iris/cmd/root.go @@ -26,7 +26,6 @@ import ( authclient "github.com/cosmos/cosmos-sdk/x/auth/client" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" "github.com/cosmos/cosmos-sdk/x/auth/types" - vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" @@ -144,7 +143,6 @@ func txCommand() *cobra.Command { authcmd.GetEncodeCommand(), authcmd.GetDecodeCommand(), flags.LineBreak, - vestingcli.GetTxCmd(), ) app.ModuleBasics.AddTxCommands(cmd) diff --git a/simapp/app.go b/simapp/app.go index 002f5cf56..561f48b1a 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -6,10 +6,9 @@ import ( "os" "path/filepath" - "github.com/spf13/cast" - "github.com/gorilla/mux" "github.com/rakyll/statik/fs" + "github.com/spf13/cast" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" From 95e42c38b22bba5c1260be4412c5a49b4ca03539 Mon Sep 17 00:00:00 2001 From: Segue Date: Mon, 18 Jan 2021 14:03:52 +0800 Subject: [PATCH 2/2] remove line break --- cmd/iris/cmd/root.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/iris/cmd/root.go b/cmd/iris/cmd/root.go index 9894cf720..8a993d062 100644 --- a/cmd/iris/cmd/root.go +++ b/cmd/iris/cmd/root.go @@ -142,7 +142,6 @@ func txCommand() *cobra.Command { authcmd.GetBroadcastCommand(), authcmd.GetEncodeCommand(), authcmd.GetDecodeCommand(), - flags.LineBreak, ) app.ModuleBasics.AddTxCommands(cmd)