imp(e2e): voting test passing

srdtrk · Dec 8, 2023 · a058d87 · a058d87
1 parent ead674a
commit a058d87
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/e2e/interchaintest/contract_test.go b/e2e/interchaintest/contract_test.go
@@ -403,9 +403,18 @@ func (s *ContractTestSuite) IcaContractExecutionTestWithEncoding(encoding string
 				},
 			},
 		}
+		// Vote on the proposal through CosmosMsgs:
+		voteCosmosMsg := types.ContractCosmosMsg{
+			Gov: &types.GovCosmosMsg{
+				Vote: &types.GovVoteCosmosMsg{
+					ProposalID: 1,
+					Vote:       "yes",
+				},
+			},
+		}
 
 		// Execute the contract:
-		err = s.Contract.ExecSendCosmosMsgs(ctx, wasmdUser.KeyName(), []types.ContractCosmosMsg{stakeCosmosMsg}, nil, nil)
+    err = s.Contract.ExecSendCosmosMsgs(ctx, wasmdUser.KeyName(), []types.ContractCosmosMsg{stakeCosmosMsg, voteCosmosMsg}, nil, nil)
 		s.Require().NoError(err)
 
 		err = testutil.WaitForBlocks(ctx, 5, wasmd, simd)
@@ -424,24 +433,26 @@ func (s *ContractTestSuite) IcaContractExecutionTestWithEncoding(encoding string
 
 		delegationsQuerier := mysuite.NewGRPCQuerier[stakingtypes.QueryDelegationResponse](s.T(), simd, "/cosmos.staking.v1beta1.Query/Delegation")
 
-		gRPCRequest := stakingtypes.QueryDelegationRequest{
+		delRequest := stakingtypes.QueryDelegationRequest{
 			DelegatorAddr: s.IcaAddress,
 			ValidatorAddr: validator,
 		}
-		resp, err := delegationsQuerier.GRPCQuery(ctx, &gRPCRequest)
+		delResp, err := delegationsQuerier.GRPCQuery(ctx, &delRequest)
 		s.Require().NoError(err)
+		s.Require().Equal(sdkmath.NewInt(10_000_000), delResp.DelegationResponse.Balance.Amount)
 
-		// response := resp.(*stakingtypes.QueryDelegationResponse)
-		s.Require().Equal(sdkmath.NewInt(10_000_000), resp.DelegationResponse.Balance.Amount)
+		// Check if the vote was successful:
+		votesQuerier := mysuite.NewGRPCQuerier[govtypes.QueryVoteResponse](s.T(), simd, "/cosmos.gov.v1beta1.Query/Vote")
 
-		// // Vote on the proposal through CosmosMsgs:
-		// voteCosmosMsg := types.ContractCosmosMsg {
-		//   Gov: &types.GovCosmosMsg{
-		//     Vote: &types.GovVoteCosmosMsg{
-		//       ProposalID: "1",
-		//     },
-		//   },
-		// }
+		voteRequest := govtypes.QueryVoteRequest{
+			ProposalId: 1,
+			Voter:      s.IcaAddress,
+		}
+		voteResp, err := votesQuerier.GRPCQuery(ctx, &voteRequest)
+		s.Require().NoError(err)
+		s.Require().Len(voteResp.Vote.Options, 1)
+		s.Require().Equal(govtypes.OptionYes, voteResp.Vote.Options[0].Option)
+		s.Require().Equal(sdkmath.LegacyNewDec(1), voteResp.Vote.Options[0].Weight)
 	})
 
 	s.Run(fmt.Sprintf("TestSendCustomIcaMessagesError-%s", encoding), func() {

diff --git a/e2e/interchaintest/types/cosmos_msg.go b/e2e/interchaintest/types/cosmos_msg.go
@@ -18,16 +18,16 @@ type StargateCosmosMsg struct {
 }
 
 type BankCosmosMsg struct {
-	Send *BankSendCosmosMsg `json:"send"`
+	Send *BankSendCosmosMsg `json:"send,omitempty"`
 }
 
 type IbcCosmosMsg struct {
-	Transfer *IbcTransferCosmosMsg `json:"transfer"`
+	Transfer *IbcTransferCosmosMsg `json:"transfer,omitempty"`
 }
 
 type GovCosmosMsg struct {
-	Vote         *GovVoteCosmosMsg         `json:"vote"`
-	VoteWeighted *GovVoteWeightedCosmosMsg `json:"vote_weighted"`
+	Vote         *GovVoteCosmosMsg         `json:"vote,omitempty"`
+	VoteWeighted *GovVoteWeightedCosmosMsg `json:"vote_weighted,omitempty"`
 }
 
 type StakingCosmosMsg struct {
@@ -61,23 +61,22 @@ type IbcTransferCosmosMsg struct {
 	ChannelID string `json:"channel_id"`
 	ToAddress string `json:"to_address"`
 	Amount    Coin   `json:"amount"`
-	// This is optional
 	// Timeout string `json:"timeout"`
 }
 
 type GovVoteCosmosMsg struct {
-	ProposalID string `json:"proposal_id"`
-	VoteOption string `json:"vote_option"`
+	ProposalID uint64 `json:"proposal_id"`
+	Vote       string `json:"vote"`
 }
 
 type GovVoteWeightedCosmosMsg struct {
-	ProposalID string                  `json:"proposal_id"`
+	ProposalID uint64                  `json:"proposal_id"`
 	Options    []GovVoteWeightedOption `json:"options"`
 }
 
 type GovVoteWeightedOption struct {
-	VoteOption string `json:"option"`
-	Weight     string `json:"weight"`
+	Option string `json:"option"`
+	Weight string `json:"weight"`
 }
 
 type Coin struct {