Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(e2e): remove queries as IntegrationTestSuite object #1780

Merged
merged 3 commits into from
Oct 5, 2022
Merged

chore(e2e): remove queries as IntegrationTestSuite object #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08bfeb6
remove queries as `IntegrationTestSuite` to use as a static method
Pantani Oct 4, 2022
2f8fa1a
Merge branch 'main' into chore/move-querie-file
Pantani Oct 4, 2022
52f9743
use module name as part of gaiad cli command
Pantani Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/e2e/e2e_distribution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (s *IntegrationTestSuite) testDistribution(
beforeBalance = sdk.NewCoin(uatomDenom, math.NewInt(0))
}

s.execSetWithrawAddress(s.chainA, 0, fees.String(), delegatorAddress, newWithdrawalAddress, homePath)
s.execSetWithdrawAddress(s.chainA, 0, fees.String(), delegatorAddress, newWithdrawalAddress, homePath)

// Verify
s.Require().Eventually(
Expand Down
135 changes: 90 additions & 45 deletions tests/e2e/e2e_exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@ import (
"context"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"

"cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
icamauth "github.com/cosmos/gaia/v8/x/icamauth/types"
"github.com/ory/dockertest/v3/docker"
)

Expand All @@ -22,8 +29,8 @@ func (s *IntegrationTestSuite) execBankSend(c *chain, valIdx int, from, to, amt,

gaiaCommand := []string{
gaiadBinary,
"tx",
"bank",
txCommand,
banktypes.ModuleName,
"send",
from,
to,
Expand All @@ -45,8 +52,8 @@ func (s *IntegrationTestSuite) execWithdrawAllRewards(c *chain, valIdx int, paye

gaiaCommand := []string{
gaiadBinary,
"tx",
"distribution",
txCommand,
distributiontypes.ModuleName,
"withdraw-all-rewards",
fmt.Sprintf("--%s=%s", flags.FlagFrom, payee),
fmt.Sprintf("--%s=%s", flags.FlagGasPrices, fees),
Expand All @@ -67,8 +74,8 @@ func (s *IntegrationTestSuite) execDistributionFundCommunityPool(c *chain, valId

gaiaCommand := []string{
gaiadBinary,
"tx",
"distribution",
txCommand,
distributiontypes.ModuleName,
"fund-community-pool",
amt,
fmt.Sprintf("--%s=%s", flags.FlagFrom, from),
Expand All @@ -91,8 +98,8 @@ func (s *IntegrationTestSuite) execGovSubmitLegacyGovProposal(c *chain, valIdx i

gaiaCommand := []string{
gaiadBinary,
"tx",
"gov",
txCommand,
govtypes.ModuleName,
"submit-legacy-proposal",
govProposalSubType,
govProposalPath,
Expand All @@ -116,8 +123,8 @@ func (s *IntegrationTestSuite) execGovDepositProposal(c *chain, valIdx int, subm

gaiaCommand := []string{
gaiadBinary,
"tx",
"gov",
txCommand,
govtypes.ModuleName,
"deposit",
fmt.Sprintf("%d", proposalId),
amount,
Expand All @@ -141,8 +148,8 @@ func (s *IntegrationTestSuite) execGovVoteProposal(c *chain, valIdx int, submitt

gaiaCommand := []string{
gaiadBinary,
"tx",
"gov",
txCommand,
govtypes.ModuleName,
"vote",
fmt.Sprintf("%d", proposalId),
vote,
Expand All @@ -166,8 +173,8 @@ func (s *IntegrationTestSuite) execGovWeightedVoteProposal(c *chain, valIdx int,

gaiaCommand := []string{
gaiadBinary,
"tx",
"gov",
txCommand,
govtypes.ModuleName,
"weighted-vote",
fmt.Sprintf("%d", proposalId),
vote,
Expand All @@ -191,8 +198,8 @@ func (s *IntegrationTestSuite) execGovSubmitProposal(c *chain, valIdx int, submi

gaiaCommand := []string{
gaiadBinary,
"tx",
"gov",
txCommand,
govtypes.ModuleName,
"submit-proposal",
govProposalPath,
fmt.Sprintf("--%s=%s", flags.FlagFrom, submitterAddr),
Expand All @@ -215,8 +222,8 @@ func (s *IntegrationTestSuite) execCreateGroup(c *chain, valIdx int, adminAddr,

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"create-group",
adminAddr,
metadata,
Expand All @@ -240,8 +247,8 @@ func (s *IntegrationTestSuite) execUpdateGroupMembers(c *chain, valIdx int, admi

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"update-group-members",
adminAddr,
groupId,
Expand All @@ -265,8 +272,8 @@ func (s *IntegrationTestSuite) executeCreateGroupPolicy(c *chain, valIdx int, ad

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"create-group-policy",
adminAddr,
groupId,
Expand All @@ -291,8 +298,8 @@ func (s *IntegrationTestSuite) executeSubmitGroupProposal(c *chain, valIdx int,

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"submit-proposal",
proposalPath,
fmt.Sprintf("--%s=%s", flags.FlagGasPrices, fees),
Expand All @@ -315,8 +322,8 @@ func (s *IntegrationTestSuite) executeVoteGroupProposal(c *chain, valIdx int, pr

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"vote",
proposalId,
voterAddress,
Expand All @@ -341,8 +348,8 @@ func (s *IntegrationTestSuite) executeExecGroupProposal(c *chain, valIdx int, pr

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"exec",
proposalId,
fmt.Sprintf("--%s=%s", flags.FlagFrom, proposerAddress),
Expand All @@ -365,8 +372,8 @@ func (s *IntegrationTestSuite) executeUpdateGroupAdmin(c *chain, valIdx int, adm

gaiaCommand := []string{
gaiadBinary,
"tx",
"group",
txCommand,
grouptypes.ModuleName,
"update-group-admin",
admin,
groupId,
Expand All @@ -388,7 +395,7 @@ func (s *IntegrationTestSuite) executeGKeysAddCommand(c *chain, valIdx int, name

gaiaCommand := []string{
gaiadBinary,
"keys",
keysCommand,
"add",
name,
fmt.Sprintf("--%s=%s", flags.FlagHome, home),
Expand All @@ -413,7 +420,7 @@ func (s *IntegrationTestSuite) executeKeysList(c *chain, valIdx int, home string

gaiaCommand := []string{
gaiadBinary,
"keys",
keysCommand,
"list",
"--keyring-backend=test",
fmt.Sprintf("--%s=%s", flags.FlagHome, home),
Expand All @@ -433,8 +440,8 @@ func (s *IntegrationTestSuite) executeDelegate(c *chain, valIdx int, amount, val

gaiaCommand := []string{
gaiadBinary,
"tx",
"staking",
txCommand,
stakingtypes.ModuleName,
"delegate",
valOperAddress,
amount,
Expand All @@ -461,8 +468,8 @@ func (s *IntegrationTestSuite) executeRedelegate(c *chain, valIdx int, amount, o

gaiaCommand := []string{
gaiadBinary,
"tx",
"staking",
txCommand,
stakingtypes.ModuleName,
"redelegate",
originalValOperAddress,
newValOperAddress,
Expand All @@ -481,7 +488,45 @@ func (s *IntegrationTestSuite) executeRedelegate(c *chain, valIdx int, amount, o
s.T().Logf("%s successfully redelegated %s from %s to %s", delegatorAddr, amount, originalValOperAddress, newValOperAddress)
}

func (s *IntegrationTestSuite) execSetWithrawAddress(
func (s *IntegrationTestSuite) getLatestBlockHeight(c *chain, valIdx int) int {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
defer cancel()

type syncInfo struct {
SyncInfo struct {
LatestHeight string `json:"latest_block_height"`
} `json:"SyncInfo"`
}

var currentHeight int
gaiaCommand := []string{gaiadBinary, "status"}
s.executeGaiaTxCommand(ctx, c, gaiaCommand, valIdx, func(stdOut []byte, stdErr []byte) bool {
var (
err error
block syncInfo
)
s.Require().NoError(json.Unmarshal(stdErr, &block))
currentHeight, err = strconv.Atoi(block.SyncInfo.LatestHeight)
s.Require().NoError(err)
return currentHeight > 0
})
return currentHeight
}

func (s *IntegrationTestSuite) verifyBalanceChange(endpoint string, expectedAmount sdk.Coin, recipientAddress string) {
s.Require().Eventually(
func() bool {
afterAtomBalance, err := getSpecificBalance(endpoint, recipientAddress, uatomDenom)
s.Require().NoError(err)

return afterAtomBalance.IsEqual(expectedAmount)
},
20*time.Second,
5*time.Second,
)
}

func (s *IntegrationTestSuite) execSetWithdrawAddress(
c *chain,
valIdx int,
fees,
Expand All @@ -495,8 +540,8 @@ func (s *IntegrationTestSuite) execSetWithrawAddress(
s.T().Logf("Setting distribution withdrawal address on chain %s for %s to %s", c.id, delegatorAddress, newWithdrawalAddress)
gaiaCommand := []string{
gaiadBinary,
"tx",
"distribution",
txCommand,
distributiontypes.ModuleName,
"set-withdraw-addr",
newWithdrawalAddress,
fmt.Sprintf("--%s=%s", flags.FlagFrom, delegatorAddress),
Expand Down Expand Up @@ -525,8 +570,8 @@ func (s *IntegrationTestSuite) execWithdrawReward(
s.T().Logf("Withdrawing distribution rewards on chain %s for delegator %s from %s validator", c.id, delegatorAddress, validatorAddress)
gaiaCommand := []string{
gaiadBinary,
"tx",
"distribution",
txCommand,
distributiontypes.ModuleName,
"withdraw-rewards",
validatorAddress,
fmt.Sprintf("--%s=%s", flags.FlagFrom, delegatorAddress),
Expand Down Expand Up @@ -554,8 +599,8 @@ func (s *IntegrationTestSuite) submitICAtx(owner, connectionID, txJsonPath strin

submitTX := []string{
gaiadBinary,
"tx",
"icamauth",
txCommand,
icamauth.ModuleName,
"submit",
txJsonPath,
fmt.Sprintf("--%s=%s", flags.FlagFrom, owner),
Expand Down Expand Up @@ -583,8 +628,8 @@ func (s *IntegrationTestSuite) registerICA(owner, connectionID string) {

registerICAcmd := []string{
gaiadBinary,
"tx",
"icamauth",
txCommand,
icamauth.ModuleName,
"register",
fmt.Sprintf("--%s=%s", flags.FlagFrom, owner),
fmt.Sprintf("--%s=%s", "connection-id", connectionID),
Expand Down
14 changes: 7 additions & 7 deletions tests/e2e/e2e_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,26 @@ func (s *IntegrationTestSuite) GroupsSendMsgTest() {

s.T().Logf("Creating Group")
s.execCreateGroup(s.chainA, 0, adminAddr, "Cosmos Hub Group", filepath.Join(gaiaConfigPath, originalMembersFilename), fees.String())
membersRes, err := s.queryGroupMembers(chainAAPIEndpoint, 1)
membersRes, err := queryGroupMembers(chainAAPIEndpoint, 1)
s.Require().NoError(err)
s.Assert().Equal(len(membersRes.Members), 3)

s.T().Logf("Adding New Group Member")
s.execUpdateGroupMembers(s.chainA, 0, adminAddr, strconv.Itoa(groupId), filepath.Join(gaiaConfigPath, addMemberFilename), fees.String())
membersRes, err = s.queryGroupMembers(chainAAPIEndpoint, 1)
membersRes, err = queryGroupMembers(chainAAPIEndpoint, 1)
s.Require().NoError(err)
s.Assert().Equal(len(membersRes.Members), 4)

s.T().Logf("Removing New Group Member")
s.execUpdateGroupMembers(s.chainA, 0, adminAddr, strconv.Itoa(groupId), filepath.Join(gaiaConfigPath, removeMemberFilename), fees.String())
membersRes, err = s.queryGroupMembers(chainAAPIEndpoint, 1)
membersRes, err = queryGroupMembers(chainAAPIEndpoint, 1)
s.Require().NoError(err)
s.Assert().Equal(len(membersRes.Members), 3)

s.T().Logf("Creating Group Threshold Decision Policy")
s.writeGroupPolicies(s.chainA, thresholdPolicyFilename, percentagePolicyFilename, thresholdPolicy, percentagePolicy)
s.executeCreateGroupPolicy(s.chainA, 0, adminAddr, strconv.Itoa(groupId), thresholdPolicyMetadata, filepath.Join(gaiaConfigPath, thresholdPolicyFilename), fees.String())
policies, err := s.queryGroupPolicies(chainAAPIEndpoint, groupId)
policies, err := queryGroupPolicies(chainAAPIEndpoint, groupId)
s.Require().NoError(err)
policy, err := getPolicy(policies.GroupPolicies, thresholdPolicyMetadata, groupId)
s.Require().NoError(err)
Expand All @@ -109,7 +109,7 @@ func (s *IntegrationTestSuite) GroupsSendMsgTest() {

s.Require().Eventually(
func() bool {
proposalRes, err := s.queryGroupProposal(chainAAPIEndpoint, 1)
proposalRes, err := queryGroupProposal(chainAAPIEndpoint, 1)
s.Require().NoError(err)

return proposalRes.Proposal.Status == group.PROPOSAL_STATUS_ACCEPTED
Expand All @@ -126,7 +126,7 @@ func (s *IntegrationTestSuite) GroupsSendMsgTest() {
proposalId++
s.T().Logf("Creating Group Percentage Decision Policy")
s.executeCreateGroupPolicy(s.chainA, 0, adminAddr, strconv.Itoa(groupId), percentagePolicyMetadata, filepath.Join(gaiaConfigPath, percentagePolicyFilename), fees.String())
policies, err = s.queryGroupPolicies(chainAAPIEndpoint, 1)
policies, err = queryGroupPolicies(chainAAPIEndpoint, 1)
s.Require().NoError(err)
policy, err = getPolicy(policies.GroupPolicies, percentagePolicyMetadata, 1)
s.Require().NoError(err)
Expand All @@ -141,7 +141,7 @@ func (s *IntegrationTestSuite) GroupsSendMsgTest() {

s.Require().Eventually(
func() bool {
proposalRes, err := s.queryGroupProposalByGroupPolicy(chainAAPIEndpoint, policy.Address)
proposalRes, err := queryGroupProposalByGroupPolicy(chainAAPIEndpoint, policy.Address)
s.Require().NoError(err)

return proposalRes.Proposals[0].Status == group.PROPOSAL_STATUS_REJECTED
Expand Down
Loading