fix tests

bnb-chain · Aug 1, 2023 · 681b7fd · 681b7fd
1 parent 9a9e22f
commit 681b7fd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/e2e/tests/storage_test.go b/e2e/tests/storage_test.go
@@ -367,8 +367,8 @@ func (s *StorageTestSuite) TestLeaveGroup() {
 	s.Require().Equal(headGroupNftResponse.MetaData.GroupName, groupName)
 
 	// 3. ListGroup
-	queryListGroupReq := storagetypes.QueryListGroupRequest{GroupOwner: owner.GetAddr().String()}
-	queryListGroupResp, err := s.Client.ListGroup(ctx, &queryListGroupReq)
+	queryListGroupReq := storagetypes.QueryListGroupsRequest{GroupOwner: owner.GetAddr().String()}
+	queryListGroupResp, err := s.Client.ListGroups(ctx, &queryListGroupReq)
 	s.Require().NoError(err)
 	s.Require().GreaterOrEqual(len(queryListGroupResp.GroupInfos), 1)
 

diff --git a/x/payment/client/cli/query_test.go b/x/payment/client/cli/query_test.go
@@ -54,7 +54,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryGetPaymentAccountsByOwnerResponse{},
+			false, "", &types.QueryPaymentAccountsByOwnerResponse{},
 		},
 		{
 			"query list-auto-settle-record",
@@ -64,7 +64,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryAllAutoSettleRecordResponse{},
+			false, "", &types.QueryAutoSettleRecordsResponse{},
 		},
 		{
 			"query list-payment-account",
@@ -74,7 +74,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryAllPaymentAccountResponse{},
+			false, "", &types.QueryPaymentAccountsResponse{},
 		},
 		{
 			"query list-payment-account-count",
@@ -84,7 +84,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryAllPaymentAccountCountResponse{},
+			false, "", &types.QueryPaymentAccountCountsResponse{},
 		},
 		{
 			"query list-stream-record",
@@ -94,7 +94,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryAllStreamRecordResponse{},
+			false, "", &types.QueryStreamRecordsResponse{},
 		},
 		{
 			"query show-payment-account",
@@ -116,7 +116,7 @@ func (s *CLITestSuite) TestQueryCmd() {
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryGetPaymentAccountCountResponse{},
+			false, "", &types.QueryPaymentAccountCountResponse{},
 		},
 		{
 			"query show-stream-record",

diff --git a/x/storage/client/cli/query.go b/x/storage/client/cli/query.go
@@ -30,7 +30,7 @@ func GetQueryCmd() *cobra.Command {
 		CmdListObjects(),
 		CmdVerifyPermission(),
 		CmdHeadGroup(),
-		CmdListGroup(),
+		CmdListGroups(),
 		CmdHeadGroupMember())
 
 	// this line is used by starport scaffolding # 1
@@ -249,10 +249,10 @@ func CmdHeadGroup() *cobra.Command {
 	return cmd
 }
 
-func CmdListGroup() *cobra.Command {
+func CmdListGroups() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "list-group [group-owner]",
-		Short: "Query list group of owner",
+		Use:   "list-groups [group-owner]",
+		Short: "Query list groups of owner",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			reqGroupOwner := args[0]

diff --git a/x/storage/client/cli/query_test.go b/x/storage/client/cli/query_test.go
@@ -93,15 +93,15 @@ func (s *CLITestSuite) TestQueryCmd() {
 			false, "", &types.QueryListBucketsResponse{},
 		},
 		{
-			"query list-group",
+			"query list-groups",
 			append(
 				[]string{
-					"list-group",
+					"list-groups",
 					sample.RandAccAddressHex(),
 				},
 				commonFlags...,
 			),
-			false, "", &types.QueryListGroupResponse{},
+			false, "", &types.QueryListGroupsResponse{},
 		},
 		{
 			"query list-objects",

diff --git a/x/storage/keeper/grpc_query_test.go b/x/storage/keeper/grpc_query_test.go
@@ -337,17 +337,17 @@ func TestHeadGroup(t *testing.T) {
 func TestListGroup(t *testing.T) {
 	// invalid argument
 	k, ctx := makeKeeper(t)
-	_, err := k.ListGroup(ctx, nil)
+	_, err := k.ListGroups(ctx, nil)
 	require.ErrorContains(t, err, "invalid request")
 
-	_, err = k.ListGroup(ctx, &types.QueryListGroupRequest{
+	_, err = k.ListGroups(ctx, &types.QueryListGroupsRequest{
 		Pagination: &query.PageRequest{
 			Limit: types.MaxPaginationLimit + 1,
 		},
 	})
 	require.ErrorContains(t, err, "exceed pagination limit")
 
-	_, err = k.ListGroup(ctx, &types.QueryListGroupRequest{
+	_, err = k.ListGroups(ctx, &types.QueryListGroupsRequest{
 		GroupOwner: "xxx",
 	})
 	require.ErrorContains(t, err, "invalid address hex length")
@@ -356,7 +356,7 @@ func TestListGroup(t *testing.T) {
 func TestHeadGroupMember(t *testing.T) {
 	// invalid argument
 	k, ctx := makeKeeper(t)
-	_, err := k.ListGroup(ctx, nil)
+	_, err := k.ListGroups(ctx, nil)
 	require.ErrorContains(t, err, "invalid request")
 
 	_, err = k.HeadGroupMember(ctx, &types.QueryHeadGroupMemberRequest{