From 1cb00650b1b9195f8fde5e52f4b71f636ea96d00 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Fri, 5 Jun 2020 16:45:00 +0530
Subject: [PATCH 01/14] added missing cli tests for distribution module

---
 x/distribution/client/cli/cli_test.go     | 54 +++++++++++++++++++-
 x/distribution/client/testutil/helpers.go | 62 +++++++++++++++++++++++
 2 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index d2c63acd69c1..b4c499a7c5e0 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -3,12 +3,14 @@
 package cli_test
 
 import (
+	"fmt"
 	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 	tmtypes "github.com/tendermint/tendermint/types"
 
+	"github.com/cosmos/cosmos-sdk/tests"
 	"github.com/cosmos/cosmos-sdk/tests/cli"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/distribution/client/testutil"
@@ -40,18 +42,66 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	proc := f.SDStart()
 	t.Cleanup(func() { proc.Stop(false) })
 
+	params := testutil.QueryParameters(f)
+	require.NotNil(t, params)
+
 	fooAddr := f.KeyAddress(cli.KeyFoo)
+	barAddr := f.KeyAddress(cli.KeyBar)
+	fooVal := sdk.ValAddress(fooAddr)
+
+	outstandingRewards := testutil.QueryValidatorOutstandingRewards(f, fooVal.String())
+	require.NotNil(t, outstandingRewards)
+	require.Equal(t, outstandingRewards.Rewards.IsZero(), false)
+
+	commission := testutil.QueryCommission(f, fooVal.String())
+	require.NotNil(t, commission)
+	require.Equal(t, commission.Commission.IsZero(), false)
+
 	rewards := testutil.QueryRewards(f, fooAddr)
 	require.Equal(t, 1, len(rewards.Rewards))
 	require.NotNil(t, rewards.Total)
 
-	fooVal := sdk.ValAddress(fooAddr)
+	// withdrawing rewards of a delegation for a single validator
 	success := testutil.TxWithdrawRewards(f, fooVal, fooAddr.String(), "-y")
 	require.True(t, success)
 
 	rewards = testutil.QueryRewards(f, fooAddr)
 	require.Equal(t, 1, len(rewards.Rewards))
-
 	require.Nil(t, rewards.Total)
+
+	// Setting up a new withdraw address
+	success, stdout, stderr := testutil.TxSetWithdrawAddress(f, fooAddr.String(), barAddr.String(), "--generate-only")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+
+	msg := cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	require.NotZero(t, msg.Fee.Gas)
+	require.Equal(t, len(msg.Msgs), 1)
+	require.Equal(t, 0, len(msg.GetSignatures()))
+
+	success, _, stderr = testutil.TxSetWithdrawAddress(f, cli.KeyFoo, barAddr.String(), "-y")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	// Withdraw all delegation rewards from all validators
+	success, stdout, stderr = testutil.TxWithdrawAllRewards(f, fooAddr.String(), "--generate-only")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+
+	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	require.NotZero(t, msg.Fee.Gas)
+	require.Equal(t, len(msg.Msgs), 1)
+	require.Equal(t, 0, len(msg.GetSignatures()))
+
+	success, _, stderr = testutil.TxWithdrawAllRewards(f, cli.KeyFoo, "-y")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	slashes := testutil.QuerySlashes(f, fooVal.String())
+	fmt.Println("slashes", slashes)
+	require.NotNil(t, nil)
+
 	f.Cleanup()
 }
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index 975d31674a64..55cbdb28e4f1 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -12,11 +12,24 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/distribution"
 )
 
+// TxWithdrawRewards raises a txn to withdraw rewards
 func TxWithdrawRewards(f *cli.Fixtures, valAddr sdk.ValAddress, from string, flags ...string) bool {
 	cmd := fmt.Sprintf("%s tx distribution withdraw-rewards %s %v --keyring-backend=test --from=%s", f.SimcliBinary, valAddr, f.Flags(), from)
 	return cli.ExecuteWrite(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
 }
 
+// TxSetWithdrawAddress helps to set the withdraw address for rewards associated with a delegator address
+func TxSetWithdrawAddress(f *cli.Fixtures, from, withDrawAddr string, flags ...string) (bool, string, string) {
+	cmd := fmt.Sprintf("%s tx distribution set-withdraw-addr %s --from %s %v --keyring-backend=test", f.SimcliBinary, withDrawAddr, from, f.Flags())
+	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
+}
+
+// TxWithdrawAllRewards raises a txn to withdraw rewards
+func TxWithdrawAllRewards(f *cli.Fixtures, from string, flags ...string) (bool, string, string) {
+	cmd := fmt.Sprintf("%s tx distribution withdraw-all-rewards %v --keyring-backend=test --from=%s", f.SimcliBinary, f.Flags(), from)
+	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
+}
+
 // QueryRewards returns the rewards of a delegator
 func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) distribution.QueryDelegatorTotalRewardsResponse {
 	cmd := fmt.Sprintf("%s query distribution rewards %s %s", f.SimcliBinary, delAddr, f.Flags())
@@ -28,3 +41,52 @@ func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) dist
 	require.NoError(f.T, err)
 	return rewards
 }
+
+// QueryValidatorOutstandingRewards distribution outstanding (un-withdrawn) rewards
+func QueryValidatorOutstandingRewards(f *cli.Fixtures, valAddr string) distribution.ValidatorOutstandingRewards {
+	cmd := fmt.Sprintf("%s query distribution validator-outstanding-rewards %s %v", f.SimcliBinary, valAddr, f.Flags())
+	res, errStr := tests.ExecuteT(f.T, cmd, "")
+	require.Empty(f.T, errStr)
+
+	var outstandingRewards distribution.ValidatorOutstandingRewards
+	err := f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards)
+	require.NoError(f.T, err)
+	return outstandingRewards
+}
+
+// QueryParameters is simcli query distribution parameters
+func QueryParameters(f *cli.Fixtures, flags ...string) distribution.Params {
+	cmd := fmt.Sprintf("%s query distribution params %v", f.SimcliBinary, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var params distribution.Params
+	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	return params
+}
+
+// QueryCommission returns validator commission rewards from delegators to that validator.
+func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribution.ValidatorAccumulatedCommission {
+	cmd := fmt.Sprintf("%s query distribution commission %s %v", f.SimcliBinary, valAddr, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var commission distribution.ValidatorAccumulatedCommission
+	err := f.Cdc.UnmarshalJSON([]byte(out), &commission)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	return commission
+}
+
+// QuerySlashes returns all slashes of a validator for a given block range.
+func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) distribution.ValidatorSlashEvents {
+	cmd := fmt.Sprintf("%s query distribution slashes %s 0 5 %v ", f.SimcliBinary, valAddr, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	fmt.Println("errStr---------------->", errStr)
+	require.Empty(f.T, errStr)
+
+	var slashes distribution.ValidatorSlashEvents
+	f.Cdc.MustUnmarshalJSON([]byte(out), &slashes)
+	// require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	return slashes
+}

From a00ea6da13c44967876b47591c60aa6d6d18606d Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Fri, 5 Jun 2020 17:48:01 +0530
Subject: [PATCH 02/14] added tests for mint module

---
 x/mint/client/cli/cli_test.go     | 28 ++++++++++++++++++
 x/mint/client/testutil/helpers.go | 47 +++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 x/mint/client/cli/cli_test.go
 create mode 100644 x/mint/client/testutil/helpers.go

diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go
new file mode 100644
index 000000000000..5116ab6b72c6
--- /dev/null
+++ b/x/mint/client/cli/cli_test.go
@@ -0,0 +1,28 @@
+// +build cli_test
+
+package cli_test
+
+import (
+	"testing"
+
+	"github.com/cosmos/cosmos-sdk/tests/cli"
+	"github.com/cosmos/cosmos-sdk/x/mint/client/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCLIMintQueries(t *testing.T) {
+	t.Parallel()
+	f := cli.InitFixtures(t)
+
+	proc := f.SDStart()
+	t.Cleanup(func() { proc.Stop(false) })
+
+	params := testutil.QueryMintingParams(f)
+	require.NotNil(t, params)
+
+	inflation := testutil.QueryInflation(f)
+	require.False(t, inflation.IsZero())
+
+	annualProvisions := testutil.QueryAnnualProvisions(f)
+	require.False(t, annualProvisions.IsZero())
+}
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
new file mode 100644
index 000000000000..968ccc35dbff
--- /dev/null
+++ b/x/mint/client/testutil/helpers.go
@@ -0,0 +1,47 @@
+package testutil
+
+import (
+	"fmt"
+
+	"github.com/cosmos/cosmos-sdk/tests"
+	"github.com/cosmos/cosmos-sdk/tests/cli"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/mint/types"
+	"github.com/stretchr/testify/require"
+)
+
+// QueryMintingParams returns the current minting parameters
+func QueryMintingParams(f *cli.Fixtures, flags ...string) types.Params {
+	cmd := fmt.Sprintf("%s query mint params %v", f.SimcliBinary, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var params types.Params
+	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	return params
+}
+
+// QueryInflation returns the current minting inflation value
+func QueryInflation(f *cli.Fixtures, flags ...string) sdk.Dec {
+	cmd := fmt.Sprintf("%s query mint inflation %v", f.SimcliBinary, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var inflation sdk.Dec
+	err := f.Cdc.UnmarshalJSON([]byte(out), &inflation)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	return inflation
+}
+
+// QueryAnnualProvisions returns the current minting annual provisions value
+func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
+	cmd := fmt.Sprintf("%s query mint annual-provisions %v", f.SimcliBinary, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var annualProvisions sdk.Dec
+	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
+	require.NoError(f.T, err, "out1 %v\n, err1 %v", out, err)
+	return annualProvisions
+}

From ad782fb5defeeb100b741bd5cddd7a6062488f9d Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Fri, 5 Jun 2020 17:49:02 +0530
Subject: [PATCH 03/14] changed debugging code

---
 x/mint/client/testutil/helpers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index 968ccc35dbff..e505bbbdb41f 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -42,6 +42,6 @@ func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var annualProvisions sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
-	require.NoError(f.T, err, "out1 %v\n, err1 %v", out, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 	return annualProvisions
 }

From 7b50a8aac425a30b7255b1712b7f2d26252a52aa Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Mon, 8 Jun 2020 14:26:13 +0530
Subject: [PATCH 04/14] review changes

---
 x/distribution/client/cli/cli_test.go     | 24 +++++++++++------------
 x/distribution/client/testutil/helpers.go | 15 ++++++++------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index b4c499a7c5e0..51544a761843 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -3,7 +3,6 @@
 package cli_test
 
 import (
-	"fmt"
 	"path/filepath"
 	"testing"
 
@@ -43,23 +42,23 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	t.Cleanup(func() { proc.Stop(false) })
 
 	params := testutil.QueryParameters(f)
-	require.NotNil(t, params)
+	require.NotEmpty(t, params)
 
 	fooAddr := f.KeyAddress(cli.KeyFoo)
 	barAddr := f.KeyAddress(cli.KeyBar)
 	fooVal := sdk.ValAddress(fooAddr)
 
-	outstandingRewards := testutil.QueryValidatorOutstandingRewards(f, fooVal.String())
-	require.NotNil(t, outstandingRewards)
-	require.Equal(t, outstandingRewards.Rewards.IsZero(), false)
+	outStandingRewards := testutil.QueryValidatorOutstandingRewards(f, fooVal.String())
+	require.NotEmpty(t, outStandingRewards)
+	require.False(t, outStandingRewards.Rewards.IsZero())
 
 	commission := testutil.QueryCommission(f, fooVal.String())
-	require.NotNil(t, commission)
-	require.Equal(t, commission.Commission.IsZero(), false)
+	require.NotEmpty(t, commission)
+	require.False(t, commission.Commission.IsZero())
 
 	rewards := testutil.QueryRewards(f, fooAddr)
 	require.Equal(t, 1, len(rewards.Rewards))
-	require.NotNil(t, rewards.Total)
+	require.NotEmpty(t, rewards.Total)
 
 	// withdrawing rewards of a delegation for a single validator
 	success := testutil.TxWithdrawRewards(f, fooVal, fooAddr.String(), "-y")
@@ -76,8 +75,8 @@ func TestCLIWithdrawRewards(t *testing.T) {
 
 	msg := cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
-	require.Equal(t, len(msg.Msgs), 1)
-	require.Equal(t, 0, len(msg.GetSignatures()))
+	require.Len(t, msg.Msgs, 1)
+	require.Len(t, msg.GetSignatures(), 0)
 
 	success, _, stderr = testutil.TxSetWithdrawAddress(f, cli.KeyFoo, barAddr.String(), "-y")
 	require.True(f.T, success)
@@ -91,7 +90,7 @@ func TestCLIWithdrawRewards(t *testing.T) {
 
 	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
-	require.Equal(t, len(msg.Msgs), 1)
+	require.Len(t, msg.Msgs, 1)
 	require.Equal(t, 0, len(msg.GetSignatures()))
 
 	success, _, stderr = testutil.TxWithdrawAllRewards(f, cli.KeyFoo, "-y")
@@ -100,8 +99,7 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	tests.WaitForNextNBlocksTM(1, f.Port)
 
 	slashes := testutil.QuerySlashes(f, fooVal.String())
-	fmt.Println("slashes", slashes)
-	require.NotNil(t, nil)
+	require.Nil(t, slashes, nil)
 
 	f.Cleanup()
 }
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index 55cbdb28e4f1..ffca2bf11f3e 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -62,7 +62,8 @@ func QueryParameters(f *cli.Fixtures, flags ...string) distribution.Params {
 
 	var params distribution.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return params
 }
 
@@ -74,19 +75,21 @@ func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribut
 
 	var commission distribution.ValidatorAccumulatedCommission
 	err := f.Cdc.UnmarshalJSON([]byte(out), &commission)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return commission
 }
 
 // QuerySlashes returns all slashes of a validator for a given block range.
-func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) distribution.ValidatorSlashEvents {
+func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distribution.ValidatorSlashEvent {
 	cmd := fmt.Sprintf("%s query distribution slashes %s 0 5 %v ", f.SimcliBinary, valAddr, f.Flags())
 	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
 	fmt.Println("errStr---------------->", errStr)
 	require.Empty(f.T, errStr)
 
-	var slashes distribution.ValidatorSlashEvents
-	f.Cdc.MustUnmarshalJSON([]byte(out), &slashes)
-	// require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	var slashes []distribution.ValidatorSlashEvent
+	err := f.Cdc.UnmarshalJSON([]byte(out), &slashes)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return slashes
 }

From d41fe3bfae35c54cfad49c8043dd302458c4caf6 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Mon, 8 Jun 2020 14:28:00 +0530
Subject: [PATCH 05/14] review change

---
 x/mint/client/cli/cli_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go
index 5116ab6b72c6..1bbff9867b46 100644
--- a/x/mint/client/cli/cli_test.go
+++ b/x/mint/client/cli/cli_test.go
@@ -18,7 +18,7 @@ func TestCLIMintQueries(t *testing.T) {
 	t.Cleanup(func() { proc.Stop(false) })
 
 	params := testutil.QueryMintingParams(f)
-	require.NotNil(t, params)
+	require.NotEmpty(t, params)
 
 	inflation := testutil.QueryInflation(f)
 	require.False(t, inflation.IsZero())

From 2e05bed842fc7abd4074746feca52236c4cefc75 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Mon, 8 Jun 2020 16:04:27 +0530
Subject: [PATCH 06/14] fixed distribution slashes command issue

---
 x/distribution/client/cli/query.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/x/distribution/client/cli/query.go b/x/distribution/client/cli/query.go
index dc76ed679911..720cfe9d22bc 100644
--- a/x/distribution/client/cli/query.go
+++ b/x/distribution/client/cli/query.go
@@ -190,8 +190,10 @@ $ %s query distribution slashes cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmq
 				return err
 			}
 
-			var slashes types.ValidatorSlashEvents
-			cdc.MustUnmarshalJSON(res, &slashes)
+			var slashes []types.ValidatorSlashEvent
+			if err = cdc.UnmarshalJSON(res, &slashes); err != nil {
+				return fmt.Errorf("failed to unmarshal response: %w", err)
+			}
 			return clientCtx.PrintOutput(slashes)
 		},
 	}

From 427bb9afc5f120016a8b5ed673aec17c265e4a92 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Tue, 9 Jun 2020 11:59:49 +0530
Subject: [PATCH 07/14] review changes

---
 x/distribution/client/cli/cli_test.go     |  6 +++---
 x/distribution/client/testutil/helpers.go |  2 ++
 x/mint/client/testutil/helpers.go         |  9 ++++++---
 x/staking/client/testutil/helpers.go      | 15 ++++++++++-----
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index 51544a761843..7e3b66cc9493 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -57,7 +57,7 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	require.False(t, commission.Commission.IsZero())
 
 	rewards := testutil.QueryRewards(f, fooAddr)
-	require.Equal(t, 1, len(rewards.Rewards))
+	require.Len(t, rewards.Rewards, 1)
 	require.NotEmpty(t, rewards.Total)
 
 	// withdrawing rewards of a delegation for a single validator
@@ -65,7 +65,7 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	require.True(t, success)
 
 	rewards = testutil.QueryRewards(f, fooAddr)
-	require.Equal(t, 1, len(rewards.Rewards))
+	require.Len(t, rewards.Rewards, 1)
 	require.Nil(t, rewards.Total)
 
 	// Setting up a new withdraw address
@@ -91,7 +91,7 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
 	require.Len(t, msg.Msgs, 1)
-	require.Equal(t, 0, len(msg.GetSignatures()))
+	require.Len(t, msg.GetSignatures(), 0)
 
 	success, _, stderr = testutil.TxWithdrawAllRewards(f, cli.KeyFoo, "-y")
 	require.True(f.T, success)
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index ffca2bf11f3e..882ce86061ae 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -38,6 +38,7 @@ func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) dist
 
 	var rewards distribution.QueryDelegatorTotalRewardsResponse
 	err := f.Cdc.UnmarshalJSON([]byte(res), &rewards)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", res, err))
 	require.NoError(f.T, err)
 	return rewards
 }
@@ -50,6 +51,7 @@ func QueryValidatorOutstandingRewards(f *cli.Fixtures, valAddr string) distribut
 
 	var outstandingRewards distribution.ValidatorOutstandingRewards
 	err := f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", res, err))
 	require.NoError(f.T, err)
 	return outstandingRewards
 }
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index e505bbbdb41f..c6cc3d38cbb8 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -18,7 +18,8 @@ func QueryMintingParams(f *cli.Fixtures, flags ...string) types.Params {
 
 	var params types.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return params
 }
 
@@ -30,7 +31,8 @@ func QueryInflation(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var inflation sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &inflation)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return inflation
 }
 
@@ -42,6 +44,7 @@ func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var annualProvisions sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 	return annualProvisions
 }
diff --git a/x/staking/client/testutil/helpers.go b/x/staking/client/testutil/helpers.go
index b9694d2e93d5..588270278d2c 100644
--- a/x/staking/client/testutil/helpers.go
+++ b/x/staking/client/testutil/helpers.go
@@ -38,7 +38,8 @@ func QueryStakingValidator(f *cli.Fixtures, valAddr sdk.ValAddress, flags ...str
 	var validator staking.Validator
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &validator)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 
 	return validator
 }
@@ -51,7 +52,8 @@ func QueryStakingUnbondingDelegationsFrom(f *cli.Fixtures, valAddr sdk.ValAddres
 	var ubds []staking.UnbondingDelegation
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &ubds)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 
 	return ubds
 }
@@ -64,7 +66,8 @@ func QueryStakingDelegationsTo(f *cli.Fixtures, valAddr sdk.ValAddress, flags ..
 	var delegations []staking.Delegation
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &delegations)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 
 	return delegations
 }
@@ -77,7 +80,8 @@ func QueryStakingPool(f *cli.Fixtures, flags ...string) staking.Pool {
 	var pool staking.Pool
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &pool)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 
 	return pool
 }
@@ -90,7 +94,8 @@ func QueryStakingParameters(f *cli.Fixtures, flags ...string) staking.Params {
 	var params staking.Params
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	require.NoError(f.T, err, "out %v\n, err %v", out, err)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
 
 	return params
 }

From 3d5547c79899c800a3541b2f3ccc100cb3e788cc Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Tue, 9 Jun 2020 14:14:28 +0530
Subject: [PATCH 08/14] added fund community pool txn and query

---
 x/distribution/client/cli/cli_test.go     | 20 ++++++++++++++++++++
 x/distribution/client/testutil/helpers.go | 22 ++++++++++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index 7e3b66cc9493..ff1d2dc6163d 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -98,6 +98,26 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	require.Empty(f.T, stderr)
 	tests.WaitForNextNBlocksTM(1, f.Port)
 
+	newTokens := sdk.NewCoin(cli.Denom, sdk.TokensFromConsensusPower(1))
+
+	// Withdraw all delegation rewards from all validators
+	success, stdout, stderr = testutil.TxFundCommunityPool(f, fooAddr.String(), newTokens, "--generate-only")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+
+	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	require.NotZero(t, msg.Fee.Gas)
+	require.Len(t, msg.Msgs, 1)
+	require.Len(t, msg.GetSignatures(), 0)
+
+	success, _, stderr = testutil.TxFundCommunityPool(f, cli.KeyFoo, newTokens, "-y")
+	require.True(f.T, success)
+	require.Empty(f.T, stderr)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	amount := testutil.QueryCommunityPool(f)
+	require.False(f.T, amount.IsZero())
+
 	slashes := testutil.QuerySlashes(f, fooVal.String())
 	require.Nil(t, slashes, nil)
 
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index 882ce86061ae..3b650dad043d 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -24,12 +24,18 @@ func TxSetWithdrawAddress(f *cli.Fixtures, from, withDrawAddr string, flags ...s
 	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
 }
 
-// TxWithdrawAllRewards raises a txn to withdraw rewards
+// TxWithdrawAllRewards raises a txn to withdraw all rewards of a delegator address
 func TxWithdrawAllRewards(f *cli.Fixtures, from string, flags ...string) (bool, string, string) {
 	cmd := fmt.Sprintf("%s tx distribution withdraw-all-rewards %v --keyring-backend=test --from=%s", f.SimcliBinary, f.Flags(), from)
 	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
 }
 
+// TxFundCommunityPool Funds the community pool with the specified amount
+func TxFundCommunityPool(f *cli.Fixtures, from string, amount sdk.Coin, flags ...string) (bool, string, string) {
+	cmd := fmt.Sprintf("%s tx distribution community-pool-spend %v %v --keyring-backend=test --from=%s", f.SimcliBinary, amount, f.Flags(), from)
+	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
+}
+
 // QueryRewards returns the rewards of a delegator
 func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) distribution.QueryDelegatorTotalRewardsResponse {
 	cmd := fmt.Sprintf("%s query distribution rewards %s %s", f.SimcliBinary, delAddr, f.Flags())
@@ -86,7 +92,6 @@ func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribut
 func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distribution.ValidatorSlashEvent {
 	cmd := fmt.Sprintf("%s query distribution slashes %s 0 5 %v ", f.SimcliBinary, valAddr, f.Flags())
 	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
-	fmt.Println("errStr---------------->", errStr)
 	require.Empty(f.T, errStr)
 
 	var slashes []distribution.ValidatorSlashEvent
@@ -95,3 +100,16 @@ func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distributi
 	require.NoError(f.T, err)
 	return slashes
 }
+
+// QueryCommunityPool returns the amount of coins in the community pool
+func QueryCommunityPool(f *cli.Fixtures, flags ...string) sdk.DecCoins {
+	cmd := fmt.Sprintf("%s query distribution community-pool %v ", f.SimcliBinary, f.Flags())
+	out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
+	require.Empty(f.T, errStr)
+
+	var amount sdk.DecCoins
+	err := f.Cdc.UnmarshalJSON([]byte(out), &amount)
+	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	require.NoError(f.T, err)
+	return amount
+}

From 73bdf82cd565a8323169507d1fd4e433360ac6f4 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Tue, 9 Jun 2020 15:26:49 +0530
Subject: [PATCH 09/14] updated fund community pool command test

---
 x/distribution/client/cli/tx.go           | 2 +-
 x/distribution/client/testutil/helpers.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x/distribution/client/cli/tx.go b/x/distribution/client/cli/tx.go
index 43f6ef81d2dc..3909f7b47906 100644
--- a/x/distribution/client/cli/tx.go
+++ b/x/distribution/client/cli/tx.go
@@ -195,7 +195,7 @@ $ %s tx distribution set-withdraw-addr cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75
 
 func NewFundCommunityPoolCmd(clientCtx client.Context) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "community-pool-spend [proposal-file]",
+		Use:   "fund-community-pool [amount]",
 		Args:  cobra.ExactArgs(1),
 		Short: "Submit a community pool spend proposal",
 		Long: strings.TrimSpace(
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index 3b650dad043d..a367b1145a30 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -32,7 +32,7 @@ func TxWithdrawAllRewards(f *cli.Fixtures, from string, flags ...string) (bool,
 
 // TxFundCommunityPool Funds the community pool with the specified amount
 func TxFundCommunityPool(f *cli.Fixtures, from string, amount sdk.Coin, flags ...string) (bool, string, string) {
-	cmd := fmt.Sprintf("%s tx distribution community-pool-spend %v %v --keyring-backend=test --from=%s", f.SimcliBinary, amount, f.Flags(), from)
+	cmd := fmt.Sprintf("%s tx distribution fund-community-pool %v %v --keyring-backend=test --from=%s", f.SimcliBinary, amount, f.Flags(), from)
 	return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
 }
 

From 800a5c292fb50bd2c3a6b69ff6308667a5828d4b Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Tue, 9 Jun 2020 15:34:43 +0530
Subject: [PATCH 10/14] staking file revert

---
 x/staking/client/testutil/helpers.go | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/x/staking/client/testutil/helpers.go b/x/staking/client/testutil/helpers.go
index 588270278d2c..b9694d2e93d5 100644
--- a/x/staking/client/testutil/helpers.go
+++ b/x/staking/client/testutil/helpers.go
@@ -38,8 +38,7 @@ func QueryStakingValidator(f *cli.Fixtures, valAddr sdk.ValAddress, flags ...str
 	var validator staking.Validator
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &validator)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
-	require.NoError(f.T, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 
 	return validator
 }
@@ -52,8 +51,7 @@ func QueryStakingUnbondingDelegationsFrom(f *cli.Fixtures, valAddr sdk.ValAddres
 	var ubds []staking.UnbondingDelegation
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &ubds)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
-	require.NoError(f.T, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 
 	return ubds
 }
@@ -66,8 +64,7 @@ func QueryStakingDelegationsTo(f *cli.Fixtures, valAddr sdk.ValAddress, flags ..
 	var delegations []staking.Delegation
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &delegations)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
-	require.NoError(f.T, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 
 	return delegations
 }
@@ -80,8 +77,7 @@ func QueryStakingPool(f *cli.Fixtures, flags ...string) staking.Pool {
 	var pool staking.Pool
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &pool)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
-	require.NoError(f.T, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 
 	return pool
 }
@@ -94,8 +90,7 @@ func QueryStakingParameters(f *cli.Fixtures, flags ...string) staking.Params {
 	var params staking.Params
 
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
-	require.NoError(f.T, err)
+	require.NoError(f.T, err, "out %v\n, err %v", out, err)
 
 	return params
 }

From d8dc4b2c8e696d90790ed69244eebd96ada6936b Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Wed, 10 Jun 2020 21:07:38 +0530
Subject: [PATCH 11/14] review changes

---
 x/distribution/client/cli/cli_test.go     | 32 +++++++++++------------
 x/distribution/client/testutil/helpers.go | 12 ++++-----
 x/mint/client/testutil/helpers.go         |  6 ++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index ff1d2dc6163d..13d5d6f919da 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -70,53 +70,53 @@ func TestCLIWithdrawRewards(t *testing.T) {
 
 	// Setting up a new withdraw address
 	success, stdout, stderr := testutil.TxSetWithdrawAddress(f, fooAddr.String(), barAddr.String(), "--generate-only")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 
-	msg := cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	msg := cli.UnmarshalStdTx(t, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
 	require.Len(t, msg.Msgs, 1)
 	require.Len(t, msg.GetSignatures(), 0)
 
 	success, _, stderr = testutil.TxSetWithdrawAddress(f, cli.KeyFoo, barAddr.String(), "-y")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 	tests.WaitForNextNBlocksTM(1, f.Port)
 
 	// Withdraw all delegation rewards from all validators
 	success, stdout, stderr = testutil.TxWithdrawAllRewards(f, fooAddr.String(), "--generate-only")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 
-	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	msg = cli.UnmarshalStdTx(t, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
 	require.Len(t, msg.Msgs, 1)
 	require.Len(t, msg.GetSignatures(), 0)
 
 	success, _, stderr = testutil.TxWithdrawAllRewards(f, cli.KeyFoo, "-y")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 	tests.WaitForNextNBlocksTM(1, f.Port)
 
 	newTokens := sdk.NewCoin(cli.Denom, sdk.TokensFromConsensusPower(1))
 
 	// Withdraw all delegation rewards from all validators
 	success, stdout, stderr = testutil.TxFundCommunityPool(f, fooAddr.String(), newTokens, "--generate-only")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 
-	msg = cli.UnmarshalStdTx(f.T, f.Cdc, stdout)
+	msg = cli.UnmarshalStdTx(t, f.Cdc, stdout)
 	require.NotZero(t, msg.Fee.Gas)
 	require.Len(t, msg.Msgs, 1)
 	require.Len(t, msg.GetSignatures(), 0)
 
 	success, _, stderr = testutil.TxFundCommunityPool(f, cli.KeyFoo, newTokens, "-y")
-	require.True(f.T, success)
-	require.Empty(f.T, stderr)
+	require.True(t, success)
+	require.Empty(t, stderr)
 	tests.WaitForNextNBlocksTM(1, f.Port)
 
 	amount := testutil.QueryCommunityPool(f)
-	require.False(f.T, amount.IsZero())
+	require.False(t, amount.IsZero())
 
 	slashes := testutil.QuerySlashes(f, fooVal.String())
 	require.Nil(t, slashes, nil)
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index a367b1145a30..fdd4bf6c7f81 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -44,7 +44,7 @@ func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) dist
 
 	var rewards distribution.QueryDelegatorTotalRewardsResponse
 	err := f.Cdc.UnmarshalJSON([]byte(res), &rewards)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", res, err))
+	f.T.Logf("\n out %v\n err %v", res, err)
 	require.NoError(f.T, err)
 	return rewards
 }
@@ -57,7 +57,7 @@ func QueryValidatorOutstandingRewards(f *cli.Fixtures, valAddr string) distribut
 
 	var outstandingRewards distribution.ValidatorOutstandingRewards
 	err := f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", res, err))
+	f.T.Logf("\n out %v\n err %v", res, err)
 	require.NoError(f.T, err)
 	return outstandingRewards
 }
@@ -70,7 +70,7 @@ func QueryParameters(f *cli.Fixtures, flags ...string) distribution.Params {
 
 	var params distribution.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return params
 }
@@ -83,7 +83,7 @@ func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribut
 
 	var commission distribution.ValidatorAccumulatedCommission
 	err := f.Cdc.UnmarshalJSON([]byte(out), &commission)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return commission
 }
@@ -96,7 +96,7 @@ func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distributi
 
 	var slashes []distribution.ValidatorSlashEvent
 	err := f.Cdc.UnmarshalJSON([]byte(out), &slashes)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return slashes
 }
@@ -109,7 +109,7 @@ func QueryCommunityPool(f *cli.Fixtures, flags ...string) sdk.DecCoins {
 
 	var amount sdk.DecCoins
 	err := f.Cdc.UnmarshalJSON([]byte(out), &amount)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return amount
 }
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index c6cc3d38cbb8..2b07e2581cc0 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -18,7 +18,7 @@ func QueryMintingParams(f *cli.Fixtures, flags ...string) types.Params {
 
 	var params types.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return params
 }
@@ -31,7 +31,7 @@ func QueryInflation(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var inflation sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &inflation)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return inflation
 }
@@ -44,7 +44,7 @@ func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var annualProvisions sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
-	f.T.Log(fmt.Sprintf("\n out %v\n err %v", out, err))
+	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return annualProvisions
 }

From fd1b1047308b644b551a1b46ca147ec9a640a938 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Thu, 11 Jun 2020 00:22:43 +0530
Subject: [PATCH 12/14] removed consoles

---
 x/distribution/client/testutil/helpers.go | 6 ------
 x/mint/client/testutil/helpers.go         | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index fdd4bf6c7f81..f1ff1ca97fc2 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -44,7 +44,6 @@ func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) dist
 
 	var rewards distribution.QueryDelegatorTotalRewardsResponse
 	err := f.Cdc.UnmarshalJSON([]byte(res), &rewards)
-	f.T.Logf("\n out %v\n err %v", res, err)
 	require.NoError(f.T, err)
 	return rewards
 }
@@ -57,7 +56,6 @@ func QueryValidatorOutstandingRewards(f *cli.Fixtures, valAddr string) distribut
 
 	var outstandingRewards distribution.ValidatorOutstandingRewards
 	err := f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards)
-	f.T.Logf("\n out %v\n err %v", res, err)
 	require.NoError(f.T, err)
 	return outstandingRewards
 }
@@ -70,7 +68,6 @@ func QueryParameters(f *cli.Fixtures, flags ...string) distribution.Params {
 
 	var params distribution.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return params
 }
@@ -83,7 +80,6 @@ func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribut
 
 	var commission distribution.ValidatorAccumulatedCommission
 	err := f.Cdc.UnmarshalJSON([]byte(out), &commission)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return commission
 }
@@ -96,7 +92,6 @@ func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distributi
 
 	var slashes []distribution.ValidatorSlashEvent
 	err := f.Cdc.UnmarshalJSON([]byte(out), &slashes)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return slashes
 }
@@ -109,7 +104,6 @@ func QueryCommunityPool(f *cli.Fixtures, flags ...string) sdk.DecCoins {
 
 	var amount sdk.DecCoins
 	err := f.Cdc.UnmarshalJSON([]byte(out), &amount)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return amount
 }
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index 2b07e2581cc0..3ae7e3c66177 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -18,7 +18,6 @@ func QueryMintingParams(f *cli.Fixtures, flags ...string) types.Params {
 
 	var params types.Params
 	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return params
 }
@@ -31,7 +30,6 @@ func QueryInflation(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var inflation sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &inflation)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return inflation
 }
@@ -44,7 +42,6 @@ func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
 
 	var annualProvisions sdk.Dec
 	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
-	f.T.Logf("\n out %v\n err %v", out, err)
 	require.NoError(f.T, err)
 	return annualProvisions
 }

From dd7c927e928f08f2e77a062e6618d5afa3ace5f6 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Thu, 11 Jun 2020 00:32:20 +0530
Subject: [PATCH 13/14] revew changes

---
 x/distribution/client/cli/cli_test.go     |  6 +++---
 x/distribution/client/testutil/helpers.go | 15 +++++----------
 x/mint/client/testutil/helpers.go         |  9 +++------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go
index 13d5d6f919da..6a7c13eb28f1 100644
--- a/x/distribution/client/cli/cli_test.go
+++ b/x/distribution/client/cli/cli_test.go
@@ -48,9 +48,9 @@ func TestCLIWithdrawRewards(t *testing.T) {
 	barAddr := f.KeyAddress(cli.KeyBar)
 	fooVal := sdk.ValAddress(fooAddr)
 
-	outStandingRewards := testutil.QueryValidatorOutstandingRewards(f, fooVal.String())
-	require.NotEmpty(t, outStandingRewards)
-	require.False(t, outStandingRewards.Rewards.IsZero())
+	outstandingRewards := testutil.QueryValidatorOutstandingRewards(f, fooVal.String())
+	require.NotEmpty(t, outstandingRewards)
+	require.False(t, outstandingRewards.Rewards.IsZero())
 
 	commission := testutil.QueryCommission(f, fooVal.String())
 	require.NotEmpty(t, commission)
diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index f1ff1ca97fc2..e08d6a7fec0f 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -55,8 +55,7 @@ func QueryValidatorOutstandingRewards(f *cli.Fixtures, valAddr string) distribut
 	require.Empty(f.T, errStr)
 
 	var outstandingRewards distribution.ValidatorOutstandingRewards
-	err := f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(res), &outstandingRewards))
 	return outstandingRewards
 }
 
@@ -67,8 +66,7 @@ func QueryParameters(f *cli.Fixtures, flags ...string) distribution.Params {
 	require.Empty(f.T, errStr)
 
 	var params distribution.Params
-	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &params))
 	return params
 }
 
@@ -79,8 +77,7 @@ func QueryCommission(f *cli.Fixtures, valAddr string, flags ...string) distribut
 	require.Empty(f.T, errStr)
 
 	var commission distribution.ValidatorAccumulatedCommission
-	err := f.Cdc.UnmarshalJSON([]byte(out), &commission)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &commission))
 	return commission
 }
 
@@ -91,8 +88,7 @@ func QuerySlashes(f *cli.Fixtures, valAddr string, flags ...string) []distributi
 	require.Empty(f.T, errStr)
 
 	var slashes []distribution.ValidatorSlashEvent
-	err := f.Cdc.UnmarshalJSON([]byte(out), &slashes)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &slashes))
 	return slashes
 }
 
@@ -103,7 +99,6 @@ func QueryCommunityPool(f *cli.Fixtures, flags ...string) sdk.DecCoins {
 	require.Empty(f.T, errStr)
 
 	var amount sdk.DecCoins
-	err := f.Cdc.UnmarshalJSON([]byte(out), &amount)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &amount))
 	return amount
 }
diff --git a/x/mint/client/testutil/helpers.go b/x/mint/client/testutil/helpers.go
index 3ae7e3c66177..8b686cced76a 100644
--- a/x/mint/client/testutil/helpers.go
+++ b/x/mint/client/testutil/helpers.go
@@ -17,8 +17,7 @@ func QueryMintingParams(f *cli.Fixtures, flags ...string) types.Params {
 	require.Empty(f.T, errStr)
 
 	var params types.Params
-	err := f.Cdc.UnmarshalJSON([]byte(out), &params)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &params))
 	return params
 }
 
@@ -29,8 +28,7 @@ func QueryInflation(f *cli.Fixtures, flags ...string) sdk.Dec {
 	require.Empty(f.T, errStr)
 
 	var inflation sdk.Dec
-	err := f.Cdc.UnmarshalJSON([]byte(out), &inflation)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &inflation))
 	return inflation
 }
 
@@ -41,7 +39,6 @@ func QueryAnnualProvisions(f *cli.Fixtures, flags ...string) sdk.Dec {
 	require.Empty(f.T, errStr)
 
 	var annualProvisions sdk.Dec
-	err := f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &annualProvisions))
 	return annualProvisions
 }

From 99a0a6df4673595b13470705d590494b6868ca13 Mon Sep 17 00:00:00 2001
From: atheesh <atheesh@vitwit.com>
Date: Thu, 11 Jun 2020 11:44:19 +0530
Subject: [PATCH 14/14] Review changes

---
 x/distribution/client/testutil/helpers.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x/distribution/client/testutil/helpers.go b/x/distribution/client/testutil/helpers.go
index e08d6a7fec0f..9b8b601321ef 100644
--- a/x/distribution/client/testutil/helpers.go
+++ b/x/distribution/client/testutil/helpers.go
@@ -43,8 +43,7 @@ func QueryRewards(f *cli.Fixtures, delAddr sdk.AccAddress, flags ...string) dist
 	require.Empty(f.T, errStr)
 
 	var rewards distribution.QueryDelegatorTotalRewardsResponse
-	err := f.Cdc.UnmarshalJSON([]byte(res), &rewards)
-	require.NoError(f.T, err)
+	require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(res), &rewards))
 	return rewards
 }