CLI/Tests: Remove Fixtures (#6799)
* remove fixtures * setup tests * update x/mint * cli: update x/staking commands * tests: convert x/staking CLI tests * tests: fix x/auth CLI tests * cli updates * fix buiild * fix build * Update x/gov/client/cli/cli_test.go Co-authored-by: Amaury Martiny <amaury.martiny@protonmail.com> * remove GenerateOrBroadcastTx * move TestCLIQueryConn Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> Co-authored-by: Amaury Martiny <amaury.martiny@protonmail.com>
This commit is contained in:
co-authored by
Amaury Martiny
Federico Kunze
parent
6e7ce48b31
commit
0ccc48d2a3
+175
-183
@@ -1,195 +1,187 @@
|
||||
// +build cli_test
|
||||
|
||||
package cli_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/stretchr/testify/suite"
|
||||
"github.com/tendermint/tendermint/crypto/ed25519"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/tests"
|
||||
"github.com/cosmos/cosmos-sdk/tests/cli"
|
||||
"github.com/cosmos/cosmos-sdk/client"
|
||||
"github.com/cosmos/cosmos-sdk/client/flags"
|
||||
"github.com/cosmos/cosmos-sdk/crypto/hd"
|
||||
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
||||
"github.com/cosmos/cosmos-sdk/testutil"
|
||||
"github.com/cosmos/cosmos-sdk/testutil/network"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
bankclienttestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking/client/testutil"
|
||||
banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking/client/cli"
|
||||
)
|
||||
|
||||
func TestCLICreateValidator(t *testing.T) {
|
||||
t.SkipNow() // Recreate when using CLI tests.
|
||||
type IntegrationTestSuite struct {
|
||||
suite.Suite
|
||||
|
||||
t.Parallel()
|
||||
f := cli.InitFixtures(t)
|
||||
|
||||
// start simd server
|
||||
proc := f.SDStart()
|
||||
t.Cleanup(func() { proc.Stop(false) })
|
||||
|
||||
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)
|
||||
bankclienttestutil.TxSend(f, cli.KeyFoo, barAddr, sdk.NewCoin(cli.Denom, sendTokens), "-y")
|
||||
tests.WaitForNextNBlocksTM(1, f.Port)
|
||||
|
||||
require.Equal(t, sendTokens.String(), bankclienttestutil.QueryBalances(f, barAddr).AmountOf(cli.Denom).String())
|
||||
|
||||
// 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(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)
|
||||
|
||||
// Test --dry-run
|
||||
newValTokens := sdk.TokensFromConsensusPower(2)
|
||||
success, _, _ = testutil.TxStakingCreateValidator(f, barAddr.String(), consPubKey, sdk.NewCoin(cli.Denom, newValTokens), "--dry-run")
|
||||
require.True(t, success)
|
||||
|
||||
// Create the validator
|
||||
testutil.TxStakingCreateValidator(f, cli.KeyBar, consPubKey, sdk.NewCoin(cli.Denom, newValTokens), "-y")
|
||||
tests.WaitForNextNBlocksTM(1, f.Port)
|
||||
|
||||
// Ensure funds were deducted properly
|
||||
require.Equal(t, sendTokens.Sub(newValTokens), bankclienttestutil.QueryBalances(f, barAddr).AmountOf(cli.Denom))
|
||||
|
||||
// Ensure that validator state is as expected
|
||||
validator := testutil.QueryStakingValidator(f, barVal)
|
||||
require.Equal(t, validator.OperatorAddress, barVal)
|
||||
require.True(sdk.IntEq(t, newValTokens, validator.Tokens))
|
||||
|
||||
// Query delegations to the validator
|
||||
validatorDelegations := testutil.QueryStakingDelegationsTo(f, barVal)
|
||||
require.Len(t, validatorDelegations, 1)
|
||||
require.NotNil(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)
|
||||
tests.WaitForNextNBlocksTM(1, f.Port)
|
||||
|
||||
// Ensure bonded staking is correct
|
||||
remainingTokens := newValTokens.Sub(unbondAmt.Amount)
|
||||
validator = testutil.QueryStakingValidator(f, barVal)
|
||||
require.Equal(t, remainingTokens, validator.Tokens)
|
||||
|
||||
// Query for historical info
|
||||
require.NotEmpty(t, testutil.QueryStakingHistoricalInfo(f, 1))
|
||||
|
||||
// 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()
|
||||
cfg network.Config
|
||||
network *network.Network
|
||||
}
|
||||
|
||||
func (s *IntegrationTestSuite) SetupSuite() {
|
||||
s.T().Log("setting up integration test suite")
|
||||
|
||||
cfg := network.DefaultConfig()
|
||||
cfg.NumValidators = 1
|
||||
|
||||
s.cfg = cfg
|
||||
s.network = network.New(s.T(), cfg)
|
||||
|
||||
_, err := s.network.WaitForHeight(1)
|
||||
s.Require().NoError(err)
|
||||
}
|
||||
|
||||
func (s *IntegrationTestSuite) TearDownSuite() {
|
||||
s.T().Log("tearing down integration test suite")
|
||||
s.network.Cleanup()
|
||||
}
|
||||
|
||||
func (s *IntegrationTestSuite) TestNewCreateValidatorCmd() {
|
||||
val := s.network.Validators[0]
|
||||
|
||||
consPrivKey := ed25519.GenPrivKey()
|
||||
consPubKey, err := sdk.Bech32ifyPubKey(sdk.Bech32PubKeyTypeConsPub, consPrivKey.PubKey())
|
||||
s.Require().NoError(err)
|
||||
|
||||
info, _, err := val.ClientCtx.Keyring.NewMnemonic("NewValidator", keyring.English, sdk.FullFundraiserPath, hd.Secp256k1)
|
||||
s.Require().NoError(err)
|
||||
|
||||
newAddr := sdk.AccAddress(info.GetPubKey().Address())
|
||||
|
||||
_, err = banktestutil.MsgSendExec(
|
||||
val.ClientCtx,
|
||||
val.Address,
|
||||
newAddr,
|
||||
sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(200))), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
|
||||
)
|
||||
s.Require().NoError(err)
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
args []string
|
||||
expectErr bool
|
||||
respType fmt.Stringer
|
||||
expectedCode uint32
|
||||
}{
|
||||
{
|
||||
"invalid transaction (missing amount)",
|
||||
[]string{
|
||||
fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity),
|
||||
fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite),
|
||||
fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact),
|
||||
fmt.Sprintf("--%s='Hey, I am a new validator. Please delegate!'", cli.FlagDetails),
|
||||
fmt.Sprintf("--%s=0.5", cli.FlagCommissionRate),
|
||||
fmt.Sprintf("--%s=1.0", cli.FlagCommissionMaxRate),
|
||||
fmt.Sprintf("--%s=0.1", cli.FlagCommissionMaxChangeRate),
|
||||
fmt.Sprintf("--%s=1", cli.FlagMinSelfDelegation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr),
|
||||
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
|
||||
},
|
||||
true, nil, 0,
|
||||
},
|
||||
{
|
||||
"invalid transaction (missing pubkey)",
|
||||
[]string{
|
||||
fmt.Sprintf("--%s=100stake", cli.FlagAmount),
|
||||
fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity),
|
||||
fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite),
|
||||
fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact),
|
||||
fmt.Sprintf("--%s='Hey, I am a new validator. Please delegate!'", cli.FlagDetails),
|
||||
fmt.Sprintf("--%s=0.5", cli.FlagCommissionRate),
|
||||
fmt.Sprintf("--%s=1.0", cli.FlagCommissionMaxRate),
|
||||
fmt.Sprintf("--%s=0.1", cli.FlagCommissionMaxChangeRate),
|
||||
fmt.Sprintf("--%s=1", cli.FlagMinSelfDelegation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr),
|
||||
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
|
||||
},
|
||||
true, nil, 0,
|
||||
},
|
||||
{
|
||||
"invalid transaction (missing moniker)",
|
||||
[]string{
|
||||
fmt.Sprintf("--%s=%s", cli.FlagPubKey, consPubKey),
|
||||
fmt.Sprintf("--%s=100stake", cli.FlagAmount),
|
||||
fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity),
|
||||
fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite),
|
||||
fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact),
|
||||
fmt.Sprintf("--%s='Hey, I am a new validator. Please delegate!'", cli.FlagDetails),
|
||||
fmt.Sprintf("--%s=0.5", cli.FlagCommissionRate),
|
||||
fmt.Sprintf("--%s=1.0", cli.FlagCommissionMaxRate),
|
||||
fmt.Sprintf("--%s=0.1", cli.FlagCommissionMaxChangeRate),
|
||||
fmt.Sprintf("--%s=1", cli.FlagMinSelfDelegation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr),
|
||||
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
|
||||
},
|
||||
true, nil, 0,
|
||||
},
|
||||
{
|
||||
"valid transaction",
|
||||
[]string{
|
||||
fmt.Sprintf("--%s=%s", cli.FlagPubKey, consPubKey),
|
||||
fmt.Sprintf("--%s=100stake", cli.FlagAmount),
|
||||
fmt.Sprintf("--%s=NewValidator", cli.FlagMoniker),
|
||||
fmt.Sprintf("--%s=AFAF00C4", cli.FlagIdentity),
|
||||
fmt.Sprintf("--%s=https://newvalidator.io", cli.FlagWebsite),
|
||||
fmt.Sprintf("--%s=contact@newvalidator.io", cli.FlagSecurityContact),
|
||||
fmt.Sprintf("--%s='Hey, I am a new validator. Please delegate!'", cli.FlagDetails),
|
||||
fmt.Sprintf("--%s=0.5", cli.FlagCommissionRate),
|
||||
fmt.Sprintf("--%s=1.0", cli.FlagCommissionMaxRate),
|
||||
fmt.Sprintf("--%s=0.1", cli.FlagCommissionMaxChangeRate),
|
||||
fmt.Sprintf("--%s=1", cli.FlagMinSelfDelegation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFrom, newAddr),
|
||||
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
|
||||
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
|
||||
},
|
||||
false, &sdk.TxResponse{}, 0,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
|
||||
s.Run(tc.name, func() {
|
||||
cmd := cli.NewCreateValidatorCmd()
|
||||
_, out := testutil.ApplyMockIO(cmd)
|
||||
|
||||
clientCtx := val.ClientCtx.WithOutput(out)
|
||||
|
||||
ctx := context.Background()
|
||||
ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
|
||||
|
||||
out.Reset()
|
||||
cmd.SetArgs(tc.args)
|
||||
|
||||
err := cmd.ExecuteContext(ctx)
|
||||
if tc.expectErr {
|
||||
s.Require().Error(err)
|
||||
} else {
|
||||
s.Require().NoError(err, out.String())
|
||||
s.Require().NoError(clientCtx.JSONMarshaler.UnmarshalJSON(out.Bytes(), tc.respType), out.String())
|
||||
|
||||
txResp := tc.respType.(*sdk.TxResponse)
|
||||
s.Require().Equal(tc.expectedCode, txResp.Code, out.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestIntegrationTestSuite(t *testing.T) {
|
||||
suite.Run(t, new(IntegrationTestSuite))
|
||||
}
|
||||
|
||||
+27
-25
@@ -28,7 +28,7 @@ var (
|
||||
)
|
||||
|
||||
// NewTxCmd returns a root CLI command handler for all x/staking transaction commands.
|
||||
func NewTxCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewTxCmd() *cobra.Command {
|
||||
stakingTxCmd := &cobra.Command{
|
||||
Use: types.ModuleName,
|
||||
Short: "Staking transaction subcommands",
|
||||
@@ -38,22 +38,26 @@ func NewTxCmd(clientCtx client.Context) *cobra.Command {
|
||||
}
|
||||
|
||||
stakingTxCmd.AddCommand(
|
||||
NewCreateValidatorCmd(clientCtx),
|
||||
NewEditValidatorCmd(clientCtx),
|
||||
NewDelegateCmd(clientCtx),
|
||||
NewRedelegateCmd(clientCtx),
|
||||
NewUnbondCmd(clientCtx),
|
||||
NewCreateValidatorCmd(),
|
||||
NewEditValidatorCmd(),
|
||||
NewDelegateCmd(),
|
||||
NewRedelegateCmd(),
|
||||
NewUnbondCmd(),
|
||||
)
|
||||
|
||||
return stakingTxCmd
|
||||
}
|
||||
|
||||
func NewCreateValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewCreateValidatorCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "create-validator",
|
||||
Short: "create new validator initialized with a self-delegation to it",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
clientCtx.WithInput(cmd.InOrStdin())
|
||||
clientCtx := client.GetClientContextFromCmd(cmd)
|
||||
clientCtx, err := client.ReadTxCommandFlags(clientCtx, cmd.Flags())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
txf := tx.NewFactoryCLI(clientCtx, cmd.Flags()).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever)
|
||||
|
||||
@@ -61,6 +65,7 @@ func NewCreateValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg)
|
||||
},
|
||||
}
|
||||
@@ -83,12 +88,16 @@ func NewCreateValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
return cmd
|
||||
}
|
||||
|
||||
func NewEditValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewEditValidatorCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "edit-validator",
|
||||
Short: "edit an existing validator account",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
clientCtx := clientCtx.WithInput(cmd.InOrStdin())
|
||||
clientCtx := client.GetClientContextFromCmd(cmd)
|
||||
clientCtx, err := client.ReadTxCommandFlags(clientCtx, cmd.Flags())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
valAddr := clientCtx.GetFromAddress()
|
||||
|
||||
@@ -97,13 +106,7 @@ func NewEditValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
website, _ := cmd.Flags().GetString(FlagWebsite)
|
||||
security, _ := cmd.Flags().GetString(FlagSecurityContact)
|
||||
details, _ := cmd.Flags().GetString(FlagDetails)
|
||||
description := types.NewDescription(
|
||||
moniker,
|
||||
identity,
|
||||
website,
|
||||
security,
|
||||
details,
|
||||
)
|
||||
description := types.NewDescription(moniker, identity, website, security, details)
|
||||
|
||||
var newRate *sdk.Dec
|
||||
|
||||
@@ -134,8 +137,7 @@ func NewEditValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
// build and sign the transaction, then broadcast to Tendermint
|
||||
return tx.GenerateOrBroadcastTx(clientCtx, msg)
|
||||
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -147,7 +149,7 @@ func NewEditValidatorCmd(clientCtx client.Context) *cobra.Command {
|
||||
return cmd
|
||||
}
|
||||
|
||||
func NewDelegateCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewDelegateCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "delegate [validator-addr] [amount]",
|
||||
Args: cobra.ExactArgs(2),
|
||||
@@ -184,7 +186,7 @@ $ %s tx staking delegate cosmosvaloper1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 10
|
||||
return err
|
||||
}
|
||||
|
||||
return tx.GenerateOrBroadcastTx(clientCtx, msg)
|
||||
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -193,7 +195,7 @@ $ %s tx staking delegate cosmosvaloper1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 10
|
||||
return cmd
|
||||
}
|
||||
|
||||
func NewRedelegateCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewRedelegateCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "redelegate [src-validator-addr] [dst-validator-addr] [amount]",
|
||||
Short: "Redelegate illiquid tokens from one validator to another",
|
||||
@@ -235,7 +237,7 @@ $ %s tx staking redelegate cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj
|
||||
return err
|
||||
}
|
||||
|
||||
return tx.GenerateOrBroadcastTx(clientCtx, msg)
|
||||
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
|
||||
},
|
||||
}
|
||||
|
||||
@@ -244,7 +246,7 @@ $ %s tx staking redelegate cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj
|
||||
return cmd
|
||||
}
|
||||
|
||||
func NewUnbondCmd(clientCtx client.Context) *cobra.Command {
|
||||
func NewUnbondCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "unbond [validator-addr] [amount]",
|
||||
Short: "Unbond shares from a validator",
|
||||
@@ -281,7 +283,7 @@ $ %s tx staking unbond cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj 100s
|
||||
return err
|
||||
}
|
||||
|
||||
return tx.GenerateOrBroadcastTx(clientCtx, msg)
|
||||
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@@ -1,220 +0,0 @@
|
||||
package testutil
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
clientkeys "github.com/cosmos/cosmos-sdk/client/keys"
|
||||
"github.com/cosmos/cosmos-sdk/tests"
|
||||
"github.com/cosmos/cosmos-sdk/tests/cli"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
staking "github.com/cosmos/cosmos-sdk/x/staking/types"
|
||||
)
|
||||
|
||||
// TxStakingCreateValidator is simcli tx staking create-validator
|
||||
func TxStakingCreateValidator(f *cli.Fixtures, from, consPubKey string, amount sdk.Coin, flags ...string) (bool, string, string) {
|
||||
cmd := fmt.Sprintf("%s tx staking create-validator %v --keyring-backend=test --from=%s"+
|
||||
" --pubkey=%s", f.SimdBinary, f.Flags(), from, consPubKey)
|
||||
cmd += fmt.Sprintf(" --amount=%v --moniker=%v --commission-rate=%v", amount, from, "0.05")
|
||||
cmd += fmt.Sprintf(" --commission-max-rate=%v --commission-max-change-rate=%v", "0.20", "0.10")
|
||||
cmd += fmt.Sprintf(" --min-self-delegation=%v", "1")
|
||||
|
||||
return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
|
||||
}
|
||||
|
||||
// TxStakingEditValidator is simcli tx staking update validator info
|
||||
func TxStakingEditValidator(f *cli.Fixtures, from, moniker, website, identity, details string, flags ...string) (bool, string, string) {
|
||||
cmd := fmt.Sprintf("%s tx staking edit-validator %v --keyring-backend=test --from=%s", f.SimdBinary, f.Flags(), from)
|
||||
cmd += fmt.Sprintf(" --moniker=%v --website=%s", moniker, website)
|
||||
cmd += fmt.Sprintf(" --identity=%s --details=%s", identity, details)
|
||||
|
||||
return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
|
||||
}
|
||||
|
||||
// TxStakingUnbond is simcli tx staking unbond
|
||||
func TxStakingUnbond(f *cli.Fixtures, from, shares string, validator sdk.ValAddress, flags ...string) bool {
|
||||
cmd := fmt.Sprintf("%s tx staking unbond --keyring-backend=test %s %v --from=%s %v",
|
||||
f.SimdBinary, validator, shares, from, f.Flags())
|
||||
return cli.ExecuteWrite(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
|
||||
}
|
||||
|
||||
// TxStakingDelegate is simcli tx staking delegate
|
||||
func TxStakingDelegate(f *cli.Fixtures, from, valOperAddr string, amount sdk.Coin, flags ...string) (bool, string, string) {
|
||||
cmd := fmt.Sprintf("%s tx staking delegate %s %v --keyring-backend=test --from=%s %v", f.SimdBinary, valOperAddr, amount, from, f.Flags())
|
||||
return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
|
||||
}
|
||||
|
||||
// TxStakingRedelegate is simcli tx staking redelegate
|
||||
func TxStakingRedelegate(f *cli.Fixtures, from, srcVal, dstVal string, amount sdk.Coin, flags ...string) (bool, string, string) {
|
||||
cmd := fmt.Sprintf("%s tx staking redelegate %s %s %v --keyring-backend=test --from=%s %v", f.SimdBinary, srcVal, dstVal, amount, from, f.Flags())
|
||||
return cli.ExecuteWriteRetStdStreams(f.T, cli.AddFlags(cmd, flags), clientkeys.DefaultKeyPass)
|
||||
}
|
||||
|
||||
// QueryStakingValidator is simcli query staking validator
|
||||
func QueryStakingValidator(f *cli.Fixtures, valAddr sdk.ValAddress, flags ...string) staking.Validator {
|
||||
cmd := fmt.Sprintf("%s query staking validator %s %v", f.SimdBinary, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var validator staking.Validator
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &validator))
|
||||
|
||||
return validator
|
||||
}
|
||||
|
||||
// QueryStakingValidators is simcli query staking validators
|
||||
func QueryStakingValidators(f *cli.Fixtures, flags ...string) []staking.Validator {
|
||||
cmd := fmt.Sprintf("%s query staking validators %v", f.SimdBinary, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var validators []staking.Validator
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &validators))
|
||||
|
||||
return validators
|
||||
}
|
||||
|
||||
// QueryStakingUnbondingDelegationsFrom is simcli query staking unbonding-delegations-from
|
||||
func QueryStakingUnbondingDelegationsFrom(f *cli.Fixtures, valAddr sdk.ValAddress, flags ...string) []staking.UnbondingDelegation {
|
||||
cmd := fmt.Sprintf("%s query staking unbonding-delegations-from %s %v", f.SimdBinary, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var ubds []staking.UnbondingDelegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &ubds))
|
||||
|
||||
return ubds
|
||||
}
|
||||
|
||||
// QueryStakingDelegationsTo is simcli query staking delegations-to
|
||||
func QueryStakingDelegationsTo(f *cli.Fixtures, valAddr sdk.ValAddress, flags ...string) []staking.Delegation {
|
||||
cmd := fmt.Sprintf("%s query staking delegations-to %s %v", f.SimdBinary, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var delegations []staking.Delegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &delegations))
|
||||
|
||||
return delegations
|
||||
}
|
||||
|
||||
// QueryStakingPool is simcli query staking pool
|
||||
func QueryStakingPool(f *cli.Fixtures, flags ...string) staking.Pool {
|
||||
cmd := fmt.Sprintf("%s query staking pool %v", f.SimdBinary, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var pool staking.Pool
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &pool))
|
||||
|
||||
return pool
|
||||
}
|
||||
|
||||
// QueryStakingParameters is simcli query staking parameters
|
||||
func QueryStakingParameters(f *cli.Fixtures, flags ...string) staking.Params {
|
||||
cmd := fmt.Sprintf("%s query staking params %v", f.SimdBinary, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var params staking.Params
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), ¶ms))
|
||||
|
||||
return params
|
||||
}
|
||||
|
||||
// QueryStakingDelegation is simcli query staking delegation
|
||||
func QueryStakingDelegation(f *cli.Fixtures, from string, valAddr sdk.ValAddress, flags ...string) staking.Delegation {
|
||||
cmd := fmt.Sprintf("%s query staking delegation %s %s %v", f.SimdBinary, from, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var delegation staking.Delegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &delegation))
|
||||
|
||||
return delegation
|
||||
}
|
||||
|
||||
// QueryStakingDelegations is simcli query staking delegations
|
||||
func QueryStakingDelegations(f *cli.Fixtures, from string, flags ...string) []staking.Delegation {
|
||||
cmd := fmt.Sprintf("%s query staking delegations %s %v", f.SimdBinary, from, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var delegations []staking.Delegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &delegations))
|
||||
|
||||
return delegations
|
||||
}
|
||||
|
||||
// QueryStakingRedelegation is simcli query staking redelegation
|
||||
func QueryStakingRedelegation(f *cli.Fixtures, delAdrr, srcVal, dstVal string, flags ...string) []staking.RedelegationResponse {
|
||||
cmd := fmt.Sprintf("%s query staking redelegation %v %v %v %v", f.SimdBinary, delAdrr, srcVal, dstVal, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var redelegations []staking.RedelegationResponse
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &redelegations))
|
||||
|
||||
return redelegations
|
||||
}
|
||||
|
||||
// QueryStakingRedelegations is simcli query staking redelegation
|
||||
func QueryStakingRedelegations(f *cli.Fixtures, delAdrr string, flags ...string) []staking.RedelegationResponse {
|
||||
cmd := fmt.Sprintf("%s query staking redelegations %v %v", f.SimdBinary, delAdrr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var redelegations []staking.RedelegationResponse
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &redelegations))
|
||||
|
||||
return redelegations
|
||||
}
|
||||
|
||||
// QueryStakingRedelegationsFrom is simcli query staking redelegations-from
|
||||
func QueryStakingRedelegationsFrom(f *cli.Fixtures, valAddr string, flags ...string) []staking.RedelegationResponse {
|
||||
cmd := fmt.Sprintf("%s query staking redelegations-from %v %v", f.SimdBinary, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var redelegations []staking.RedelegationResponse
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &redelegations))
|
||||
|
||||
return redelegations
|
||||
}
|
||||
|
||||
// QueryStakingUnbondingDelegation is simcli query staking unbonding-delegation
|
||||
func QueryStakingUnbondingDelegation(f *cli.Fixtures, delAdrr, valAddr string, flags ...string) staking.UnbondingDelegation {
|
||||
cmd := fmt.Sprintf("%s query staking unbonding-delegation %v %v %v", f.SimdBinary, delAdrr, valAddr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var ubd staking.UnbondingDelegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &ubd))
|
||||
|
||||
return ubd
|
||||
}
|
||||
|
||||
// QueryStakingUnbondingDelegations is simcli query staking unbonding-delegations
|
||||
func QueryStakingUnbondingDelegations(f *cli.Fixtures, delAdrr string, flags ...string) []staking.UnbondingDelegation {
|
||||
cmd := fmt.Sprintf("%s query staking unbonding-delegations %v %v", f.SimdBinary, delAdrr, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var ubds []staking.UnbondingDelegation
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &ubds))
|
||||
|
||||
return ubds
|
||||
}
|
||||
|
||||
// QueryStakingHistoricalInfo is simcli query staking historical-info
|
||||
func QueryStakingHistoricalInfo(f *cli.Fixtures, height uint, flags ...string) staking.HistoricalInfo {
|
||||
cmd := fmt.Sprintf("%s query staking historical-info %d %v", f.SimdBinary, height, f.Flags())
|
||||
out, errStr := tests.ExecuteT(f.T, cli.AddFlags(cmd, flags), "")
|
||||
require.Empty(f.T, errStr)
|
||||
|
||||
var historicalInfo staking.HistoricalInfo
|
||||
require.NoError(f.T, f.Cdc.UnmarshalJSON([]byte(out), &historicalInfo))
|
||||
|
||||
return historicalInfo
|
||||
}
|
||||
+2
-2
@@ -68,8 +68,8 @@ func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Rout
|
||||
}
|
||||
|
||||
// GetTxCmd returns the root tx command for the staking module.
|
||||
func (AppModuleBasic) GetTxCmd(clientCtx client.Context) *cobra.Command {
|
||||
return cli.NewTxCmd(clientCtx)
|
||||
func (AppModuleBasic) GetTxCmd(_ client.Context) *cobra.Command {
|
||||
return cli.NewTxCmd()
|
||||
}
|
||||
|
||||
// GetQueryCmd returns no root query command for the staking module.
|
||||
|
||||
Reference in New Issue
Block a user