- Fix name folder for module bcna

- Fix queries (CLI) for bcna module
BitCannaGlobal · Feb 21, 2023 · 2e70a39 · 2e70a39
1 parent 5c4fbe0
commit 2e70a39
Show file tree

Hide file tree

Showing 25 changed files with 207 additions and 212 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+config.yml
diff --git a/build/bcnad b/build/bcnad
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -120,16 +120,6 @@ paths:
           in: query
           required: false
           type: boolean
-        - name: pagination.reverse
-          description: >-
-            reverse is set to true if results are to be returned in the
-            descending order.
-
-
-            Since: cosmos-sdk 0.43
-          in: query
-          required: false
-          type: boolean
       tags:
         - Query
   /BitCannaGlobal/bcna/bcna/bitcannaid/{id}:
@@ -336,16 +326,6 @@ paths:
           in: query
           required: false
           type: boolean
-        - name: pagination.reverse
-          description: >-
-            reverse is set to true if results are to be returned in the
-            descending order.
-
-
-            Since: cosmos-sdk 0.43
-          in: query
-          required: false
-          type: boolean
       tags:
         - Query
   /BitCannaGlobal/bcna/bcna/supplychain/{id}:

diff --git a/proto/bcna/bitcannaid.proto → proto/bcna/bcna/bitcannaid.proto b/proto/bcna/bitcannaid.proto → proto/bcna/bcna/bitcannaid.proto
diff --git a/proto/bcna/genesis.proto → proto/bcna/bcna/genesis.proto b/proto/bcna/genesis.proto → proto/bcna/bcna/genesis.proto
@@ -2,9 +2,9 @@ syntax = "proto3";
 package bitcannaglobal.bcna.bcna;
 
 import "gogoproto/gogo.proto";
-import "bcna/params.proto";
-import "bcna/bitcannaid.proto";
-import "bcna/supplychain.proto";
+import "bcna/bcna/params.proto";
+import "bcna/bcna/bitcannaid.proto";
+import "bcna/bcna/supplychain.proto";
 // this line is used by starport scaffolding # genesis/proto/import
 
 option go_package = "github.com/BitCannaGlobal/bcna/x/bcna/types";

diff --git a/proto/bcna/params.proto → proto/bcna/bcna/params.proto b/proto/bcna/params.proto → proto/bcna/bcna/params.proto
diff --git a/proto/bcna/query.proto → proto/bcna/bcna/query.proto b/proto/bcna/query.proto → proto/bcna/bcna/query.proto
@@ -4,9 +4,9 @@ package bitcannaglobal.bcna.bcna;
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "bcna/params.proto";
-import "bcna/bitcannaid.proto";
-import "bcna/supplychain.proto";
+import "bcna/bcna/params.proto";
+import "bcna/bcna/bitcannaid.proto";
+import "bcna/bcna/supplychain.proto";
 // this line is used by starport scaffolding # 1
 
 option go_package = "github.com/BitCannaGlobal/bcna/x/bcna/types";

diff --git a/proto/bcna/supplychain.proto → proto/bcna/bcna/supplychain.proto b/proto/bcna/supplychain.proto → proto/bcna/bcna/supplychain.proto
diff --git a/proto/bcna/tx.proto → proto/bcna/bcna/tx.proto b/proto/bcna/tx.proto → proto/bcna/bcna/tx.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 package bitcannaglobal.bcna.bcna;
 
-import "bcna/bitcannaid.proto";
-import "bcna/supplychain.proto";
+import "bcna/bcna/bitcannaid.proto";
+import "bcna/bcna/supplychain.proto";
 // this line is used by starport scaffolding # proto/tx/import
 
 option go_package = "github.com/BitCannaGlobal/bcna/x/bcna/types";

diff --git a/x/bcna/client/cli/query_bitcannaid.go b/x/bcna/client/cli/query_bitcannaid.go
@@ -14,8 +14,12 @@ func CmdListBitcannaid() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list-bitcannaid",
 		Short: "list all bitcannaid",
+		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
 
 			pageReq, err := client.ReadPageRequest(cmd.Flags())
 			if err != nil {
@@ -49,7 +53,10 @@ func CmdShowBitcannaid() *cobra.Command {
 		Short: "shows a bitcannaid",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
 
 			queryClient := types.NewQueryClient(clientCtx)
 

diff --git a/x/bcna/client/cli/query_supplychain.go b/x/bcna/client/cli/query_supplychain.go
@@ -13,9 +13,13 @@ import (
 func CmdListSupplychain() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "list-supplychain",
+		Args:  cobra.NoArgs,
 		Short: "list all supplychain",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
 
 			pageReq, err := client.ReadPageRequest(cmd.Flags())
 			if err != nil {
@@ -49,7 +53,10 @@ func CmdShowSupplychain() *cobra.Command {
 		Short: "shows a supplychain",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx := client.GetClientContextFromCmd(cmd)
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
 
 			queryClient := types.NewQueryClient(clientCtx)
 

diff --git a/x/bcna/keeper/grpc_query.go → x/bcna/keeper/query.go b/x/bcna/keeper/grpc_query.go → x/bcna/keeper/query.go
diff --git a/x/bcna/keeper/grpc_query_bitcannaid.go → x/bcna/keeper/query_bitcannaid.go b/x/bcna/keeper/grpc_query_bitcannaid.go → x/bcna/keeper/query_bitcannaid.go
diff --git a/x/bcna/keeper/grpc_query_bitcannaid_test.go → x/bcna/keeper/query_bitcannaid_test.go b/x/bcna/keeper/grpc_query_bitcannaid_test.go → x/bcna/keeper/query_bitcannaid_test.go
diff --git a/x/bcna/keeper/grpc_query_params.go → x/bcna/keeper/query_params.go b/x/bcna/keeper/grpc_query_params.go → x/bcna/keeper/query_params.go
diff --git a/x/bcna/keeper/grpc_query_params_test.go → x/bcna/keeper/query_params_test.go b/x/bcna/keeper/grpc_query_params_test.go → x/bcna/keeper/query_params_test.go
diff --git a/x/bcna/keeper/grpc_query_supplychain.go → x/bcna/keeper/query_supplychain.go b/x/bcna/keeper/grpc_query_supplychain.go → x/bcna/keeper/query_supplychain.go
diff --git a/x/bcna/keeper/grpc_query_supplychain_test.go → x/bcna/keeper/query_supplychain_test.go b/x/bcna/keeper/grpc_query_supplychain_test.go → x/bcna/keeper/query_supplychain_test.go
diff --git a/x/bcna/types/bitcannaid.pb.go b/x/bcna/types/bitcannaid.pb.go
diff --git a/x/bcna/types/genesis.pb.go b/x/bcna/types/genesis.pb.go
diff --git a/x/bcna/types/params.pb.go b/x/bcna/types/params.pb.go