Missing cli tests for staking module

x/staking/client/cli/cli_test.go

@@ -26,6 +26,14 @@ func TestCLICreateValidator(t *testing.T) {
 	barAddr := f.KeyAddress(cli.KeyBar)
 	barVal := sdk.ValAddress(barAddr)
 
+	// Check for the params
+	params := testutil.QueryStakingParameters(f)
+	require.NotEmpty(t, params)
+
+	// Query for the staking pool
+	pool := testutil.QueryStakingPool(f)
+	require.NotEmpty(t, pool)
+
 	consPubKey := sdk.MustBech32ifyPubKey(sdk.Bech32PubKeyTypeConsPub, ed25519.GenPrivKey().PubKey())
 
 	sendTokens := sdk.TokensFromConsensusPower(10)
@@ -34,15 +42,15 @@ func TestCLICreateValidator(t *testing.T) {
 
 	require.Equal(t, sendTokens, bankclienttestutil.QueryBalances(f, barAddr).AmountOf(cli.Denom))
 
-	//Generate a create validator transaction and ensure correctness
+	// Generate a create validator transaction and ensure correctness
 	success, stdout, stderr := testutil.TxStakingCreateValidator(f, barAddr.String(), consPubKey, sdk.NewInt64Coin(cli.Denom, 2), "--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.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)
 
 	// Test --dry-run
 	newValTokens := sdk.TokensFromConsensusPower(2)
@@ -66,7 +74,38 @@ func TestCLICreateValidator(t *testing.T) {
 	require.Len(t, validatorDelegations, 1)
 	require.NotZero(t, validatorDelegations[0].Shares)
 
+	// Edit validator
+	// params to be changed in edit validator (NOTE: a validator can only change its commission once per day)
+	newMoniker := "test-moniker"
+	newWebsite := "https://cosmos.network"
+	newIdentity := "6A0D65E29A4CBC8D"
+	newDetails := "To-infinity-and-beyond!"
+
+	// Test --generate-only"
+	success, stdout, stderr = testutil.TxStakingEditValidator(f, barAddr.String(), newMoniker, newWebsite, newIdentity, newDetails, "--generate-only")
+	require.True(t, success)
+	require.True(t, success)
+	require.Empty(t, stderr)
+
+	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, _, _ = testutil.TxStakingEditValidator(f, cli.KeyBar, newMoniker, newWebsite, newIdentity, newDetails, "-y")
+	require.True(t, success)
+	tests.WaitForNextNBlocksTM(1, f.Port)
+
+	udpatedValidator := testutil.QueryStakingValidator(f, barVal)
+	require.Equal(t, udpatedValidator.Description.Moniker, newMoniker)
+	require.Equal(t, udpatedValidator.Description.Identity, newIdentity)
+	require.Equal(t, udpatedValidator.Description.Website, newWebsite)
+	require.Equal(t, udpatedValidator.Description.Details, newDetails)
+
 	// unbond a single share
+	validators := testutil.QueryStakingValidators(f)
+	require.Len(t, validators, 2)
+
 	unbondAmt := sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(1))
 	success = testutil.TxStakingUnbond(f, cli.KeyBar, unbondAmt.String(), barVal, "-y")
 	require.True(t, success)
@@ -77,11 +116,79 @@ func TestCLICreateValidator(t *testing.T) {
 	validator = testutil.QueryStakingValidator(f, barVal)
 	require.Equal(t, remainingTokens, validator.Tokens)
 
+	// Query for historical info
+	historicalInfo := testutil.QueryStakingHistoricalInfo(f, 1)
+	require.NotEmpty(t, historicalInfo)
+
 	// Get unbonding delegations from the validator
 	validatorUbds := testutil.QueryStakingUnbondingDelegationsFrom(f, barVal)
 	require.Len(t, validatorUbds, 1)
 	require.Len(t, validatorUbds[0].Entries, 1)
 	require.Equal(t, remainingTokens.String(), validatorUbds[0].Entries[0].Balance.String())
 
+	// Query staking unbonding delegation
+	ubd := testutil.QueryStakingUnbondingDelegation(f, barAddr.String(), barVal.String())
+	require.NotEmpty(t, ubd)
+
+	// Query staking unbonding delegations
+	ubds := testutil.QueryStakingUnbondingDelegations(f, barAddr.String())
+	require.Len(t, ubds, 1)
+
+	fooAddr := f.KeyAddress(cli.KeyFoo)
+
+	delegateTokens := sdk.TokensFromConsensusPower(2)
+	delegateAmount := sdk.NewCoin(cli.Denom, delegateTokens)
+
+	// Delegate txn
+	// Generate a create validator transaction and ensure correctness
+	success, stdout, stderr = testutil.TxStakingDelegate(f, fooAddr.String(), barVal.String(), delegateAmount, "--generate-only")
+	require.True(t, success)
+	require.Empty(t, stderr)
+
+	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)
+
+	// Delegate
+	success, _, err := testutil.TxStakingDelegate(f, cli.KeyFoo, barVal.String(), delegateAmount, "-y")
+	tests.WaitForNextNBlocksTM(1, f.Port)
+	require.Empty(t, err)
+	require.True(t, success)
+
+	// Query the delegation from foo address to barval
+	delegation := testutil.QueryStakingDelegation(f, fooAddr.String(), barVal)
+	require.NotZero(t, delegation.Shares)
+
+	// Query the delegations from foo address to barval
+	delegations := testutil.QueryStakingDelegations(f, barAddr.String())
+	require.Len(t, delegations, 1)
+
+	fooVal := sdk.ValAddress(fooAddr)
+
+	// Redelegate
+	success, stdout, stderr = testutil.TxStakingRedelegate(f, fooAddr.String(), barVal.String(), fooVal.String(), delegateAmount, "--generate-only")
+	require.True(t, success)
+	require.Empty(t, stderr)
+
+	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, _, err = testutil.TxStakingRedelegate(f, cli.KeyFoo, barVal.String(), fooVal.String(), delegateAmount, "-y")
+	tests.WaitForNextNBlocksTM(1, f.Port)
+	require.Empty(t, err)
+	require.True(t, success)
+
+	redelegation := testutil.QueryStakingRedelegation(f, fooAddr.String(), barVal.String(), fooVal.String())
+	require.Len(t, redelegation, 1)
+
+	redelegations := testutil.QueryStakingRedelegations(f, fooAddr.String())
+	require.Len(t, redelegations, 1)
+
+	redelegationsFrom := testutil.QueryStakingRedelegationsFrom(f, barVal.String())
+	require.Len(t, redelegationsFrom, 1)
+
 	f.Cleanup()
 }

x/staking/client/cli/query.go

@@ -399,8 +399,8 @@ $ %s query staking unbonding-delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld7
 				return err
 			}
 
-			ubd, err := types.UnmarshalUBD(types.ModuleCdc, res)
-			if err != nil {
+			var ubd types.UnbondingDelegation
+			if err = cdc.UnmarshalJSON(res, &ubd); err != nil {
 				return err
 			}
 
@@ -419,7 +419,7 @@ func GetCmdQueryUnbondingDelegations(queryRoute string, cdc *codec.Codec) *cobra
 			fmt.Sprintf(`Query unbonding delegations for an individual delegator.
 
 Example:
-$ %s query staking unbonding-delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p
+$ %s query staking unbonding-delegations cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p
 `,
 				version.ClientName,
 			),

x/staking/client/cli/tx.go

@@ -136,6 +136,10 @@ func NewEditValidatorCmd(clientCtx client.Context) *cobra.Command {
 		},
 	}
 
+	cmd.Flags().AddFlagSet(fsDescriptionEdit)
+	cmd.Flags().AddFlagSet(fsCommissionUpdate)
+	cmd.Flags().AddFlagSet(FsMinSelfDelegation)
+
 	return cmd
 }
 
@@ -175,9 +179,6 @@ $ %s tx staking delegate cosmosvaloper1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 10
 			return tx.GenerateOrBroadcastTx(clientCtx, msg)
 		},
 	}
-	cmd.Flags().AddFlagSet(fsDescriptionEdit)
-	cmd.Flags().AddFlagSet(fsCommissionUpdate)
-	cmd.Flags().AddFlagSet(FsMinSelfDelegation)
 
 	return cmd
 }