Skip to content

Commit

Permalink
refactor: cmd cleanup (#3095)
Browse files Browse the repository at this point in the history
* cleanup

* session

* format

* revert session in cmd-account

* make format
  • Loading branch information
Alex Johnson authored Nov 14, 2022
1 parent e776c40 commit a572663
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ignite/cmd/account_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func NewAccountList() *cobra.Command {
return c
}

func accountListHandler(cmd *cobra.Command, args []string) error {
func accountListHandler(cmd *cobra.Command, _ []string) error {
ca, err := cosmosaccount.New(
cosmosaccount.WithKeyringBackend(getKeyringBackend(cmd)),
cosmosaccount.WithHome(getKeyringDir(cmd)),
Expand Down
1 change: 0 additions & 1 deletion ignite/cmd/chain_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ func chainBuildHandler(cmd *cobra.Command, _ []string) error {
cliui.StartSpinner(),
)
)

defer session.End()

chainOption := []chain.Option{
Expand Down
1 change: 0 additions & 1 deletion ignite/cmd/chain_faucet.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ func chainFaucetHandler(cmd *cobra.Command, args []string) error {
cliui.StartSpinner(),
)
)

defer session.End()

chainOption := []chain.Option{
Expand Down
1 change: 0 additions & 1 deletion ignite/cmd/chain_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ func chainInitHandler(cmd *cobra.Command, _ []string) error {
cliui.WithVerbosity(getVerbosity(cmd)),
cliui.StartSpinner(),
)

defer session.End()

chainOption := []chain.Option{
Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func NewDocs() *cobra.Command {
return c
}

func docsHandler(cmd *cobra.Command, args []string) error {
func docsHandler(*cobra.Command, []string) error {
path, cleanup, err := localfs.SaveTemp(docs.Docs)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_composables.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func NewGenerateComposables() *cobra.Command {
return c
}

func generateComposablesHandler(cmd *cobra.Command, args []string) error {
func generateComposablesHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_go.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func NewGenerateGo() *cobra.Command {
return c
}

func generateGoHandler(cmd *cobra.Command, args []string) error {
func generateGoHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func NewGenerateHooks() *cobra.Command {
return c
}

func generateHooksHandler(cmd *cobra.Command, args []string) error {
func generateHooksHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func NewGenerateOpenAPI() *cobra.Command {
return c
}

func generateOpenAPIHandler(cmd *cobra.Command, args []string) error {
func generateOpenAPIHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_typescript_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func NewGenerateTSClient() *cobra.Command {
return c
}

func generateTSClientHandler(cmd *cobra.Command, args []string) error {
func generateTSClientHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/generate_vuex.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func NewGenerateVuex() *cobra.Command {
return c
}

func generateVuexHandler(cmd *cobra.Command, args []string) error {
func generateVuexHandler(cmd *cobra.Command, _ []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
defer session.End()

Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/network_campaign_publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func NewNetworkCampaignPublish() *cobra.Command {
Args: cobra.ExactArgs(2),
RunE: networkCampaignPublishHandler,
}
c.Flags().String(flagMetadata, "", "Add a metada to the chain")
c.Flags().String(flagMetadata, "", "Add a metadata to the chain")
c.Flags().AddFlagSet(flagNetworkFrom())
c.Flags().AddFlagSet(flagSetKeyringBackend())
c.Flags().AddFlagSet(flagSetKeyringDir())
Expand Down
6 changes: 3 additions & 3 deletions ignite/cmd/node_query_bank_balances.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ func NewNodeQueryBankBalances() *cobra.Command {
}

func nodeQueryBankBalancesHandler(cmd *cobra.Command, args []string) error {
session := cliui.New(cliui.StartSpinnerWithText(statusQuerying))
defer session.End()

inputAccount := args[0]

client, err := newNodeCosmosClient(cmd)
Expand All @@ -42,9 +45,6 @@ func nodeQueryBankBalancesHandler(cmd *cobra.Command, args []string) error {
return err
}

session := cliui.New(cliui.StartSpinnerWithText(statusQuerying))
defer session.End()

balances, err := client.BankBalances(cmd.Context(), address, pagination)
if err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions ignite/cmd/node_tx_bank_send.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ func NewNodeTxBankSend() *cobra.Command {
}

func nodeTxBankSendHandler(cmd *cobra.Command, args []string) error {
session := cliui.New()
defer session.End()

var (
fromAccountInput = args[0]
toAccountInput = args[1]
Expand Down Expand Up @@ -53,9 +56,6 @@ func nodeTxBankSendHandler(cmd *cobra.Command, args []string) error {
return err
}

session := cliui.New()
defer session.End()

if generateOnly {
json, err := tx.EncodeJSON()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion ignite/cmd/scaffold_react.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ignite/cli/ignite/pkg/cosmosgen"
)

// NewScaffoldReacr scaffolds a React app for a chain.
// NewScaffoldReact scaffolds a React app for a chain.
func NewScaffoldReact() *cobra.Command {
c := &cobra.Command{
Use: "react",
Expand Down

0 comments on commit a572663

Please sign in to comment.