From 5d4220e3db93404b3b2cdf74c1efd42e2b4a99a8 Mon Sep 17 00:00:00 2001 From: Guy Garcia Date: Thu, 6 Jun 2024 16:58:29 -0400 Subject: [PATCH] Changed feature name --- packages/proto/Cargo.toml | 2 +- ...vanced.rs => archway.cwica.v1.abstract.rs} | 0 ...anced.rs => archway.genmsg.v1.abstract.rs} | 0 ...ced.rs => cosmos.app.v1alpha1.abstract.rs} | 0 ...ced.rs => cosmos.auth.v1beta1.abstract.rs} | 0 ...ed.rs => cosmos.authz.v1beta1.abstract.rs} | 0 ...s => cosmos.base.abci.v1beta1.abstract.rs} | 0 ...osmos.base.tendermint.v1beta1.abstract.rs} | 0 ...s => cosmos.crypto.keyring.v1.abstract.rs} | 0 ....rs => cosmos.crypto.multisig.abstract.rs} | 0 ...rs => cosmos.evidence.v1beta1.abstract.rs} | 0 ...rs => cosmos.feegrant.v1beta1.abstract.rs} | 0 ....advanced.rs => cosmos.gov.v1.abstract.rs} | 0 ...nced.rs => cosmos.gov.v1beta1.abstract.rs} | 0 ...dvanced.rs => cosmos.group.v1.abstract.rs} | 0 ...nced.rs => cosmos.nft.v1beta1.abstract.rs} | 0 ... => cosmos.orm.query.v1alpha1.abstract.rs} | 0 ....rs => cosmos.staking.v1beta1.abstract.rs} | 0 ... => cosmos.tx.signing.v1beta1.abstract.rs} | 0 ...anced.rs => cosmos.tx.v1beta1.abstract.rs} | 0 ....rs => cosmos.upgrade.v1beta1.abstract.rs} | 0 ....rs => cosmos.vesting.v1beta1.abstract.rs} | 0 ...vanced.rs => cosmwasm.wasm.v1.abstract.rs} | 0 ...ations.interchain_accounts.v1.abstract.rs} | 0 ...ced.rs => ibc.core.channel.v1.abstract.rs} | 0 ...nced.rs => ibc.core.client.v1.abstract.rs} | 0 ....rs => ibc.core.connection.v1.abstract.rs} | 0 ...anced.rs => ibc.core.types.v1.abstract.rs} | 0 ...c.lightclients.solomachine.v2.abstract.rs} | 0 ...c.lightclients.solomachine.v3.abstract.rs} | 0 packages/proto/src/gen/mod.rs | 174 +++++++++--------- packages/proto/src/lib.rs | 2 +- proto-build/README.md | 8 + proto-build/src/parser.rs | 6 +- 34 files changed, 100 insertions(+), 92 deletions(-) rename packages/proto/src/gen/{archway.cwica.v1.advanced.rs => archway.cwica.v1.abstract.rs} (100%) rename packages/proto/src/gen/{archway.genmsg.v1.advanced.rs => archway.genmsg.v1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.app.v1alpha1.advanced.rs => cosmos.app.v1alpha1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.auth.v1beta1.advanced.rs => cosmos.auth.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.authz.v1beta1.advanced.rs => cosmos.authz.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.base.abci.v1beta1.advanced.rs => cosmos.base.abci.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.base.tendermint.v1beta1.advanced.rs => cosmos.base.tendermint.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.crypto.keyring.v1.advanced.rs => cosmos.crypto.keyring.v1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.crypto.multisig.advanced.rs => cosmos.crypto.multisig.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.evidence.v1beta1.advanced.rs => cosmos.evidence.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.feegrant.v1beta1.advanced.rs => cosmos.feegrant.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.gov.v1.advanced.rs => cosmos.gov.v1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.gov.v1beta1.advanced.rs => cosmos.gov.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.group.v1.advanced.rs => cosmos.group.v1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.nft.v1beta1.advanced.rs => cosmos.nft.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.orm.query.v1alpha1.advanced.rs => cosmos.orm.query.v1alpha1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.staking.v1beta1.advanced.rs => cosmos.staking.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.tx.signing.v1beta1.advanced.rs => cosmos.tx.signing.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.tx.v1beta1.advanced.rs => cosmos.tx.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.upgrade.v1beta1.advanced.rs => cosmos.upgrade.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmos.vesting.v1beta1.advanced.rs => cosmos.vesting.v1beta1.abstract.rs} (100%) rename packages/proto/src/gen/{cosmwasm.wasm.v1.advanced.rs => cosmwasm.wasm.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.applications.interchain_accounts.v1.advanced.rs => ibc.applications.interchain_accounts.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.core.channel.v1.advanced.rs => ibc.core.channel.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.core.client.v1.advanced.rs => ibc.core.client.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.core.connection.v1.advanced.rs => ibc.core.connection.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.core.types.v1.advanced.rs => ibc.core.types.v1.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.lightclients.solomachine.v2.advanced.rs => ibc.lightclients.solomachine.v2.abstract.rs} (100%) rename packages/proto/src/gen/{ibc.lightclients.solomachine.v3.advanced.rs => ibc.lightclients.solomachine.v3.abstract.rs} (100%) create mode 100644 proto-build/README.md diff --git a/packages/proto/Cargo.toml b/packages/proto/Cargo.toml index 927090f..04405dc 100644 --- a/packages/proto/Cargo.toml +++ b/packages/proto/Cargo.toml @@ -47,7 +47,7 @@ grpc = ["tonic", "tendermint-proto/grpc"] cosmwasm = [] proto-descriptor = [] # Replaces all structs that use Any with a generic type -replace-any = [] +abstract-any = [] [package.metadata.docs.rs] all-features = true diff --git a/packages/proto/src/gen/archway.cwica.v1.advanced.rs b/packages/proto/src/gen/archway.cwica.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/archway.cwica.v1.advanced.rs rename to packages/proto/src/gen/archway.cwica.v1.abstract.rs diff --git a/packages/proto/src/gen/archway.genmsg.v1.advanced.rs b/packages/proto/src/gen/archway.genmsg.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/archway.genmsg.v1.advanced.rs rename to packages/proto/src/gen/archway.genmsg.v1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.app.v1alpha1.advanced.rs b/packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.app.v1alpha1.advanced.rs rename to packages/proto/src/gen/cosmos.app.v1alpha1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.auth.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.auth.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.auth.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.authz.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.authz.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.authz.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.base.abci.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.base.abci.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.base.abci.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.base.tendermint.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.base.tendermint.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.crypto.keyring.v1.advanced.rs b/packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.crypto.keyring.v1.advanced.rs rename to packages/proto/src/gen/cosmos.crypto.keyring.v1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.crypto.multisig.advanced.rs b/packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.crypto.multisig.advanced.rs rename to packages/proto/src/gen/cosmos.crypto.multisig.abstract.rs diff --git a/packages/proto/src/gen/cosmos.evidence.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.evidence.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.evidence.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.feegrant.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.feegrant.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.feegrant.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.gov.v1.advanced.rs b/packages/proto/src/gen/cosmos.gov.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.gov.v1.advanced.rs rename to packages/proto/src/gen/cosmos.gov.v1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.gov.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.gov.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.gov.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.group.v1.advanced.rs b/packages/proto/src/gen/cosmos.group.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.group.v1.advanced.rs rename to packages/proto/src/gen/cosmos.group.v1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.nft.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.nft.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.nft.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.orm.query.v1alpha1.advanced.rs b/packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.orm.query.v1alpha1.advanced.rs rename to packages/proto/src/gen/cosmos.orm.query.v1alpha1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.staking.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.staking.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.staking.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.tx.signing.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.tx.signing.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.tx.signing.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.tx.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.tx.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.tx.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.upgrade.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.upgrade.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.upgrade.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmos.vesting.v1beta1.advanced.rs b/packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmos.vesting.v1beta1.advanced.rs rename to packages/proto/src/gen/cosmos.vesting.v1beta1.abstract.rs diff --git a/packages/proto/src/gen/cosmwasm.wasm.v1.advanced.rs b/packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/cosmwasm.wasm.v1.advanced.rs rename to packages/proto/src/gen/cosmwasm.wasm.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.advanced.rs b/packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.applications.interchain_accounts.v1.advanced.rs rename to packages/proto/src/gen/ibc.applications.interchain_accounts.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.core.channel.v1.advanced.rs b/packages/proto/src/gen/ibc.core.channel.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.core.channel.v1.advanced.rs rename to packages/proto/src/gen/ibc.core.channel.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.core.client.v1.advanced.rs b/packages/proto/src/gen/ibc.core.client.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.core.client.v1.advanced.rs rename to packages/proto/src/gen/ibc.core.client.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.core.connection.v1.advanced.rs b/packages/proto/src/gen/ibc.core.connection.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.core.connection.v1.advanced.rs rename to packages/proto/src/gen/ibc.core.connection.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.core.types.v1.advanced.rs b/packages/proto/src/gen/ibc.core.types.v1.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.core.types.v1.advanced.rs rename to packages/proto/src/gen/ibc.core.types.v1.abstract.rs diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v2.advanced.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.lightclients.solomachine.v2.advanced.rs rename to packages/proto/src/gen/ibc.lightclients.solomachine.v2.abstract.rs diff --git a/packages/proto/src/gen/ibc.lightclients.solomachine.v3.advanced.rs b/packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs similarity index 100% rename from packages/proto/src/gen/ibc.lightclients.solomachine.v3.advanced.rs rename to packages/proto/src/gen/ibc.lightclients.solomachine.v3.abstract.rs diff --git a/packages/proto/src/gen/mod.rs b/packages/proto/src/gen/mod.rs index 4dd9e3d..b62947a 100644 --- a/packages/proto/src/gen/mod.rs +++ b/packages/proto/src/gen/mod.rs @@ -24,20 +24,20 @@ pub mod archway { pub mod cwica { // @@protoc_insertion_point(attribute:archway.cwica.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("archway.cwica.v1.rs"); - #[cfg(feature = "replace-any")] - include!("archway.cwica.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("archway.cwica.v1.abstract.rs"); // @@protoc_insertion_point(archway.cwica.v1) } } pub mod genmsg { // @@protoc_insertion_point(attribute:archway.genmsg.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("archway.genmsg.v1.rs"); - #[cfg(feature = "replace-any")] - include!("archway.genmsg.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("archway.genmsg.v1.abstract.rs"); // @@protoc_insertion_point(archway.genmsg.v1) } } @@ -67,10 +67,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.app.v1alpha1) pub mod v1alpha1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.app.v1alpha1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.app.v1alpha1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.app.v1alpha1.abstract.rs"); // @@protoc_insertion_point(cosmos.app.v1alpha1) } } @@ -84,10 +84,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.auth.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.auth.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.auth.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.auth.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.auth.v1beta1) } } @@ -101,10 +101,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.authz.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.authz.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.authz.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.authz.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.authz.v1beta1) } } @@ -133,10 +133,10 @@ pub mod cosmos { pub mod abci { // @@protoc_insertion_point(attribute:cosmos.base.abci.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.base.abci.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.base.abci.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.base.abci.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.base.abci.v1beta1) } } @@ -190,10 +190,10 @@ pub mod cosmos { pub mod tendermint { // @@protoc_insertion_point(attribute:cosmos.base.tendermint.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.base.tendermint.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.base.tendermint.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.base.tendermint.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.base.tendermint.v1beta1) } } @@ -261,19 +261,19 @@ pub mod cosmos { pub mod keyring { // @@protoc_insertion_point(attribute:cosmos.crypto.keyring.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.crypto.keyring.v1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.crypto.keyring.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.crypto.keyring.v1.abstract.rs"); // @@protoc_insertion_point(cosmos.crypto.keyring.v1) } } // @@protoc_insertion_point(attribute:cosmos.crypto.multisig) pub mod multisig { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.crypto.multisig.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.crypto.multisig.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.crypto.multisig.abstract.rs"); // @@protoc_insertion_point(cosmos.crypto.multisig) // @@protoc_insertion_point(attribute:cosmos.crypto.multisig.v1beta1) pub mod v1beta1 { @@ -316,10 +316,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.evidence.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.evidence.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.evidence.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.evidence.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.evidence.v1beta1) } } @@ -333,10 +333,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.feegrant.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.feegrant.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.feegrant.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.feegrant.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.feegrant.v1beta1) } } @@ -364,18 +364,18 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.gov.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.gov.v1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.gov.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.gov.v1.abstract.rs"); // @@protoc_insertion_point(cosmos.gov.v1) } // @@protoc_insertion_point(attribute:cosmos.gov.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.gov.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.gov.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.gov.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.gov.v1beta1) } } @@ -389,10 +389,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.group.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.group.v1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.group.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.group.v1.abstract.rs"); // @@protoc_insertion_point(cosmos.group.v1) } } @@ -434,10 +434,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.nft.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.nft.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.nft.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.nft.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.nft.v1beta1) } } @@ -452,10 +452,10 @@ pub mod cosmos { pub mod query { // @@protoc_insertion_point(attribute:cosmos.orm.query.v1alpha1) pub mod v1alpha1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.orm.query.v1alpha1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.orm.query.v1alpha1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.orm.query.v1alpha1.abstract.rs"); // @@protoc_insertion_point(cosmos.orm.query.v1alpha1) } } @@ -522,10 +522,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.staking.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.staking.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.staking.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.staking.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.staking.v1beta1) } } @@ -540,19 +540,19 @@ pub mod cosmos { pub mod signing { // @@protoc_insertion_point(attribute:cosmos.tx.signing.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.tx.signing.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.tx.signing.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.tx.signing.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.tx.signing.v1beta1) } } // @@protoc_insertion_point(attribute:cosmos.tx.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.tx.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.tx.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.tx.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.tx.v1beta1) } } @@ -566,10 +566,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.upgrade.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.upgrade.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.upgrade.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.upgrade.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.upgrade.v1beta1) } } @@ -583,10 +583,10 @@ pub mod cosmos { } // @@protoc_insertion_point(attribute:cosmos.vesting.v1beta1) pub mod v1beta1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmos.vesting.v1beta1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmos.vesting.v1beta1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmos.vesting.v1beta1.abstract.rs"); // @@protoc_insertion_point(cosmos.vesting.v1beta1) } } @@ -600,10 +600,10 @@ pub mod cosmwasm { pub mod wasm { // @@protoc_insertion_point(attribute:cosmwasm.wasm.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("cosmwasm.wasm.v1.rs"); - #[cfg(feature = "replace-any")] - include!("cosmwasm.wasm.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("cosmwasm.wasm.v1.abstract.rs"); // @@protoc_insertion_point(cosmwasm.wasm.v1) } } @@ -641,10 +641,10 @@ pub mod ibc { } // @@protoc_insertion_point(attribute:ibc.applications.interchain_accounts.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.applications.interchain_accounts.v1.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.applications.interchain_accounts.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.applications.interchain_accounts.v1.abstract.rs"); // @@protoc_insertion_point(ibc.applications.interchain_accounts.v1) } } @@ -665,20 +665,20 @@ pub mod ibc { pub mod channel { // @@protoc_insertion_point(attribute:ibc.core.channel.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.core.channel.v1.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.core.channel.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.core.channel.v1.abstract.rs"); // @@protoc_insertion_point(ibc.core.channel.v1) } } pub mod client { // @@protoc_insertion_point(attribute:ibc.core.client.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.core.client.v1.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.core.client.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.core.client.v1.abstract.rs"); // @@protoc_insertion_point(ibc.core.client.v1) } } @@ -692,20 +692,20 @@ pub mod ibc { pub mod connection { // @@protoc_insertion_point(attribute:ibc.core.connection.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.core.connection.v1.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.core.connection.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.core.connection.v1.abstract.rs"); // @@protoc_insertion_point(ibc.core.connection.v1) } } pub mod types { // @@protoc_insertion_point(attribute:ibc.core.types.v1) pub mod v1 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.core.types.v1.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.core.types.v1.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.core.types.v1.abstract.rs"); // @@protoc_insertion_point(ibc.core.types.v1) } } @@ -721,18 +721,18 @@ pub mod ibc { pub mod solomachine { // @@protoc_insertion_point(attribute:ibc.lightclients.solomachine.v2) pub mod v2 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.lightclients.solomachine.v2.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.lightclients.solomachine.v2.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.lightclients.solomachine.v2.abstract.rs"); // @@protoc_insertion_point(ibc.lightclients.solomachine.v2) } // @@protoc_insertion_point(attribute:ibc.lightclients.solomachine.v3) pub mod v3 { - #[cfg(not(feature = "replace-any"))] + #[cfg(not(feature = "abstract-any"))] include!("ibc.lightclients.solomachine.v3.rs"); - #[cfg(feature = "replace-any")] - include!("ibc.lightclients.solomachine.v3.advanced.rs"); + #[cfg(feature = "abstract-any")] + include!("ibc.lightclients.solomachine.v3.abstract.rs"); // @@protoc_insertion_point(ibc.lightclients.solomachine.v3) } } diff --git a/packages/proto/src/lib.rs b/packages/proto/src/lib.rs index a1f43ec..423f9de 100644 --- a/packages/proto/src/lib.rs +++ b/packages/proto/src/lib.rs @@ -5,7 +5,7 @@ #![forbid(unsafe_code)] #![warn(trivial_casts, trivial_numeric_casts, unused_import_braces)] -#[cfg(feature = "replace-any")] +#[cfg(feature = "abstract-any")] pub mod any; mod gen; diff --git a/proto-build/README.md b/proto-build/README.md new file mode 100644 index 0000000..3268491 --- /dev/null +++ b/proto-build/README.md @@ -0,0 +1,8 @@ +# Proto Build + +## Setup +### Buf +Head over to https://buf.build and install buf v1.31.0 + +# Generating Protos +Now simply run ``cargo run -p proto-build`` \ No newline at end of file diff --git a/proto-build/src/parser.rs b/proto-build/src/parser.rs index 90780f9..f0b8278 100644 --- a/proto-build/src/parser.rs +++ b/proto-build/src/parser.rs @@ -491,7 +491,7 @@ fn save(out_dir: &str, files: &BTreeMap)> for (file, (data, _)) in files.iter() { // Patch the mod file let file_regex = Regex::new(r"(\.[[:alnum:]]+\.)rs").unwrap(); - let new_file = file_regex.replace(file, "${1}advanced.rs").to_string(); + let new_file = file_regex.replace(file, "${1}abstract.rs").to_string(); patch_file( format!("{}/mod.rs", out_dir), @@ -502,9 +502,9 @@ fn save(out_dir: &str, files: &BTreeMap)> ), &format!( "\ - #[cfg(not(feature = \"replace-any\"))]\n\ + #[cfg(not(feature = \"abstract-any\"))]\n\ include!(\"{}\");\n\ - #[cfg(feature = \"replace-any\")]\n\ + #[cfg(feature = \"abstract-any\")]\n\ include!(\"{}\");\ ", file, new_file