Problem: protobuf message urls should not change (#1044)

Solution: - revert the package name change introduced in #1023. - don't remember why we have to change it there, but it seems not nesserary, revert it to keep it backward compatible. Update CHANGELOG.md Signed-off-by: yihuang <huang@crypto.com> match protobuf package name with directory structure fix test
crypto-org-chain · Jul 9, 2024 · eca9a2c · eca9a2c
1 parent b6afee3
commit eca9a2c
Show file tree

Hide file tree

Showing 41 changed files with 711 additions and 683 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## UNRELEASED
 
 - [#1023](https://github.com/crypto-org-chain/chain-main/pull/1023) Integrate sdk 0.47
+- [#1044](https://github.com/crypto-org-chain/chain-main/pull/1044) Revert the protobuf package name changes introduced in #1023.
 
 *Dec 6, 2023*
 

diff --git a/integration_tests/test_nft.py b/integration_tests/test_nft.py
@@ -48,7 +48,7 @@ def test_create_nft_token(cluster):
     uri = "testuri"
     rsp = cluster.create_nft_token(singer1_addr, singer2_addr, denomid, tokenid, uri)
     ev = find_log_event_attrs(rsp["logs"], "message")
-    assert ev["action"] == "/nft.v1.MsgMintNFT", ev
+    assert ev["action"] == "/chainmain.nft.v1.MsgMintNFT", ev
 
 
 def test_query_nft_token(cluster):
@@ -67,7 +67,7 @@ def test_transfer_nft_token(cluster):
     singer2_addr = cluster.address("signer2")
     rsp = cluster.transfer_nft_token(singer2_addr, singer1_addr, denomid, tokenid)
     ev = find_log_event_attrs(rsp["logs"], "message")
-    assert ev["action"] == "/nft.v1.MsgTransferNFT", ev
+    assert ev["action"] == "/chainmain.nft.v1.MsgTransferNFT", ev
 
 
 def test_query_nft_token_again(cluster):

diff --git a/integration_tests/test_nft_transfer.py b/integration_tests/test_nft_transfer.py
@@ -99,7 +99,7 @@ def test_nft_transfer(cluster):
     if rsp["code"] == 0:
         rsp = cli_src.event_query_tx_for(rsp["txhash"])
     ev = find_log_event_attrs(rsp["logs"], "message")
-    assert ev["action"] == "/nft.v1.MsgMintNFT", ev
+    assert ev["action"] == "/chainmain.nft.v1.MsgMintNFT", ev
 
     # nft transfer that's supposed to fail, exceeds max receiver length
     rsp = json.loads(

diff --git a/proto/chainmain/v1/genesis.proto → proto/chainmain/chainmain/v1/genesis.proto b/proto/chainmain/v1/genesis.proto → proto/chainmain/chainmain/v1/genesis.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package chainmain.v1;
+package chainmain.chainmain.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/chainmain/types";
 

diff --git a/proto/icaauth/v1/genesis.proto → proto/chainmain/icaauth/v1/genesis.proto b/proto/icaauth/v1/genesis.proto → proto/chainmain/icaauth/v1/genesis.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
-package icaauth.v1;
+package chainmain.icaauth.v1;
 
 import "gogoproto/gogo.proto";
-import "icaauth/v1/params.proto";
+import "chainmain/icaauth/v1/params.proto";
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/icaauth/types";
 

diff --git a/proto/icaauth/v1/params.proto → proto/chainmain/icaauth/v1/params.proto b/proto/icaauth/v1/params.proto → proto/chainmain/icaauth/v1/params.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package icaauth.v1;
+package chainmain.icaauth.v1;
 
 import "google/protobuf/duration.proto";
 import "gogoproto/gogo.proto";
@@ -17,4 +17,4 @@ message Params {
     (gogoproto.stdduration) = true,
     (gogoproto.nullable)    = false
   ];
-}
+}
diff --git a/proto/icaauth/v1/query.proto → proto/chainmain/icaauth/v1/query.proto b/proto/icaauth/v1/query.proto → proto/chainmain/icaauth/v1/query.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package icaauth.v1;
+package chainmain.icaauth.v1;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "icaauth/v1/params.proto";
+import "chainmain/icaauth/v1/params.proto";
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/icaauth/types";
 

diff --git a/proto/icaauth/v1/tx.proto → proto/chainmain/icaauth/v1/tx.proto b/proto/icaauth/v1/tx.proto → proto/chainmain/icaauth/v1/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package icaauth.v1;
+package chainmain.icaauth.v1;
 
 import "cosmos_proto/cosmos.proto";
 import "google/protobuf/any.proto";
@@ -48,4 +48,4 @@ message MsgSubmitTx {
 }
 
 // MsgSubmitTxResponse defines the response message for MsgSubmitTx
-message MsgSubmitTxResponse {}
+message MsgSubmitTxResponse {}
diff --git a/proto/nft/v1/genesis.proto → proto/chainmain/nft/v1/genesis.proto b/proto/nft/v1/genesis.proto → proto/chainmain/nft/v1/genesis.proto
@@ -1,10 +1,10 @@
 // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
 // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
 syntax = "proto3";
-package nft.v1;
+package chainmain.nft.v1;
 
 import "gogoproto/gogo.proto";
-import "nft/v1/nft.proto";
+import "chainmain/nft/v1/nft.proto";
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft/types";
 

diff --git a/proto/nft/v1/nft.proto → proto/chainmain/nft/v1/nft.proto b/proto/nft/v1/nft.proto → proto/chainmain/nft/v1/nft.proto
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
 // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
 syntax = "proto3";
-package nft.v1;
+package chainmain.nft.v1;
 
 import "gogoproto/gogo.proto";
 
@@ -54,4 +54,4 @@ message Collection {
 
   Denom            denom = 1 [(gogoproto.nullable) = false];
   repeated BaseNFT nfts  = 2 [(gogoproto.customname) = "NFTs", (gogoproto.nullable) = false];
-}
+}
diff --git a/proto/nft/v1/query.proto → proto/chainmain/nft/v1/query.proto b/proto/nft/v1/query.proto → proto/chainmain/nft/v1/query.proto
@@ -1,11 +1,11 @@
 // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
 // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
 syntax = "proto3";
-package nft.v1;
+package chainmain.nft.v1;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "nft/v1/nft.proto";
+import "chainmain/nft/v1/nft.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft/types";
@@ -128,4 +128,4 @@ message QueryNFTRequest {
 // QueryNFTResponse is the response type for the Query/NFT RPC method
 message QueryNFTResponse {
   BaseNFT nft = 1 [(gogoproto.customname) = "NFT"];
-}
+}
diff --git a/proto/nft/v1/tx.proto → proto/chainmain/nft/v1/tx.proto b/proto/nft/v1/tx.proto → proto/chainmain/nft/v1/tx.proto
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
 // Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
 syntax = "proto3";
-package nft.v1;
+package chainmain.nft.v1;
 
 import "gogoproto/gogo.proto";
 
@@ -94,4 +94,4 @@ message MsgBurnNFT {
 }
 
 // MsgBurnNFTResponse defines the Msg/BurnNFT response type.
-message MsgBurnNFTResponse {}
+message MsgBurnNFTResponse {}
diff --git a/proto/nft_transfer/v1/genesis.proto → ...o/chainmain/nft_transfer/v1/genesis.proto b/proto/nft_transfer/v1/genesis.proto → ...o/chainmain/nft_transfer/v1/genesis.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
-package nft_transfer.v1;
+package chainmain.nft_transfer.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";
 
-import "nft_transfer/v1/trace.proto";
+import "chainmain/nft_transfer/v1/trace.proto";
 import "gogoproto/gogo.proto";
 
 // GenesisState defines the ibc-nft-transfer genesis state

diff --git a/proto/nft_transfer/v1/packet.proto → proto/chainmain/nft_transfer/v1/packet.proto b/proto/nft_transfer/v1/packet.proto → proto/chainmain/nft_transfer/v1/packet.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package nft_transfer.v1;
+package chainmain.nft_transfer.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";
 

diff --git a/proto/nft_transfer/v1/query.proto → proto/chainmain/nft_transfer/v1/query.proto b/proto/nft_transfer/v1/query.proto → proto/chainmain/nft_transfer/v1/query.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
-package nft_transfer.v1;
+package chainmain.nft_transfer.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";
 
 import "gogoproto/gogo.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "nft_transfer/v1/trace.proto";
+import "chainmain/nft_transfer/v1/trace.proto";
 import "google/api/annotations.proto";
 
 // Query provides defines the gRPC querier service.

diff --git a/proto/nft_transfer/v1/trace.proto → proto/chainmain/nft_transfer/v1/trace.proto b/proto/nft_transfer/v1/trace.proto → proto/chainmain/nft_transfer/v1/trace.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package nft_transfer.v1;
+package chainmain.nft_transfer.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";
 

diff --git a/proto/nft_transfer/v1/tx.proto → proto/chainmain/nft_transfer/v1/tx.proto b/proto/nft_transfer/v1/tx.proto → proto/chainmain/nft_transfer/v1/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package nft_transfer.v1;
+package chainmain.nft_transfer.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/nft-transfer/types";
 

diff --git a/proto/supply/v1/accounts.proto → proto/chainmain/supply/v1/accounts.proto b/proto/supply/v1/accounts.proto → proto/chainmain/supply/v1/accounts.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package supply.v1;
+package chainmain.supply.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";
 
 // VestingAccounts stored in keeper
 message VestingAccounts {
   // addresses defines addresses of all the vesting accounts at genesis
   repeated string addresses = 1;
-}
+}
diff --git a/proto/supply/v1/genesis.proto → proto/chainmain/supply/v1/genesis.proto b/proto/supply/v1/genesis.proto → proto/chainmain/supply/v1/genesis.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package supply.v1;
+package chainmain.supply.v1;
 
 option go_package = "github.com/crypto-org-chain/chain-main/x/supply/types";
 

diff --git a/proto/supply/v1/query.proto → proto/chainmain/supply/v1/query.proto b/proto/supply/v1/query.proto → proto/chainmain/supply/v1/query.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package supply.v1;
+package chainmain.supply.v1;
 
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
@@ -32,4 +32,4 @@ message SupplyResponse {
   // supply is the supply of the coins
   repeated cosmos.base.v1beta1.Coin supply = 1
       [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
-}
+}
diff --git a/x/chainmain/types/genesis.pb.go b/x/chainmain/types/genesis.pb.go
diff --git a/x/icaauth/types/genesis.pb.go b/x/icaauth/types/genesis.pb.go