fix: move proto file to proto/cosmwasm/wasm/v1beta1

Finschia · Jul 20, 2021 · 44f7140 · 44f7140
1 parent 51ccedc
commit 44f7140
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/x/wasm/types/genesis.proto → proto/cosmwasm/wasm/v1beta1/genesis.proto b/x/wasm/types/genesis.proto → proto/cosmwasm/wasm/v1beta1/genesis.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
 package cosmwasm.wasm.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "types.proto";
-import "tx.proto";
+import "cosmwasm/wasm/v1beta1/types.proto";
+import "cosmwasm/wasm/v1beta1/tx.proto";
 
 option go_package = "github.com/line/lfb-sdk/x/wasm/types";
 

diff --git a/x/wasm/types/ibc.proto → proto/cosmwasm/wasm/v1beta1/ibc.proto b/x/wasm/types/ibc.proto → proto/cosmwasm/wasm/v1beta1/ibc.proto
diff --git a/x/wasm/types/proposal.proto → proto/cosmwasm/wasm/v1beta1/proposal.proto b/x/wasm/types/proposal.proto → proto/cosmwasm/wasm/v1beta1/proposal.proto
@@ -3,7 +3,7 @@ package cosmwasm.wasm.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "lfb/base/v1beta1/coin.proto";
-import "types.proto";
+import "cosmwasm/wasm/v1beta1/types.proto";
 
 option go_package                       = "github.com/line/lfb-sdk/x/wasm/types";
 option (gogoproto.goproto_stringer_all) = false;

diff --git a/x/wasm/types/query.proto → proto/cosmwasm/wasm/v1beta1/query.proto b/x/wasm/types/query.proto → proto/cosmwasm/wasm/v1beta1/query.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 package cosmwasm.wasm.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "types.proto";
+import "cosmwasm/wasm/v1beta1/types.proto";
 import "google/api/annotations.proto";
 import "lfb/base/query/v1beta1/pagination.proto";
 

diff --git a/x/wasm/types/tx.proto → proto/cosmwasm/wasm/v1beta1/tx.proto b/x/wasm/types/tx.proto → proto/cosmwasm/wasm/v1beta1/tx.proto
@@ -3,7 +3,7 @@ package cosmwasm.wasm.v1beta1;
 
 import "lfb/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
-import "types.proto";
+import "cosmwasm/wasm/v1beta1/types.proto";
 
 option go_package                      = "github.com/line/lfb-sdk/x/wasm/types";
 option (gogoproto.goproto_getters_all) = false;
@@ -14,6 +14,7 @@ service Msg {
   rpc StoreCode(MsgStoreCode) returns (MsgStoreCodeResponse);
   // Instantiate creates a new smart contract instance for the given code id.
   rpc InstantiateContract(MsgInstantiateContract) returns (MsgInstantiateContractResponse);
+  // StoreCodeAndInstantiatecontract upload code and instantiate a contract using it.
   rpc StoreCodeAndInstantiateContract(MsgStoreCodeAndInstantiateContract)
       returns (MsgStoreCodeAndInstantiateContractResponse);
   // Execute submits the given message data to a smart contract

diff --git a/x/wasm/types/types.proto → proto/cosmwasm/wasm/v1beta1/types.proto b/x/wasm/types/types.proto → proto/cosmwasm/wasm/v1beta1/types.proto
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -16,12 +16,11 @@ protoc_gen_gocosmos() {
 
 protoc_gen_gocosmos
 
-proto_dirs=$(find ./proto ./x/wasm/types -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
+proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
   buf protoc \
   -I "proto" \
   -I "third_party/proto" \
-  -I "x/wasm/types" \
   --gocosmos_out=plugins=interfacetype+grpc,\
 Mgoogle/protobuf/any.proto=github.com/line/lfb-sdk/codec/types:. \
   --grpc-gateway_out=logtostderr=true:. \