From 652fca921d3f768f535ecd8b40449e7afebeba30 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 19 May 2021 10:41:30 -0400
Subject: [PATCH] fix client config don't take effect (backport #9211) (#9360)

* fix client config don't take effect (#9211)

* fix client keyring config

* fix output flag of keys commads

Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
(cherry picked from commit b4d1a5e5d6c9393c02c69fcbd34e9fd7ef4e0879)

* Fix conflicts

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Amaury M <1293565+amaurym@users.noreply.github.com>
---
 client/config/config_test.go            | 3 ---
 x/bank/simulation/operations.go         | 2 ++
 x/distribution/simulation/operations.go | 2 ++
 x/gov/simulation/operations.go          | 2 ++
 x/slashing/simulation/operations.go     | 2 ++
 x/staking/simulation/operations.go      | 2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/config/config_test.go b/client/config/config_test.go
index c058edf8301a..758f250b00e5 100644
--- a/client/config/config_test.go
+++ b/client/config/config_test.go
@@ -62,7 +62,6 @@ func TestConfigCmd(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, string(out), testNode1+"\n")
 }
-
 func TestConfigCmdEnvFlag(t *testing.T) {
 	const (
 		defaultNode = "http://localhost:26657"
@@ -92,10 +91,8 @@ func TestConfigCmdEnvFlag(t *testing.T) {
 			}()
 			/*
 				env var is set with a flag
-
 				NODE=http://localhost:1 ./build/simd q staking validators --node http://localhost:2
 				Error: post failed: Post "http://localhost:2": dial tcp 127.0.0.1:2: connect: connection refused
-
 				We dial http://localhost:2 cause a flag has the higher priority than env variable.
 			*/
 			cmd := cli.GetQueryCmd()
diff --git a/x/bank/simulation/operations.go b/x/bank/simulation/operations.go
index 632ed11f5ffe..cbe07fd39fa8 100644
--- a/x/bank/simulation/operations.go
+++ b/x/bank/simulation/operations.go
@@ -16,6 +16,8 @@ import (
 )
 
 // Simulation operation weights constants
+//
+//nolint:gosec
 const (
 	OpWeightMsgSend      = "op_weight_msg_send"
 	OpWeightMsgMultiSend = "op_weight_msg_multisend"
diff --git a/x/distribution/simulation/operations.go b/x/distribution/simulation/operations.go
index 09090d1f64d6..6ae45e906e39 100644
--- a/x/distribution/simulation/operations.go
+++ b/x/distribution/simulation/operations.go
@@ -17,6 +17,8 @@ import (
 )
 
 // Simulation operation weights constants
+//
+//nolint:gosec
 const (
 	OpWeightMsgSetWithdrawAddress          = "op_weight_msg_set_withdraw_address"
 	OpWeightMsgWithdrawDelegationReward    = "op_weight_msg_withdraw_delegation_reward"
diff --git a/x/gov/simulation/operations.go b/x/gov/simulation/operations.go
index 2ea89ca97bb1..8a97ff592bb2 100644
--- a/x/gov/simulation/operations.go
+++ b/x/gov/simulation/operations.go
@@ -19,6 +19,8 @@ import (
 var initialProposalID = uint64(100000000000000)
 
 // Simulation operation weights constants
+//
+//nolint:gosec
 const (
 	OpWeightMsgDeposit = "op_weight_msg_deposit"
 	OpWeightMsgVote    = "op_weight_msg_vote"
diff --git a/x/slashing/simulation/operations.go b/x/slashing/simulation/operations.go
index 753def5fa5c3..197814372886 100644
--- a/x/slashing/simulation/operations.go
+++ b/x/slashing/simulation/operations.go
@@ -17,6 +17,8 @@ import (
 )
 
 // Simulation operation weights constants
+//
+//nolint:gosec
 const (
 	OpWeightMsgUnjail = "op_weight_msg_unjail"
 )
diff --git a/x/staking/simulation/operations.go b/x/staking/simulation/operations.go
index 11623509480a..82a3e3062e09 100644
--- a/x/staking/simulation/operations.go
+++ b/x/staking/simulation/operations.go
@@ -16,6 +16,8 @@ import (
 )
 
 // Simulation operation weights constants
+//
+//nolint:gosec
 const (
 	OpWeightMsgCreateValidator = "op_weight_msg_create_validator"
 	OpWeightMsgEditValidator   = "op_weight_msg_edit_validator"