From 226962f00bf12bd5b03e48bb52cfacbf9582c91e Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Thu, 18 Jul 2024 21:27:00 +0200 Subject: [PATCH] Update prost to v0.13 and tonic to v0.12 (#223) * Update prost to v0.13 and tonic to v0.12 * Re-generate protos * Use patch for `tendermint-proto` and `ics23` until they are released * Fix clippy warning * Use released crates * Add changelog entry --- .../223-prost-tonic-update.md | 1 + Cargo.toml | 8 +- src/google.rs | 3 +- src/prost/cosmos.auth.v1beta1.rs | 69 ++---- src/prost/cosmos.bank.v1beta1.rs | 69 ++---- src/prost/cosmos.base.abci.v1beta1.rs | 2 +- src/prost/cosmos.base.node.v1beta1.rs | 25 +- src/prost/cosmos.base.reflection.v1beta1.rs | 26 +- src/prost/cosmos.base.reflection.v2alpha1.rs | 40 +-- src/prost/cosmos.base.tendermint.v1beta1.rs | 39 +-- src/prost/cosmos.crypto.hd.v1.rs | 2 +- src/prost/cosmos.crypto.keyring.v1.rs | 6 +- src/prost/cosmos.gov.v1.rs | 76 ++---- src/prost/cosmos.gov.v1beta1.rs | 70 ++---- src/prost/cosmos.staking.v1beta1.rs | 85 ++----- src/prost/cosmos.tx.config.v1.rs | 2 +- src/prost/cosmos.tx.v1beta1.rs | 33 +-- src/prost/cosmos.upgrade.v1beta1.rs | 63 ++--- src/prost/google.protobuf.rs | 79 ++++-- src/prost/google.protobuf.serde.rs | 232 +++++++++++++++++- src/prost/ibc.applications.fee.v1.rs | 68 ++--- ...tions.interchain_accounts.controller.v1.rs | 59 ++--- ...pplications.interchain_accounts.host.v1.rs | 50 ++-- src/prost/ibc.applications.nft_transfer.v1.rs | 61 ++--- src/prost/ibc.applications.transfer.v1.rs | 62 ++--- src/prost/ibc.core.channel.v1.rs | 118 +++------ src/prost/ibc.core.client.v1.rs | 82 ++----- src/prost/ibc.core.connection.v1.rs | 71 ++---- src/prost/ibc.lightclients.localhost.v2.rs | 2 +- src/prost/ibc.lightclients.tendermint.v1.rs | 2 +- src/prost/ibc.lightclients.wasm.v1.rs | 53 ++-- src/prost/ibc.mock.rs | 6 +- .../interchain_security.ccv.consumer.v1.rs | 33 +-- .../interchain_security.ccv.provider.v1.rs | 76 ++---- src/prost/interchain_security.ccv.v1.rs | 8 +- src/prost/proto_descriptor.bin | Bin 762475 -> 765010 bytes src/prost/stride.interchainquery.v1.rs | 25 +- tools/proto-compiler/Cargo.toml | 6 +- 38 files changed, 680 insertions(+), 1032 deletions(-) create mode 100644 .changelog/unreleased/breaking-changes/223-prost-tonic-update.md diff --git a/.changelog/unreleased/breaking-changes/223-prost-tonic-update.md b/.changelog/unreleased/breaking-changes/223-prost-tonic-update.md new file mode 100644 index 00000000..6f21e5f0 --- /dev/null +++ b/.changelog/unreleased/breaking-changes/223-prost-tonic-update.md @@ -0,0 +1 @@ +- Update `prost` to v0.13 and `tonic` to v0.12 ([#223](https://github.com/cosmos/ibc-proto-rs/pull/223)) diff --git a/Cargo.toml b/Cargo.toml index 8dfb508e..3250c04b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,15 +28,15 @@ doctest = false all-features = true [dependencies] -prost = { version = "0.12.3", default-features = false, features = ["prost-derive"] } +prost = { version = "0.13", default-features = false, features = ["prost-derive"] } bytes = { version = "1.2", default-features = false } -tonic = { version = "0.11", default-features = false, optional = true } +tonic = { version = "0.12", default-features = false, optional = true } serde = { version = "1.0", default-features = false, optional = true } schemars = { version = "0.8", optional = true } subtle-encoding = { version = "0.5", default-features = false } base64 = { version = "0.22", default-features = false, features = ["alloc"] } flex-error = { version = "0.4", default-features = false } -ics23 = { version = "0.11.0", default-features = false } +ics23 = { version = "0.12.0", default-features = false } informalsystems-pbjson = { version = "0.7.0", optional = true, default-features = false } ## Optional: enabled by the `parity-scale-codec` feature @@ -48,7 +48,7 @@ scale-info = { version = "2.1.2", default-features = false, features = [ borsh = { version = "1", default-features = false, features = ["derive"], optional = true } [dependencies.tendermint-proto] -version = "0.37" +version = "0.38" default-features = false [dev-dependencies] diff --git a/src/google.rs b/src/google.rs index 882fe617..58a5106f 100644 --- a/src/google.rs +++ b/src/google.rs @@ -210,7 +210,8 @@ pub mod protobuf { type Error = TimestampOutOfSystemRangeError; fn try_from(mut timestamp: Timestamp) -> Result { - let orig_timestamp = timestamp.clone(); + let orig_timestamp = timestamp; + timestamp.normalize(); let system_time = if timestamp.seconds >= 0 { diff --git a/src/prost/cosmos.auth.v1beta1.rs b/src/prost/cosmos.auth.v1beta1.rs index 8de8da18..43a40dec 100644 --- a/src/prost/cosmos.auth.v1beta1.rs +++ b/src/prost/cosmos.auth.v1beta1.rs @@ -71,7 +71,7 @@ impl ::prost::Name for ModuleCredential { } /// Params defines the parameters for the auth module. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { #[prost(uint64, tag = "1")] pub max_memo_characters: u64, @@ -124,7 +124,7 @@ impl ::prost::Name for MsgUpdateParams { /// /// Since: cosmos-sdk 0.47 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -277,19 +277,17 @@ pub mod msg_server { /// Msg defines the x/auth Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -352,7 +350,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.auth.v1beta1.Msg/UpdateParams" => { #[allow(non_camel_case_types)] @@ -381,7 +378,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -403,8 +399,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -425,16 +424,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.auth.v1beta1.Msg"; } @@ -524,7 +513,7 @@ impl ::prost::Name for QueryAccountResponse { } /// QueryParamsRequest is the request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -538,7 +527,7 @@ impl ::prost::Name for QueryParamsRequest { } /// QueryParamsResponse is the response type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsResponse { /// params defines the parameters of the module. #[prost(message, optional, tag = "1")] @@ -558,7 +547,7 @@ impl ::prost::Name for QueryParamsResponse { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryModuleAccountsRequest {} impl ::prost::Name for QueryModuleAccountsRequest { const NAME: &'static str = "QueryModuleAccountsRequest"; @@ -627,7 +616,7 @@ impl ::prost::Name for QueryModuleAccountByNameResponse { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Bech32PrefixRequest {} impl ::prost::Name for Bech32PrefixRequest { const NAME: &'static str = "Bech32PrefixRequest"; @@ -738,7 +727,7 @@ impl ::prost::Name for AddressStringToBytesResponse { /// /// Since: cosmos-sdk 0.46.2 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryAccountAddressByIdRequest { /// Deprecated, use account_id instead /// @@ -1306,19 +1295,17 @@ pub mod query_server { /// Query defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1381,7 +1368,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.auth.v1beta1.Query/Accounts" => { #[allow(non_camel_case_types)] @@ -1412,7 +1398,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AccountsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1458,7 +1443,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AccountSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1506,7 +1490,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AccountAddressByIDSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1550,7 +1533,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1596,7 +1578,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ModuleAccountsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1644,7 +1625,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ModuleAccountByNameSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1690,7 +1670,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = Bech32PrefixSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1736,7 +1715,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AddressBytesToStringSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1782,7 +1760,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AddressStringToBytesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1828,7 +1805,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AccountInfoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1850,8 +1826,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1872,16 +1851,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.auth.v1beta1.Query"; } diff --git a/src/prost/cosmos.bank.v1beta1.rs b/src/prost/cosmos.bank.v1beta1.rs index 5b680942..51256193 100644 --- a/src/prost/cosmos.bank.v1beta1.rs +++ b/src/prost/cosmos.bank.v1beta1.rs @@ -203,7 +203,7 @@ impl ::prost::Name for MsgSend { } /// MsgSendResponse defines the Msg/Send response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSendResponse {} impl ::prost::Name for MsgSendResponse { const NAME: &'static str = "MsgSendResponse"; @@ -238,7 +238,7 @@ impl ::prost::Name for MsgMultiSend { } /// MsgMultiSendResponse defines the Msg/MultiSend response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgMultiSendResponse {} impl ::prost::Name for MsgMultiSendResponse { const NAME: &'static str = "MsgMultiSendResponse"; @@ -280,7 +280,7 @@ impl ::prost::Name for MsgUpdateParams { /// /// Since: cosmos-sdk 0.47 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -328,7 +328,7 @@ impl ::prost::Name for MsgSetSendEnabled { /// /// Since: cosmos-sdk 0.47 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSetSendEnabledResponse {} impl ::prost::Name for MsgSetSendEnabledResponse { const NAME: &'static str = "MsgSetSendEnabledResponse"; @@ -590,19 +590,17 @@ pub mod msg_server { /// Msg defines the bank Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -665,7 +663,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.bank.v1beta1.Msg/Send" => { #[allow(non_camel_case_types)] @@ -694,7 +691,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SendSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -738,7 +734,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = MultiSendSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -782,7 +777,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -826,7 +820,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SetSendEnabledSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -848,8 +841,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -870,16 +866,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.bank.v1beta1.Msg"; } @@ -1154,7 +1140,7 @@ impl ::prost::Name for QuerySupplyOfResponse { } /// QueryParamsRequest defines the request type for querying x/bank parameters. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -1939,19 +1925,17 @@ pub mod query_server { /// Query defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -2014,7 +1998,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.bank.v1beta1.Query/Balance" => { #[allow(non_camel_case_types)] @@ -2045,7 +2028,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = BalanceSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2091,7 +2073,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AllBalancesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2137,7 +2118,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SpendableBalancesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2187,7 +2167,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SpendableBalanceByDenomSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2233,7 +2212,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TotalSupplySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2279,7 +2257,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SupplyOfSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2323,7 +2300,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2369,7 +2345,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomMetadataSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2415,7 +2390,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomsMetadataSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2461,7 +2435,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomOwnersSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2507,7 +2480,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SendEnabledSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2529,8 +2501,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2551,16 +2526,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.bank.v1beta1.Query"; } diff --git a/src/prost/cosmos.base.abci.v1beta1.rs b/src/prost/cosmos.base.abci.v1beta1.rs index dd61d744..6a9a1b96 100644 --- a/src/prost/cosmos.base.abci.v1beta1.rs +++ b/src/prost/cosmos.base.abci.v1beta1.rs @@ -127,7 +127,7 @@ impl ::prost::Name for Attribute { } /// GasInfo defines tx execution gas context. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GasInfo { /// GasWanted is the maximum units of work we allow this tx to perform. #[prost(uint64, tag = "1")] diff --git a/src/prost/cosmos.base.node.v1beta1.rs b/src/prost/cosmos.base.node.v1beta1.rs index e454f017..c67ca56b 100644 --- a/src/prost/cosmos.base.node.v1beta1.rs +++ b/src/prost/cosmos.base.node.v1beta1.rs @@ -1,7 +1,7 @@ // This file is @generated by prost-build. /// ConfigRequest defines the request structure for the Config gRPC query. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ConfigRequest {} impl ::prost::Name for ConfigRequest { const NAME: &'static str = "ConfigRequest"; @@ -159,19 +159,17 @@ pub mod service_server { /// Service defines the gRPC querier service for node related queries. #[derive(Debug)] pub struct ServiceServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl ServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -234,7 +232,6 @@ pub mod service_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.base.node.v1beta1.Service/Config" => { #[allow(non_camel_case_types)] @@ -263,7 +260,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConfigSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -285,8 +281,11 @@ pub mod service_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -307,16 +306,6 @@ pub mod service_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for ServiceServer { const NAME: &'static str = "cosmos.base.node.v1beta1.Service"; } diff --git a/src/prost/cosmos.base.reflection.v1beta1.rs b/src/prost/cosmos.base.reflection.v1beta1.rs index 6f188820..27eaacf3 100644 --- a/src/prost/cosmos.base.reflection.v1beta1.rs +++ b/src/prost/cosmos.base.reflection.v1beta1.rs @@ -1,7 +1,7 @@ // This file is @generated by prost-build. /// ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ListAllInterfacesRequest {} impl ::prost::Name for ListAllInterfacesRequest { const NAME: &'static str = "ListAllInterfacesRequest"; @@ -253,19 +253,17 @@ pub mod reflection_service_server { /// ReflectionService defines a service for interface reflection. #[derive(Debug)] pub struct ReflectionServiceServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl ReflectionServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -328,7 +326,6 @@ pub mod reflection_service_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.base.reflection.v1beta1.ReflectionService/ListAllInterfaces" => { #[allow(non_camel_case_types)] @@ -363,7 +360,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ListAllInterfacesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -413,7 +409,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ListImplementationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -435,8 +430,11 @@ pub mod reflection_service_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -457,16 +455,6 @@ pub mod reflection_service_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for ReflectionServiceServer { const NAME: &'static str = "cosmos.base.reflection.v1beta1.ReflectionService"; diff --git a/src/prost/cosmos.base.reflection.v2alpha1.rs b/src/prost/cosmos.base.reflection.v2alpha1.rs index f4a409ac..59253201 100644 --- a/src/prost/cosmos.base.reflection.v2alpha1.rs +++ b/src/prost/cosmos.base.reflection.v2alpha1.rs @@ -252,7 +252,7 @@ impl ::prost::Name for MsgDescriptor { } /// GetAuthnDescriptorRequest is the request used for the GetAuthnDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetAuthnDescriptorRequest {} impl ::prost::Name for GetAuthnDescriptorRequest { const NAME: &'static str = "GetAuthnDescriptorRequest"; @@ -284,7 +284,7 @@ impl ::prost::Name for GetAuthnDescriptorResponse { } /// GetChainDescriptorRequest is the request used for the GetChainDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetChainDescriptorRequest {} impl ::prost::Name for GetChainDescriptorRequest { const NAME: &'static str = "GetChainDescriptorRequest"; @@ -316,7 +316,7 @@ impl ::prost::Name for GetChainDescriptorResponse { } /// GetCodecDescriptorRequest is the request used for the GetCodecDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetCodecDescriptorRequest {} impl ::prost::Name for GetCodecDescriptorRequest { const NAME: &'static str = "GetCodecDescriptorRequest"; @@ -348,7 +348,7 @@ impl ::prost::Name for GetCodecDescriptorResponse { } /// GetConfigurationDescriptorRequest is the request used for the GetConfigurationDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetConfigurationDescriptorRequest {} impl ::prost::Name for GetConfigurationDescriptorRequest { const NAME: &'static str = "GetConfigurationDescriptorRequest"; @@ -380,7 +380,7 @@ impl ::prost::Name for GetConfigurationDescriptorResponse { } /// GetQueryServicesDescriptorRequest is the request used for the GetQueryServicesDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetQueryServicesDescriptorRequest {} impl ::prost::Name for GetQueryServicesDescriptorRequest { const NAME: &'static str = "GetQueryServicesDescriptorRequest"; @@ -412,7 +412,7 @@ impl ::prost::Name for GetQueryServicesDescriptorResponse { } /// GetTxDescriptorRequest is the request used for the GetTxDescriptor RPC #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetTxDescriptorRequest {} impl ::prost::Name for GetTxDescriptorRequest { const NAME: &'static str = "GetTxDescriptorRequest"; @@ -848,19 +848,17 @@ pub mod reflection_service_server { /// ReflectionService defines a service for application reflection. #[derive(Debug)] pub struct ReflectionServiceServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl ReflectionServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -923,7 +921,6 @@ pub mod reflection_service_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.base.reflection.v2alpha1.ReflectionService/GetAuthnDescriptor" => { #[allow(non_camel_case_types)] @@ -958,7 +955,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetAuthnDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1008,7 +1004,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetChainDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1058,7 +1053,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetCodecDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1113,7 +1107,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetConfigurationDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1168,7 +1161,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetQueryServicesDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1215,7 +1207,6 @@ pub mod reflection_service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetTxDescriptorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1237,8 +1228,11 @@ pub mod reflection_service_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1259,16 +1253,6 @@ pub mod reflection_service_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for ReflectionServiceServer { const NAME: &'static str = "cosmos.base.reflection.v2alpha1.ReflectionService"; diff --git a/src/prost/cosmos.base.tendermint.v1beta1.rs b/src/prost/cosmos.base.tendermint.v1beta1.rs index 1009e500..5c4bee50 100644 --- a/src/prost/cosmos.base.tendermint.v1beta1.rs +++ b/src/prost/cosmos.base.tendermint.v1beta1.rs @@ -198,7 +198,7 @@ impl ::prost::Name for Validator { } /// GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetBlockByHeightRequest { #[prost(int64, tag = "1")] pub height: i64, @@ -238,7 +238,7 @@ impl ::prost::Name for GetBlockByHeightResponse { } /// GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetLatestBlockRequest {} impl ::prost::Name for GetLatestBlockRequest { const NAME: &'static str = "GetLatestBlockRequest"; @@ -275,7 +275,7 @@ impl ::prost::Name for GetLatestBlockResponse { } /// GetSyncingRequest is the request type for the Query/GetSyncing RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetSyncingRequest {} impl ::prost::Name for GetSyncingRequest { const NAME: &'static str = "GetSyncingRequest"; @@ -289,7 +289,7 @@ impl ::prost::Name for GetSyncingRequest { } /// GetSyncingResponse is the response type for the Query/GetSyncing RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetSyncingResponse { #[prost(bool, tag = "1")] pub syncing: bool, @@ -306,7 +306,7 @@ impl ::prost::Name for GetSyncingResponse { } /// GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetNodeInfoRequest {} impl ::prost::Name for GetNodeInfoRequest { const NAME: &'static str = "GetNodeInfoRequest"; @@ -882,19 +882,17 @@ pub mod service_server { /// Service defines the gRPC querier service for tendermint queries. #[derive(Debug)] pub struct ServiceServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl ServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -957,7 +955,6 @@ pub mod service_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.base.tendermint.v1beta1.Service/GetNodeInfo" => { #[allow(non_camel_case_types)] @@ -988,7 +985,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetNodeInfoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1034,7 +1030,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetSyncingSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1080,7 +1075,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetLatestBlockSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1126,7 +1120,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetBlockByHeightSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1173,7 +1166,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetLatestValidatorSetSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1222,7 +1214,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetValidatorSetByHeightSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1266,7 +1257,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ABCIQuerySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1288,8 +1278,11 @@ pub mod service_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1310,16 +1303,6 @@ pub mod service_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for ServiceServer { const NAME: &'static str = "cosmos.base.tendermint.v1beta1.Service"; } diff --git a/src/prost/cosmos.crypto.hd.v1.rs b/src/prost/cosmos.crypto.hd.v1.rs index 05732e83..a20ee312 100644 --- a/src/prost/cosmos.crypto.hd.v1.rs +++ b/src/prost/cosmos.crypto.hd.v1.rs @@ -1,7 +1,7 @@ // This file is @generated by prost-build. /// BIP44Params is used as path field in ledger item in Record. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Bip44Params { /// purpose is a constant set to 44' (or 0x8000002C) following the BIP43 recommendation #[prost(uint32, tag = "1")] diff --git a/src/prost/cosmos.crypto.keyring.v1.rs b/src/prost/cosmos.crypto.keyring.v1.rs index 2f4a0e2b..22ead0d6 100644 --- a/src/prost/cosmos.crypto.keyring.v1.rs +++ b/src/prost/cosmos.crypto.keyring.v1.rs @@ -39,7 +39,7 @@ pub mod record { } /// Ledger item #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Ledger { #[prost(message, optional, tag = "1")] pub path: ::core::option::Option, @@ -56,7 +56,7 @@ pub mod record { } /// Multi item #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Multi {} impl ::prost::Name for Multi { const NAME: &'static str = "Multi"; @@ -70,7 +70,7 @@ pub mod record { } /// Offline item #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Offline {} impl ::prost::Name for Offline { const NAME: &'static str = "Offline"; diff --git a/src/prost/cosmos.gov.v1.rs b/src/prost/cosmos.gov.v1.rs index 5617f868..b7086b3b 100644 --- a/src/prost/cosmos.gov.v1.rs +++ b/src/prost/cosmos.gov.v1.rs @@ -196,7 +196,7 @@ impl ::prost::Name for DepositParams { } /// VotingParams defines the params for voting on governance proposals. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VotingParams { /// Duration of the voting period. #[prost(message, optional, tag = "1")] @@ -425,7 +425,7 @@ impl ::prost::Name for MsgSubmitProposal { } /// MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitProposalResponse { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -465,7 +465,7 @@ impl ::prost::Name for MsgExecLegacyContent { } /// MsgExecLegacyContentResponse defines the Msg/ExecLegacyContent response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgExecLegacyContentResponse {} impl ::prost::Name for MsgExecLegacyContentResponse { const NAME: &'static str = "MsgExecLegacyContentResponse"; @@ -506,7 +506,7 @@ impl ::prost::Name for MsgVote { } /// MsgVoteResponse defines the Msg/Vote response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgVoteResponse {} impl ::prost::Name for MsgVoteResponse { const NAME: &'static str = "MsgVoteResponse"; @@ -547,7 +547,7 @@ impl ::prost::Name for MsgVoteWeighted { } /// MsgVoteWeightedResponse defines the Msg/VoteWeighted response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgVoteWeightedResponse {} impl ::prost::Name for MsgVoteWeightedResponse { const NAME: &'static str = "MsgVoteWeightedResponse"; @@ -585,7 +585,7 @@ impl ::prost::Name for MsgDeposit { } /// MsgDepositResponse defines the Msg/Deposit response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgDepositResponse {} impl ::prost::Name for MsgDepositResponse { const NAME: &'static str = "MsgDepositResponse"; @@ -627,7 +627,7 @@ impl ::prost::Name for MsgUpdateParams { /// /// Since: cosmos-sdk 0.47 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -945,19 +945,17 @@ pub mod msg_server { /// Msg defines the gov Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1020,7 +1018,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.gov.v1.Msg/SubmitProposal" => { #[allow(non_camel_case_types)] @@ -1049,7 +1046,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitProposalSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1093,7 +1089,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ExecLegacyContentSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1137,7 +1132,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1181,7 +1175,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteWeightedSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1225,7 +1218,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1269,7 +1261,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1291,8 +1282,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1313,23 +1307,13 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.gov.v1.Msg"; } } /// QueryProposalRequest is the request type for the Query/Proposal RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryProposalRequest { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -1642,7 +1626,7 @@ impl ::prost::Name for QueryDepositsResponse { } /// QueryTallyResultRequest is the request type for the Query/Tally RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryTallyResultRequest { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -2045,19 +2029,17 @@ pub mod query_server { /// Query defines the gRPC querier service for gov module #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -2120,7 +2102,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.gov.v1.Query/Proposal" => { #[allow(non_camel_case_types)] @@ -2151,7 +2132,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ProposalSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2197,7 +2177,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ProposalsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2241,7 +2220,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2285,7 +2263,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VotesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2329,7 +2306,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2375,7 +2351,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2421,7 +2396,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2467,7 +2441,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TallyResultSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2489,8 +2462,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2511,16 +2487,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.gov.v1.Query"; } diff --git a/src/prost/cosmos.gov.v1beta1.rs b/src/prost/cosmos.gov.v1beta1.rs index de0be35b..4028f192 100644 --- a/src/prost/cosmos.gov.v1beta1.rs +++ b/src/prost/cosmos.gov.v1beta1.rs @@ -207,7 +207,7 @@ impl ::prost::Name for DepositParams { } /// VotingParams defines the params for voting on governance proposals. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VotingParams { /// Duration of the voting period. #[prost(message, optional, tag = "1")] @@ -369,7 +369,7 @@ impl ::prost::Name for MsgSubmitProposal { } /// MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitProposalResponse { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -411,7 +411,7 @@ impl ::prost::Name for MsgVote { } /// MsgVoteResponse defines the Msg/Vote response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgVoteResponse {} impl ::prost::Name for MsgVoteResponse { const NAME: &'static str = "MsgVoteResponse"; @@ -453,7 +453,7 @@ impl ::prost::Name for MsgVoteWeighted { /// /// Since: cosmos-sdk 0.43 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgVoteWeightedResponse {} impl ::prost::Name for MsgVoteWeightedResponse { const NAME: &'static str = "MsgVoteWeightedResponse"; @@ -491,7 +491,7 @@ impl ::prost::Name for MsgDeposit { } /// MsgDepositResponse defines the Msg/Deposit response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgDepositResponse {} impl ::prost::Name for MsgDepositResponse { const NAME: &'static str = "MsgDepositResponse"; @@ -741,19 +741,17 @@ pub mod msg_server { /// Msg defines the bank Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -816,7 +814,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.gov.v1beta1.Msg/SubmitProposal" => { #[allow(non_camel_case_types)] @@ -845,7 +842,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitProposalSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -889,7 +885,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -933,7 +928,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteWeightedSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -977,7 +971,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -999,8 +992,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1021,23 +1017,13 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.gov.v1beta1.Msg"; } } /// QueryProposalRequest is the request type for the Query/Proposal RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryProposalRequest { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -1338,7 +1324,7 @@ impl ::prost::Name for QueryDepositsResponse { } /// QueryTallyResultRequest is the request type for the Query/Tally RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryTallyResultRequest { /// proposal_id defines the unique id of the proposal. #[prost(uint64, tag = "1")] @@ -1745,19 +1731,17 @@ pub mod query_server { /// Query defines the gRPC querier service for gov module #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1820,7 +1804,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.gov.v1beta1.Query/Proposal" => { #[allow(non_camel_case_types)] @@ -1851,7 +1834,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ProposalSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1897,7 +1879,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ProposalsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1941,7 +1922,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VoteSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1985,7 +1965,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = VotesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2029,7 +2008,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2075,7 +2053,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2121,7 +2098,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DepositsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2167,7 +2143,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TallyResultSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2189,8 +2164,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2211,16 +2189,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.gov.v1beta1.Query"; } diff --git a/src/prost/cosmos.staking.v1beta1.rs b/src/prost/cosmos.staking.v1beta1.rs index 622024a3..2a92fb35 100644 --- a/src/prost/cosmos.staking.v1beta1.rs +++ b/src/prost/cosmos.staking.v1beta1.rs @@ -684,7 +684,7 @@ impl ::prost::Name for MsgCreateValidator { } /// MsgCreateValidatorResponse defines the Msg/CreateValidator response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgCreateValidatorResponse {} impl ::prost::Name for MsgCreateValidatorResponse { const NAME: &'static str = "MsgCreateValidatorResponse"; @@ -725,7 +725,7 @@ impl ::prost::Name for MsgEditValidator { } /// MsgEditValidatorResponse defines the Msg/EditValidator response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgEditValidatorResponse {} impl ::prost::Name for MsgEditValidatorResponse { const NAME: &'static str = "MsgEditValidatorResponse"; @@ -761,7 +761,7 @@ impl ::prost::Name for MsgDelegate { } /// MsgDelegateResponse defines the Msg/Delegate response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgDelegateResponse {} impl ::prost::Name for MsgDelegateResponse { const NAME: &'static str = "MsgDelegateResponse"; @@ -799,7 +799,7 @@ impl ::prost::Name for MsgBeginRedelegate { } /// MsgBeginRedelegateResponse defines the Msg/BeginRedelegate response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgBeginRedelegateResponse { #[prost(message, optional, tag = "1")] pub completion_time: ::core::option::Option< @@ -840,7 +840,7 @@ impl ::prost::Name for MsgUndelegate { } /// MsgUndelegateResponse defines the Msg/Undelegate response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUndelegateResponse { #[prost(message, optional, tag = "1")] pub completion_time: ::core::option::Option< @@ -888,7 +888,7 @@ impl ::prost::Name for MsgCancelUnbondingDelegation { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgCancelUnbondingDelegationResponse {} impl ::prost::Name for MsgCancelUnbondingDelegationResponse { const NAME: &'static str = "MsgCancelUnbondingDelegationResponse"; @@ -930,7 +930,7 @@ impl ::prost::Name for MsgUpdateParams { /// /// Since: cosmos-sdk 0.47 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -1306,19 +1306,17 @@ pub mod msg_server { /// Msg defines the staking Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1381,7 +1379,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.staking.v1beta1.Msg/CreateValidator" => { #[allow(non_camel_case_types)] @@ -1410,7 +1407,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CreateValidatorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1454,7 +1450,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = EditValidatorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1498,7 +1493,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1542,7 +1536,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = BeginRedelegateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1586,7 +1579,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UndelegateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1633,7 +1625,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CancelUnbondingDelegationSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1677,7 +1668,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1699,8 +1689,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1721,16 +1714,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.staking.v1beta1.Msg"; } @@ -2231,7 +2214,7 @@ impl ::prost::Name for QueryDelegatorValidatorResponse { /// QueryHistoricalInfoRequest is request type for the Query/HistoricalInfo RPC /// method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryHistoricalInfoRequest { /// height defines at which height to query the historical info. #[prost(int64, tag = "1")] @@ -2268,7 +2251,7 @@ impl ::prost::Name for QueryHistoricalInfoResponse { } /// QueryPoolRequest is request type for the Query/Pool RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryPoolRequest {} impl ::prost::Name for QueryPoolRequest { const NAME: &'static str = "QueryPoolRequest"; @@ -2300,7 +2283,7 @@ impl ::prost::Name for QueryPoolResponse { } /// QueryParamsRequest is request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -2997,19 +2980,17 @@ pub mod query_server { /// Query defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -3072,7 +3053,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.staking.v1beta1.Query/Validators" => { #[allow(non_camel_case_types)] @@ -3103,7 +3083,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ValidatorsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3149,7 +3128,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ValidatorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3198,7 +3176,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ValidatorDelegationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3251,7 +3228,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ValidatorUnbondingDelegationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3297,7 +3273,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegationSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3345,7 +3320,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UnbondingDelegationSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3394,7 +3368,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegatorDelegationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3447,7 +3420,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegatorUnbondingDelegationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3493,7 +3465,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RedelegationsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3541,7 +3512,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegatorValidatorsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3589,7 +3559,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DelegatorValidatorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3635,7 +3604,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = HistoricalInfoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3679,7 +3647,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PoolSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3723,7 +3690,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3745,8 +3711,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -3767,16 +3736,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.staking.v1beta1.Query"; } diff --git a/src/prost/cosmos.tx.config.v1.rs b/src/prost/cosmos.tx.config.v1.rs index f5ecc33c..2020b0b5 100644 --- a/src/prost/cosmos.tx.config.v1.rs +++ b/src/prost/cosmos.tx.config.v1.rs @@ -1,7 +1,7 @@ // This file is @generated by prost-build. /// Config is the config object of the x/auth/tx package. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Config { /// skip_ante_handler defines whether the ante handler registration should be skipped in case an app wants to override /// this functionality. diff --git a/src/prost/cosmos.tx.v1beta1.rs b/src/prost/cosmos.tx.v1beta1.rs index 09178daf..1d16a55c 100644 --- a/src/prost/cosmos.tx.v1beta1.rs +++ b/src/prost/cosmos.tx.v1beta1.rs @@ -261,7 +261,7 @@ pub mod mode_info { /// to allow for additional fields such as locale for SIGN_MODE_TEXTUAL in the /// future #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Single { /// mode is the signing mode of the single signer #[prost(enumeration = "super::super::signing::v1beta1::SignMode", tag = "1")] @@ -1331,19 +1331,17 @@ pub mod service_server { /// Service defines a gRPC service for interacting with transactions. #[derive(Debug)] pub struct ServiceServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl ServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1406,7 +1404,6 @@ pub mod service_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.tx.v1beta1.Service/Simulate" => { #[allow(non_camel_case_types)] @@ -1435,7 +1432,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SimulateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1479,7 +1475,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetTxSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1525,7 +1520,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = BroadcastTxSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1571,7 +1565,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetTxsEventSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1617,7 +1610,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = GetBlockWithTxsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1661,7 +1653,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TxDecodeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1705,7 +1696,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TxEncodeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1751,7 +1741,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TxEncodeAminoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1797,7 +1786,6 @@ pub mod service_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TxDecodeAminoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1819,8 +1807,11 @@ pub mod service_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1841,16 +1832,6 @@ pub mod service_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for ServiceServer { const NAME: &'static str = "cosmos.tx.v1beta1.Service"; } diff --git a/src/prost/cosmos.upgrade.v1beta1.rs b/src/prost/cosmos.upgrade.v1beta1.rs index 7905f803..cf8a8825 100644 --- a/src/prost/cosmos.upgrade.v1beta1.rs +++ b/src/prost/cosmos.upgrade.v1beta1.rs @@ -145,7 +145,7 @@ impl ::prost::Name for MsgSoftwareUpgrade { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSoftwareUpgradeResponse {} impl ::prost::Name for MsgSoftwareUpgradeResponse { const NAME: &'static str = "MsgSoftwareUpgradeResponse"; @@ -181,7 +181,7 @@ impl ::prost::Name for MsgCancelUpgrade { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgCancelUpgradeResponse {} impl ::prost::Name for MsgCancelUpgradeResponse { const NAME: &'static str = "MsgCancelUpgradeResponse"; @@ -374,19 +374,17 @@ pub mod msg_server { /// Msg defines the upgrade Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -449,7 +447,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.upgrade.v1beta1.Msg/SoftwareUpgrade" => { #[allow(non_camel_case_types)] @@ -478,7 +475,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SoftwareUpgradeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -522,7 +518,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CancelUpgradeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -544,8 +539,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -566,16 +564,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "cosmos.upgrade.v1beta1.Msg"; } @@ -583,7 +571,7 @@ pub mod msg_server { /// QueryCurrentPlanRequest is the request type for the Query/CurrentPlan RPC /// method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryCurrentPlanRequest {} impl ::prost::Name for QueryCurrentPlanRequest { const NAME: &'static str = "QueryCurrentPlanRequest"; @@ -636,7 +624,7 @@ impl ::prost::Name for QueryAppliedPlanRequest { /// QueryAppliedPlanResponse is the response type for the Query/AppliedPlan RPC /// method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryAppliedPlanResponse { /// height is the block height at which the plan was applied. #[prost(int64, tag = "1")] @@ -655,7 +643,7 @@ impl ::prost::Name for QueryAppliedPlanResponse { /// QueryUpgradedConsensusStateRequest is the request type for the Query/UpgradedConsensusState /// RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryUpgradedConsensusStateRequest { /// last height of the current chain must be sent in request /// as this is the height under which next consensus state is stored @@ -739,7 +727,7 @@ impl ::prost::Name for QueryModuleVersionsResponse { /// /// Since: cosmos-sdk 0.46 #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryAuthorityRequest {} impl ::prost::Name for QueryAuthorityRequest { const NAME: &'static str = "QueryAuthorityRequest"; @@ -1066,19 +1054,17 @@ pub mod query_server { /// Query defines the gRPC upgrade querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1141,7 +1127,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/cosmos.upgrade.v1beta1.Query/CurrentPlan" => { #[allow(non_camel_case_types)] @@ -1172,7 +1157,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CurrentPlanSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1218,7 +1202,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AppliedPlanSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1268,7 +1251,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradedConsensusStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1314,7 +1296,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ModuleVersionsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1360,7 +1341,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AuthoritySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1382,8 +1362,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1404,16 +1387,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "cosmos.upgrade.v1beta1.Query"; } diff --git a/src/prost/google.protobuf.rs b/src/prost/google.protobuf.rs index 38e34273..4822b53e 100644 --- a/src/prost/google.protobuf.rs +++ b/src/prost/google.protobuf.rs @@ -268,7 +268,7 @@ pub mod descriptor_proto { /// fields or extension ranges in the same message. Reserved ranges may /// not overlap. #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ReservedRange { /// Inclusive. #[prost(int32, optional, tag = "1")] @@ -681,7 +681,7 @@ pub mod enum_descriptor_proto { /// is inclusive such that it can appropriately represent the entire int32 /// domain. #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EnumReservedRange { /// Inclusive. #[prost(int32, optional, tag = "1")] @@ -812,12 +812,16 @@ pub struct FileOptions { #[deprecated] #[prost(bool, optional, tag = "20")] pub java_generate_equals_and_hash: ::core::option::Option, - /// If set true, then the Java2 code generator will generate code that - /// throws an exception whenever an attempt is made to assign a non-UTF-8 - /// byte sequence to a string field. - /// Message reflection will do the same. - /// However, an extension field still accepts non-UTF-8 byte sequences. - /// This option has no effect on when used with the lite runtime. + /// A proto2 file can set this to true to opt in to UTF-8 checking for Java, + /// which will throw an exception if invalid UTF-8 is parsed from the wire or + /// assigned to a string field. + /// + /// TODO: clarify exactly what kinds of field types this option + /// applies to, and update these docs accordingly. + /// + /// Proto3 files already perform these checks. Setting the option explicitly to + /// false has no effect: it cannot be used to opt proto3 files out of UTF-8 + /// checks. #[prost(bool, optional, tag = "27", default = "false")] pub java_string_check_utf8: ::core::option::Option, #[prost( @@ -1144,6 +1148,8 @@ pub struct FieldOptions { /// Any features defined in the specific edition. #[prost(message, optional, tag = "21")] pub features: ::core::option::Option, + #[prost(message, optional, tag = "22")] + pub feature_support: ::core::option::Option, /// The parser stores options it doesn't recognize here. See above. #[prost(message, repeated, tag = "999")] pub uninterpreted_option: ::prost::alloc::vec::Vec, @@ -1169,6 +1175,39 @@ pub mod field_options { "/google.protobuf.FieldOptions.EditionDefault".into() } } + /// Information about the support window of a feature. + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct FeatureSupport { + /// The edition that this feature was first available in. In editions + /// earlier than this one, the default assigned to EDITION_LEGACY will be + /// used, and proto files will not be able to override it. + #[prost(enumeration = "super::Edition", optional, tag = "1")] + pub edition_introduced: ::core::option::Option, + /// The edition this feature becomes deprecated in. Using this after this + /// edition may trigger warnings. + #[prost(enumeration = "super::Edition", optional, tag = "2")] + pub edition_deprecated: ::core::option::Option, + /// The deprecation warning text if this feature is used after the edition it + /// was marked deprecated in. + #[prost(string, optional, tag = "3")] + pub deprecation_warning: ::core::option::Option<::prost::alloc::string::String>, + /// The edition this feature is no longer available in. In editions after + /// this one, the last default assigned will be used, and proto files will + /// not be able to override it. + #[prost(enumeration = "super::Edition", optional, tag = "4")] + pub edition_removed: ::core::option::Option, + } + impl ::prost::Name for FeatureSupport { + const NAME: &'static str = "FeatureSupport"; + const PACKAGE: &'static str = "google.protobuf"; + fn full_name() -> ::prost::alloc::string::String { + "google.protobuf.FieldOptions.FeatureSupport".into() + } + fn type_url() -> ::prost::alloc::string::String { + "/google.protobuf.FieldOptions.FeatureSupport".into() + } + } #[derive( Clone, Copy, @@ -1452,6 +1491,9 @@ pub struct EnumValueOptions { /// credentials. #[prost(bool, optional, tag = "3", default = "false")] pub debug_redact: ::core::option::Option, + /// Information about the support window of a feature value. + #[prost(message, optional, tag = "4")] + pub feature_support: ::core::option::Option, /// The parser stores options it doesn't recognize here. See above. #[prost(message, repeated, tag = "999")] pub uninterpreted_option: ::prost::alloc::vec::Vec, @@ -1641,7 +1683,7 @@ impl ::prost::Name for UninterpretedOption { /// be designed and implemented to handle this, hopefully before we ever hit a /// conflict here. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct FeatureSet { #[prost(enumeration = "feature_set::FieldPresence", optional, tag = "1")] pub field_presence: ::core::option::Option, @@ -1933,12 +1975,16 @@ pub mod feature_set_defaults { /// the defaults at the closest matching edition ordered at or before it should /// be used. This field must be in strict ascending order by edition. #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct FeatureSetEditionDefault { #[prost(enumeration = "super::Edition", optional, tag = "3")] pub edition: ::core::option::Option, - #[prost(message, optional, tag = "2")] - pub features: ::core::option::Option, + /// Defaults of features that can be overridden in this edition. + #[prost(message, optional, tag = "4")] + pub overridable_features: ::core::option::Option, + /// Defaults of features that can't be overridden in this edition. + #[prost(message, optional, tag = "5")] + pub fixed_features: ::core::option::Option, } impl ::prost::Name for FeatureSetEditionDefault { const NAME: &'static str = "FeatureSetEditionDefault"; @@ -2235,6 +2281,9 @@ impl ::prost::Name for GeneratedCodeInfo { pub enum Edition { /// A placeholder for an unknown edition value. Unknown = 0, + /// A placeholder edition for specifying default behaviors *before* a feature + /// was first introduced. This is effectively an "infinite past". + Legacy = 900, /// Legacy syntax "editions". These pre-date editions, but behave much like /// distinct editions. These can't be used to specify the edition of proto /// files, but feature definitions must supply proto2/proto3 defaults for @@ -2266,6 +2315,7 @@ impl Edition { pub fn as_str_name(&self) -> &'static str { match self { Edition::Unknown => "EDITION_UNKNOWN", + Edition::Legacy => "EDITION_LEGACY", Edition::Proto2 => "EDITION_PROTO2", Edition::Proto3 => "EDITION_PROTO3", Edition::Edition2023 => "EDITION_2023", @@ -2282,6 +2332,7 @@ impl Edition { pub fn from_str_name(value: &str) -> ::core::option::Option { match value { "EDITION_UNKNOWN" => Some(Self::Unknown), + "EDITION_LEGACY" => Some(Self::Legacy), "EDITION_PROTO2" => Some(Self::Proto2), "EDITION_PROTO3" => Some(Self::Proto3), "EDITION_2023" => Some(Self::Edition2023), @@ -2387,7 +2438,7 @@ impl Edition { /// ) to obtain a formatter capable of generating timestamps in this format. /// #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Timestamp { /// Represents seconds of UTC time since Unix epoch /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to @@ -2472,7 +2523,7 @@ impl ::prost::Name for Timestamp { /// #[derive(Eq)] #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Duration { /// Signed seconds of the span of time. Must be from -315,576,000,000 /// to +315,576,000,000 inclusive. Note: these bounds are computed from: diff --git a/src/prost/google.protobuf.serde.rs b/src/prost/google.protobuf.serde.rs index 4a8362c6..b47f4a59 100644 --- a/src/prost/google.protobuf.serde.rs +++ b/src/prost/google.protobuf.serde.rs @@ -722,6 +722,7 @@ impl serde::Serialize for Edition { { let variant = match self { Self::Unknown => "EDITION_UNKNOWN", + Self::Legacy => "EDITION_LEGACY", Self::Proto2 => "EDITION_PROTO2", Self::Proto3 => "EDITION_PROTO3", Self::Edition2023 => "EDITION_2023", @@ -744,6 +745,7 @@ impl<'de> serde::Deserialize<'de> for Edition { { const FIELDS: &[&str] = &[ "EDITION_UNKNOWN", + "EDITION_LEGACY", "EDITION_PROTO2", "EDITION_PROTO3", "EDITION_2023", @@ -795,6 +797,7 @@ impl<'de> serde::Deserialize<'de> for Edition { { match value { "EDITION_UNKNOWN" => Ok(Edition::Unknown), + "EDITION_LEGACY" => Ok(Edition::Legacy), "EDITION_PROTO2" => Ok(Edition::Proto2), "EDITION_PROTO3" => Ok(Edition::Proto3), "EDITION_2023" => Ok(Edition::Edition2023), @@ -1394,6 +1397,9 @@ impl serde::Serialize for EnumValueOptions { if true { len += 1; } + if true { + len += 1; + } let mut struct_ser = serializer.serialize_struct("google.protobuf.EnumValueOptions", len)?; if let Some(v) = self.deprecated.as_ref() { struct_ser.serialize_field("deprecated", v)?; @@ -1404,6 +1410,9 @@ impl serde::Serialize for EnumValueOptions { if let Some(v) = self.debug_redact.as_ref() { struct_ser.serialize_field("debugRedact", v)?; } + if let Some(v) = self.feature_support.as_ref() { + struct_ser.serialize_field("featureSupport", v)?; + } if true { struct_ser.serialize_field("uninterpretedOption", &self.uninterpreted_option)?; } @@ -1421,6 +1430,8 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { "features", "debug_redact", "debugRedact", + "feature_support", + "featureSupport", "uninterpreted_option", "uninterpretedOption", ]; @@ -1430,6 +1441,7 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { Deprecated, Features, DebugRedact, + FeatureSupport, UninterpretedOption, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -1455,6 +1467,7 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { "deprecated" => Ok(GeneratedField::Deprecated), "features" => Ok(GeneratedField::Features), "debugRedact" | "debug_redact" => Ok(GeneratedField::DebugRedact), + "featureSupport" | "feature_support" => Ok(GeneratedField::FeatureSupport), "uninterpretedOption" | "uninterpreted_option" => Ok(GeneratedField::UninterpretedOption), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } @@ -1478,6 +1491,7 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { let mut deprecated__ = None; let mut features__ = None; let mut debug_redact__ = None; + let mut feature_support__ = None; let mut uninterpreted_option__ = None; while let Some(k) = map_.next_key()? { match k { @@ -1499,6 +1513,12 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { } debug_redact__ = map_.next_value()?; } + GeneratedField::FeatureSupport => { + if feature_support__.is_some() { + return Err(serde::de::Error::duplicate_field("featureSupport")); + } + feature_support__ = map_.next_value()?; + } GeneratedField::UninterpretedOption => { if uninterpreted_option__.is_some() { return Err(serde::de::Error::duplicate_field("uninterpretedOption")); @@ -1511,6 +1531,7 @@ impl<'de> serde::Deserialize<'de> for EnumValueOptions { deprecated: deprecated__, features: features__, debug_redact: debug_redact__, + feature_support: feature_support__, uninterpreted_option: uninterpreted_option__.unwrap_or_default(), }) } @@ -2682,14 +2703,20 @@ impl serde::Serialize for feature_set_defaults::FeatureSetEditionDefault { if true { len += 1; } + if true { + len += 1; + } let mut struct_ser = serializer.serialize_struct("google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault", len)?; if let Some(v) = self.edition.as_ref() { let v = Edition::try_from(*v) .map_err(|_| serde::ser::Error::custom(::alloc::format!("Invalid variant {}", *v)))?; struct_ser.serialize_field("edition", &v)?; } - if let Some(v) = self.features.as_ref() { - struct_ser.serialize_field("features", v)?; + if let Some(v) = self.overridable_features.as_ref() { + struct_ser.serialize_field("overridableFeatures", v)?; + } + if let Some(v) = self.fixed_features.as_ref() { + struct_ser.serialize_field("fixedFeatures", v)?; } struct_ser.end() } @@ -2702,13 +2729,17 @@ impl<'de> serde::Deserialize<'de> for feature_set_defaults::FeatureSetEditionDef { const FIELDS: &[&str] = &[ "edition", - "features", + "overridable_features", + "overridableFeatures", + "fixed_features", + "fixedFeatures", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Edition, - Features, + OverridableFeatures, + FixedFeatures, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> core::result::Result @@ -2731,7 +2762,8 @@ impl<'de> serde::Deserialize<'de> for feature_set_defaults::FeatureSetEditionDef { match value { "edition" => Ok(GeneratedField::Edition), - "features" => Ok(GeneratedField::Features), + "overridableFeatures" | "overridable_features" => Ok(GeneratedField::OverridableFeatures), + "fixedFeatures" | "fixed_features" => Ok(GeneratedField::FixedFeatures), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -2752,7 +2784,8 @@ impl<'de> serde::Deserialize<'de> for feature_set_defaults::FeatureSetEditionDef V: serde::de::MapAccess<'de>, { let mut edition__ = None; - let mut features__ = None; + let mut overridable_features__ = None; + let mut fixed_features__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Edition => { @@ -2761,17 +2794,24 @@ impl<'de> serde::Deserialize<'de> for feature_set_defaults::FeatureSetEditionDef } edition__ = map_.next_value::<::core::option::Option>()?.map(|x| x as i32); } - GeneratedField::Features => { - if features__.is_some() { - return Err(serde::de::Error::duplicate_field("features")); + GeneratedField::OverridableFeatures => { + if overridable_features__.is_some() { + return Err(serde::de::Error::duplicate_field("overridableFeatures")); } - features__ = map_.next_value()?; + overridable_features__ = map_.next_value()?; + } + GeneratedField::FixedFeatures => { + if fixed_features__.is_some() { + return Err(serde::de::Error::duplicate_field("fixedFeatures")); + } + fixed_features__ = map_.next_value()?; } } } Ok(feature_set_defaults::FeatureSetEditionDefault { edition: edition__, - features: features__, + overridable_features: overridable_features__, + fixed_features: fixed_features__, }) } } @@ -3292,6 +3332,9 @@ impl serde::Serialize for FieldOptions { if true { len += 1; } + if true { + len += 1; + } let mut struct_ser = serializer.serialize_struct("google.protobuf.FieldOptions", len)?; if let Some(v) = self.ctype.as_ref() { let v = field_options::CType::try_from(*v) @@ -3339,6 +3382,9 @@ impl serde::Serialize for FieldOptions { if let Some(v) = self.features.as_ref() { struct_ser.serialize_field("features", v)?; } + if let Some(v) = self.feature_support.as_ref() { + struct_ser.serialize_field("featureSupport", v)?; + } if true { struct_ser.serialize_field("uninterpretedOption", &self.uninterpreted_option)?; } @@ -3367,6 +3413,8 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { "edition_defaults", "editionDefaults", "features", + "feature_support", + "featureSupport", "uninterpreted_option", "uninterpretedOption", ]; @@ -3385,6 +3433,7 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { Targets, EditionDefaults, Features, + FeatureSupport, UninterpretedOption, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -3419,6 +3468,7 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { "targets" => Ok(GeneratedField::Targets), "editionDefaults" | "edition_defaults" => Ok(GeneratedField::EditionDefaults), "features" => Ok(GeneratedField::Features), + "featureSupport" | "feature_support" => Ok(GeneratedField::FeatureSupport), "uninterpretedOption" | "uninterpreted_option" => Ok(GeneratedField::UninterpretedOption), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } @@ -3451,6 +3501,7 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { let mut targets__ = None; let mut edition_defaults__ = None; let mut features__ = None; + let mut feature_support__ = None; let mut uninterpreted_option__ = None; while let Some(k) = map_.next_key()? { match k { @@ -3526,6 +3577,12 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { } features__ = map_.next_value()?; } + GeneratedField::FeatureSupport => { + if feature_support__.is_some() { + return Err(serde::de::Error::duplicate_field("featureSupport")); + } + feature_support__ = map_.next_value()?; + } GeneratedField::UninterpretedOption => { if uninterpreted_option__.is_some() { return Err(serde::de::Error::duplicate_field("uninterpretedOption")); @@ -3547,6 +3604,7 @@ impl<'de> serde::Deserialize<'de> for FieldOptions { targets: targets__.unwrap_or_default(), edition_defaults: edition_defaults__.unwrap_or_default(), features: features__, + feature_support: feature_support__, uninterpreted_option: uninterpreted_option__.unwrap_or_default(), }) } @@ -3738,6 +3796,158 @@ impl<'de> serde::Deserialize<'de> for field_options::EditionDefault { deserializer.deserialize_struct("google.protobuf.FieldOptions.EditionDefault", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for field_options::FeatureSupport { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> core::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if true { + len += 1; + } + if true { + len += 1; + } + if true { + len += 1; + } + if true { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("google.protobuf.FieldOptions.FeatureSupport", len)?; + if let Some(v) = self.edition_introduced.as_ref() { + let v = Edition::try_from(*v) + .map_err(|_| serde::ser::Error::custom(::alloc::format!("Invalid variant {}", *v)))?; + struct_ser.serialize_field("editionIntroduced", &v)?; + } + if let Some(v) = self.edition_deprecated.as_ref() { + let v = Edition::try_from(*v) + .map_err(|_| serde::ser::Error::custom(::alloc::format!("Invalid variant {}", *v)))?; + struct_ser.serialize_field("editionDeprecated", &v)?; + } + if let Some(v) = self.deprecation_warning.as_ref() { + struct_ser.serialize_field("deprecationWarning", v)?; + } + if let Some(v) = self.edition_removed.as_ref() { + let v = Edition::try_from(*v) + .map_err(|_| serde::ser::Error::custom(::alloc::format!("Invalid variant {}", *v)))?; + struct_ser.serialize_field("editionRemoved", &v)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for field_options::FeatureSupport { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> core::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "edition_introduced", + "editionIntroduced", + "edition_deprecated", + "editionDeprecated", + "deprecation_warning", + "deprecationWarning", + "edition_removed", + "editionRemoved", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + EditionIntroduced, + EditionDeprecated, + DeprecationWarning, + EditionRemoved, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> core::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> core::result::Result + where + E: serde::de::Error, + { + match value { + "editionIntroduced" | "edition_introduced" => Ok(GeneratedField::EditionIntroduced), + "editionDeprecated" | "edition_deprecated" => Ok(GeneratedField::EditionDeprecated), + "deprecationWarning" | "deprecation_warning" => Ok(GeneratedField::DeprecationWarning), + "editionRemoved" | "edition_removed" => Ok(GeneratedField::EditionRemoved), + _ => Err(serde::de::Error::unknown_field(value, FIELDS)), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = field_options::FeatureSupport; + + fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + formatter.write_str("struct google.protobuf.FieldOptions.FeatureSupport") + } + + fn visit_map(self, mut map_: V) -> core::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut edition_introduced__ = None; + let mut edition_deprecated__ = None; + let mut deprecation_warning__ = None; + let mut edition_removed__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::EditionIntroduced => { + if edition_introduced__.is_some() { + return Err(serde::de::Error::duplicate_field("editionIntroduced")); + } + edition_introduced__ = map_.next_value::<::core::option::Option>()?.map(|x| x as i32); + } + GeneratedField::EditionDeprecated => { + if edition_deprecated__.is_some() { + return Err(serde::de::Error::duplicate_field("editionDeprecated")); + } + edition_deprecated__ = map_.next_value::<::core::option::Option>()?.map(|x| x as i32); + } + GeneratedField::DeprecationWarning => { + if deprecation_warning__.is_some() { + return Err(serde::de::Error::duplicate_field("deprecationWarning")); + } + deprecation_warning__ = map_.next_value()?; + } + GeneratedField::EditionRemoved => { + if edition_removed__.is_some() { + return Err(serde::de::Error::duplicate_field("editionRemoved")); + } + edition_removed__ = map_.next_value::<::core::option::Option>()?.map(|x| x as i32); + } + } + } + Ok(field_options::FeatureSupport { + edition_introduced: edition_introduced__, + edition_deprecated: edition_deprecated__, + deprecation_warning: deprecation_warning__, + edition_removed: edition_removed__, + }) + } + } + deserializer.deserialize_struct("google.protobuf.FieldOptions.FeatureSupport", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for field_options::JsType { #[allow(deprecated)] fn serialize(&self, serializer: S) -> core::result::Result diff --git a/src/prost/ibc.applications.fee.v1.rs b/src/prost/ibc.applications.fee.v1.rs index 2356f565..6a199dfb 100644 --- a/src/prost/ibc.applications.fee.v1.rs +++ b/src/prost/ibc.applications.fee.v1.rs @@ -123,7 +123,7 @@ impl ::prost::Name for MsgRegisterPayee { } /// MsgRegisterPayeeResponse defines the response type for the RegisterPayee rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgRegisterPayeeResponse {} impl ::prost::Name for MsgRegisterPayeeResponse { const NAME: &'static str = "MsgRegisterPayeeResponse"; @@ -164,7 +164,7 @@ impl ::prost::Name for MsgRegisterCounterpartyPayee { } /// MsgRegisterCounterpartyPayeeResponse defines the response type for the RegisterCounterpartyPayee rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgRegisterCounterpartyPayeeResponse {} impl ::prost::Name for MsgRegisterCounterpartyPayeeResponse { const NAME: &'static str = "MsgRegisterCounterpartyPayeeResponse"; @@ -210,7 +210,7 @@ impl ::prost::Name for MsgPayPacketFee { } /// MsgPayPacketFeeResponse defines the response type for the PayPacketFee rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgPayPacketFeeResponse {} impl ::prost::Name for MsgPayPacketFeeResponse { const NAME: &'static str = "MsgPayPacketFeeResponse"; @@ -248,7 +248,7 @@ impl ::prost::Name for MsgPayPacketFeeAsync { } /// MsgPayPacketFeeAsyncResponse defines the response type for the PayPacketFeeAsync rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgPayPacketFeeAsyncResponse {} impl ::prost::Name for MsgPayPacketFeeAsyncResponse { const NAME: &'static str = "MsgPayPacketFeeAsyncResponse"; @@ -532,19 +532,17 @@ pub mod msg_server { /// Msg defines the ICS29 Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -607,7 +605,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.fee.v1.Msg/RegisterPayee" => { #[allow(non_camel_case_types)] @@ -636,7 +633,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RegisterPayeeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -683,7 +679,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RegisterCounterpartyPayeeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -727,7 +722,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PayPacketFeeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -771,7 +765,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PayPacketFeeAsyncSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -793,8 +786,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -815,16 +811,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.applications.fee.v1.Msg"; } @@ -1383,7 +1369,7 @@ impl ::prost::Name for QueryFeeEnabledChannelRequest { } /// QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryFeeEnabledChannelResponse { /// boolean flag representing the fee enabled channel status #[prost(bool, tag = "1")] @@ -1872,19 +1858,17 @@ pub mod query_server { /// Query defines the ICS29 gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1947,7 +1931,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.fee.v1.Query/IncentivizedPackets" => { #[allow(non_camel_case_types)] @@ -1980,7 +1963,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = IncentivizedPacketsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2028,7 +2010,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = IncentivizedPacketSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2081,7 +2062,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = IncentivizedPacketsForChannelSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2127,7 +2107,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TotalRecvFeesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2173,7 +2152,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TotalAckFeesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2219,7 +2197,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TotalTimeoutFeesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2263,7 +2240,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PayeeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2309,7 +2285,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CounterpartyPayeeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2357,7 +2332,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = FeeEnabledChannelsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2403,7 +2377,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = FeeEnabledChannelSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2425,8 +2398,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2447,16 +2423,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.applications.fee.v1.Query"; } diff --git a/src/prost/ibc.applications.interchain_accounts.controller.v1.rs b/src/prost/ibc.applications.interchain_accounts.controller.v1.rs index 66df4b1e..fe6a3f9e 100644 --- a/src/prost/ibc.applications.interchain_accounts.controller.v1.rs +++ b/src/prost/ibc.applications.interchain_accounts.controller.v1.rs @@ -2,7 +2,7 @@ /// Params defines the set of on-chain interchain accounts parameters. /// The following parameters may be used to disable the controller submodule. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { /// controller_enabled enables or disables the controller submodule. #[prost(bool, tag = "1")] @@ -96,7 +96,7 @@ impl ::prost::Name for MsgSendTx { } /// MsgSendTxResponse defines the response for MsgSendTx #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSendTxResponse { #[prost(uint64, tag = "1")] pub sequence: u64, @@ -136,7 +136,7 @@ impl ::prost::Name for MsgUpdateParams { } /// MsgUpdateParamsResponse defines the response for Msg/UpdateParams #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -368,19 +368,17 @@ pub mod msg_server { /// Msg defines the 27-interchain-accounts/controller Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -443,7 +441,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.interchain_accounts.controller.v1.Msg/RegisterInterchainAccount" => { #[allow(non_camel_case_types)] @@ -475,7 +472,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RegisterInterchainAccountSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -519,7 +515,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SendTxSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -563,7 +558,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -585,8 +579,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -607,16 +604,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.applications.interchain_accounts.controller.v1.Msg"; } @@ -663,7 +650,7 @@ impl ::prost::Name for QueryInterchainAccountResponse { } /// QueryParamsRequest is the request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -677,7 +664,7 @@ impl ::prost::Name for QueryParamsRequest { } /// QueryParamsResponse is the response type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsResponse { /// params defines the parameters of the module. #[prost(message, optional, tag = "1")] @@ -872,19 +859,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -947,7 +932,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.interchain_accounts.controller.v1.Query/InterchainAccount" => { #[allow(non_camel_case_types)] @@ -978,7 +962,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = InterchainAccountSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1022,7 +1005,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1044,8 +1026,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1066,16 +1051,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.applications.interchain_accounts.controller.v1.Query"; } diff --git a/src/prost/ibc.applications.interchain_accounts.host.v1.rs b/src/prost/ibc.applications.interchain_accounts.host.v1.rs index 9ddce319..b5b61d42 100644 --- a/src/prost/ibc.applications.interchain_accounts.host.v1.rs +++ b/src/prost/ibc.applications.interchain_accounts.host.v1.rs @@ -46,7 +46,7 @@ impl ::prost::Name for MsgUpdateParams { } /// MsgUpdateParamsResponse defines the response for Msg/UpdateParams #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -198,19 +198,17 @@ pub mod msg_server { /// Msg defines the 27-interchain-accounts/host Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -273,7 +271,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.interchain_accounts.host.v1.Msg/UpdateParams" => { #[allow(non_camel_case_types)] @@ -302,7 +299,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -324,8 +320,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -346,23 +345,13 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.applications.interchain_accounts.host.v1.Msg"; } } /// QueryParamsRequest is the request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -532,19 +521,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -607,7 +594,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.interchain_accounts.host.v1.Query/Params" => { #[allow(non_camel_case_types)] @@ -636,7 +622,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -658,8 +643,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -680,16 +668,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.applications.interchain_accounts.host.v1.Query"; } diff --git a/src/prost/ibc.applications.nft_transfer.v1.rs b/src/prost/ibc.applications.nft_transfer.v1.rs index ed110064..12a22efe 100644 --- a/src/prost/ibc.applications.nft_transfer.v1.rs +++ b/src/prost/ibc.applications.nft_transfer.v1.rs @@ -26,7 +26,7 @@ impl ::prost::Name for ClassTrace { /// NOTE: To prevent a nft from being transferred, set the /// TransfersEnabled parameter to false. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { /// send_enabled enables or disables all cross-chain nft transfers from this /// chain. @@ -97,7 +97,7 @@ impl ::prost::Name for MsgTransfer { } /// MsgTransferResponse defines the Msg/Transfer response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgTransferResponse { /// sequence number of the transfer packet sent #[prost(uint64, tag = "1")] @@ -141,7 +141,7 @@ impl ::prost::Name for MsgUpdateParams { /// MsgUpdateParams message. /// #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -333,19 +333,17 @@ pub mod msg_server { /// Msg defines the ibc/nft-transfer Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -408,7 +406,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.nft_transfer.v1.Msg/Transfer" => { #[allow(non_camel_case_types)] @@ -437,7 +434,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TransferSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -481,7 +477,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -503,8 +498,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -525,16 +523,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.applications.nft_transfer.v1.Msg"; } @@ -748,7 +736,7 @@ impl ::prost::Name for QueryEscrowAddressResponse { } /// QueryParamsRequest is request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -762,7 +750,7 @@ impl ::prost::Name for QueryParamsRequest { } /// QueryParamsResponse is response type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsResponse { /// params holds all the parameters of this module. #[prost(message, optional, tag = "1")] @@ -1073,19 +1061,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1148,7 +1134,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.nft_transfer.v1.Query/ClassTrace" => { #[allow(non_camel_case_types)] @@ -1179,7 +1164,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClassTraceSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1225,7 +1209,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClassTracesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1271,7 +1254,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClassHashSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1317,7 +1299,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = EscrowAddressSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1361,7 +1342,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1383,8 +1363,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1405,16 +1388,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.applications.nft_transfer.v1.Query"; } diff --git a/src/prost/ibc.applications.transfer.v1.rs b/src/prost/ibc.applications.transfer.v1.rs index 5b2db2d0..98eb521f 100644 --- a/src/prost/ibc.applications.transfer.v1.rs +++ b/src/prost/ibc.applications.transfer.v1.rs @@ -27,7 +27,7 @@ impl ::prost::Name for DenomTrace { /// TransfersEnabled parameter to true and then set the bank module's SendEnabled /// parameter for the denomination to false. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { /// send_enabled enables or disables all cross-chain token transfers from this /// chain. @@ -97,7 +97,7 @@ impl ::prost::Name for MsgTransfer { } /// MsgTransferResponse defines the Msg/Transfer response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgTransferResponse { /// sequence number of the transfer packet sent #[prost(uint64, tag = "1")] @@ -139,7 +139,7 @@ impl ::prost::Name for MsgUpdateParams { /// MsgUpdateParamsResponse defines the response structure for executing a /// MsgUpdateParams message. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -322,19 +322,17 @@ pub mod msg_server { /// Msg defines the ibc/transfer Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -397,7 +395,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.transfer.v1.Msg/Transfer" => { #[allow(non_camel_case_types)] @@ -426,7 +423,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TransferSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -470,7 +466,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -492,8 +487,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -514,16 +512,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.applications.transfer.v1.Msg"; } @@ -613,7 +601,7 @@ impl ::prost::Name for QueryDenomTracesResponse { } /// QueryParamsRequest is the request type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -627,7 +615,7 @@ impl ::prost::Name for QueryParamsRequest { } /// QueryParamsResponse is the response type for the Query/Params RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsResponse { /// params defines the parameters of the module. #[prost(message, optional, tag = "1")] @@ -1077,19 +1065,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service. #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1152,7 +1138,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.applications.transfer.v1.Query/DenomTraces" => { #[allow(non_camel_case_types)] @@ -1183,7 +1168,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomTracesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1229,7 +1213,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomTraceSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1273,7 +1256,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1319,7 +1301,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = DenomHashSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1365,7 +1346,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = EscrowAddressSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1413,7 +1393,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TotalEscrowForDenomSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1435,8 +1414,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1457,16 +1439,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.applications.transfer.v1.Query"; } diff --git a/src/prost/ibc.core.channel.v1.rs b/src/prost/ibc.core.channel.v1.rs index ba12fa49..684f59bd 100644 --- a/src/prost/ibc.core.channel.v1.rs +++ b/src/prost/ibc.core.channel.v1.rs @@ -244,7 +244,7 @@ impl ::prost::Name for Acknowledgement { /// This includes packet lifecycle handlers as well as the upgrade handshake handlers. /// A valid Timeout contains either one or both of a timestamp and block height (sequence). #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Timeout { /// block height after which the packet or upgrade times out #[prost(message, optional, tag = "1")] @@ -265,7 +265,7 @@ impl ::prost::Name for Timeout { } /// Params defines the set of IBC channel parameters. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { /// the relative timeout after which channel upgrades will time out. #[prost(message, optional, tag = "1")] @@ -622,7 +622,7 @@ impl ::prost::Name for MsgChannelOpenAck { } /// MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelOpenAckResponse {} impl ::prost::Name for MsgChannelOpenAckResponse { const NAME: &'static str = "MsgChannelOpenAckResponse"; @@ -663,7 +663,7 @@ impl ::prost::Name for MsgChannelOpenConfirm { /// MsgChannelOpenConfirmResponse defines the Msg/ChannelOpenConfirm response /// type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelOpenConfirmResponse {} impl ::prost::Name for MsgChannelOpenConfirmResponse { const NAME: &'static str = "MsgChannelOpenConfirmResponse"; @@ -699,7 +699,7 @@ impl ::prost::Name for MsgChannelCloseInit { } /// MsgChannelCloseInitResponse defines the Msg/ChannelCloseInit response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelCloseInitResponse {} impl ::prost::Name for MsgChannelCloseInitResponse { const NAME: &'static str = "MsgChannelCloseInitResponse"; @@ -742,7 +742,7 @@ impl ::prost::Name for MsgChannelCloseConfirm { /// MsgChannelCloseConfirmResponse defines the Msg/ChannelCloseConfirm response /// type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelCloseConfirmResponse {} impl ::prost::Name for MsgChannelCloseConfirmResponse { const NAME: &'static str = "MsgChannelCloseConfirmResponse"; @@ -779,7 +779,7 @@ impl ::prost::Name for MsgRecvPacket { } /// MsgRecvPacketResponse defines the Msg/RecvPacket response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgRecvPacketResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -821,7 +821,7 @@ impl ::prost::Name for MsgTimeout { } /// MsgTimeoutResponse defines the Msg/Timeout response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgTimeoutResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -867,7 +867,7 @@ impl ::prost::Name for MsgTimeoutOnClose { } /// MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgTimeoutOnCloseResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -909,7 +909,7 @@ impl ::prost::Name for MsgAcknowledgement { } /// MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgAcknowledgementResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -1055,7 +1055,7 @@ impl ::prost::Name for MsgChannelUpgradeAck { } /// MsgChannelUpgradeAckResponse defines MsgChannelUpgradeAck response type #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelUpgradeAckResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -1103,7 +1103,7 @@ impl ::prost::Name for MsgChannelUpgradeConfirm { } /// MsgChannelUpgradeConfirmResponse defines MsgChannelUpgradeConfirm response type #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelUpgradeConfirmResponse { #[prost(enumeration = "ResponseResultType", tag = "1")] pub result: i32, @@ -1149,7 +1149,7 @@ impl ::prost::Name for MsgChannelUpgradeOpen { } /// MsgChannelUpgradeOpenResponse defines the MsgChannelUpgradeOpen response type #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelUpgradeOpenResponse {} impl ::prost::Name for MsgChannelUpgradeOpenResponse { const NAME: &'static str = "MsgChannelUpgradeOpenResponse"; @@ -1190,7 +1190,7 @@ impl ::prost::Name for MsgChannelUpgradeTimeout { } /// MsgChannelUpgradeTimeoutRepsonse defines the MsgChannelUpgradeTimeout response type #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelUpgradeTimeoutResponse {} impl ::prost::Name for MsgChannelUpgradeTimeoutResponse { const NAME: &'static str = "MsgChannelUpgradeTimeoutResponse"; @@ -1231,7 +1231,7 @@ impl ::prost::Name for MsgChannelUpgradeCancel { } /// MsgChannelUpgradeCancelResponse defines the MsgChannelUpgradeCancel response type #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgChannelUpgradeCancelResponse {} impl ::prost::Name for MsgChannelUpgradeCancelResponse { const NAME: &'static str = "MsgChannelUpgradeCancelResponse"; @@ -1268,7 +1268,7 @@ impl ::prost::Name for MsgUpdateParams { } /// MsgUpdateParamsResponse defines the MsgUpdateParams response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -1305,7 +1305,7 @@ impl ::prost::Name for MsgPruneAcknowledgements { } /// MsgPruneAcknowledgementsResponse defines the response type for the PruneAcknowledgements rpc. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgPruneAcknowledgementsResponse { /// Number of sequences pruned (includes both packet acknowledgements and packet receipts where appropriate). #[prost(uint64, tag = "1")] @@ -2128,19 +2128,17 @@ pub mod msg_server { /// Msg defines the ibc/channel Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -2203,7 +2201,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.channel.v1.Msg/ChannelOpenInit" => { #[allow(non_camel_case_types)] @@ -2232,7 +2229,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelOpenInitSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2276,7 +2272,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelOpenTrySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2320,7 +2315,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelOpenAckSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2366,7 +2360,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelOpenConfirmSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2410,7 +2403,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelCloseInitSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2456,7 +2448,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelCloseConfirmSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2500,7 +2491,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RecvPacketSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2544,7 +2534,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TimeoutSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2588,7 +2577,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = TimeoutOnCloseSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2632,7 +2620,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AcknowledgementSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2678,7 +2665,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeInitSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2722,7 +2708,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeTrySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2766,7 +2751,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeAckSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2812,7 +2796,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeConfirmSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2858,7 +2841,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeOpenSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2904,7 +2886,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeTimeoutSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2950,7 +2931,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelUpgradeCancelSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2994,7 +2974,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateChannelParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3040,7 +3019,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PruneAcknowledgementsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -3062,8 +3040,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -3084,16 +3065,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.core.channel.v1.Msg"; } @@ -3885,7 +3856,7 @@ impl ::prost::Name for QueryUpgradeResponse { } /// QueryChannelParamsRequest is the request type for the Query/ChannelParams RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryChannelParamsRequest {} impl ::prost::Name for QueryChannelParamsRequest { const NAME: &'static str = "QueryChannelParamsRequest"; @@ -3899,7 +3870,7 @@ impl ::prost::Name for QueryChannelParamsRequest { } /// QueryChannelParamsResponse is the response type for the Query/ChannelParams RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryChannelParamsResponse { /// params defines the parameters of the module. #[prost(message, optional, tag = "1")] @@ -4633,19 +4604,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -4708,7 +4677,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.channel.v1.Query/Channel" => { #[allow(non_camel_case_types)] @@ -4739,7 +4707,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -4785,7 +4752,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -4833,7 +4799,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionChannelsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -4881,7 +4846,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelClientStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -4930,7 +4894,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelConsensusStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -4976,7 +4939,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PacketCommitmentSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5022,7 +4984,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PacketCommitmentsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5068,7 +5029,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PacketReceiptSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5117,7 +5077,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PacketAcknowledgementSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5166,7 +5125,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = PacketAcknowledgementsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5212,7 +5170,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UnreceivedPacketsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5258,7 +5215,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UnreceivedAcksSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5306,7 +5262,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = NextSequenceReceiveSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5352,7 +5307,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = NextSequenceSendSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5398,7 +5352,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradeErrorSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5444,7 +5397,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5490,7 +5442,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChannelParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -5512,8 +5463,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -5534,16 +5488,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.core.channel.v1.Query"; } diff --git a/src/prost/ibc.core.client.v1.rs b/src/prost/ibc.core.client.v1.rs index 6bbad413..c7176a41 100644 --- a/src/prost/ibc.core.client.v1.rs +++ b/src/prost/ibc.core.client.v1.rs @@ -85,7 +85,7 @@ impl ::prost::Name for ClientConsensusStates { derive(::schemars::JsonSchema) )] #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Height { /// the revision that the client is currently on #[prost(uint64, tag = "1")] @@ -300,7 +300,7 @@ impl ::prost::Name for MsgCreateClient { } /// MsgCreateClientResponse defines the Msg/CreateClient response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgCreateClientResponse {} impl ::prost::Name for MsgCreateClientResponse { const NAME: &'static str = "MsgCreateClientResponse"; @@ -341,7 +341,7 @@ impl ::prost::Name for MsgUpdateClient { } /// MsgUpdateClientResponse defines the Msg/UpdateClient response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateClientResponse {} impl ::prost::Name for MsgUpdateClientResponse { const NAME: &'static str = "MsgUpdateClientResponse"; @@ -394,7 +394,7 @@ impl ::prost::Name for MsgUpgradeClient { } /// MsgUpgradeClientResponse defines the Msg/UpgradeClient response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpgradeClientResponse {} impl ::prost::Name for MsgUpgradeClientResponse { const NAME: &'static str = "MsgUpgradeClientResponse"; @@ -437,7 +437,7 @@ impl ::prost::Name for MsgSubmitMisbehaviour { /// MsgSubmitMisbehaviourResponse defines the Msg/SubmitMisbehaviour response /// type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitMisbehaviourResponse {} impl ::prost::Name for MsgSubmitMisbehaviourResponse { const NAME: &'static str = "MsgSubmitMisbehaviourResponse"; @@ -476,7 +476,7 @@ impl ::prost::Name for MsgRecoverClient { } /// MsgRecoverClientResponse defines the Msg/RecoverClient response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgRecoverClientResponse {} impl ::prost::Name for MsgRecoverClientResponse { const NAME: &'static str = "MsgRecoverClientResponse"; @@ -524,7 +524,7 @@ impl ::prost::Name for MsgIbcSoftwareUpgrade { } /// MsgIBCSoftwareUpgradeResponse defines the Msg/IBCSoftwareUpgrade response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgIbcSoftwareUpgradeResponse {} impl ::prost::Name for MsgIbcSoftwareUpgradeResponse { const NAME: &'static str = "MsgIBCSoftwareUpgradeResponse"; @@ -561,7 +561,7 @@ impl ::prost::Name for MsgUpdateParams { } /// MsgUpdateParamsResponse defines the MsgUpdateParams response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -912,19 +912,17 @@ pub mod msg_server { /// Msg defines the ibc/client Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -987,7 +985,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.client.v1.Msg/CreateClient" => { #[allow(non_camel_case_types)] @@ -1016,7 +1013,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CreateClientSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1060,7 +1056,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateClientSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1104,7 +1099,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradeClientSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1150,7 +1144,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitMisbehaviourSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1194,7 +1187,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RecoverClientSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1240,7 +1232,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = IBCSoftwareUpgradeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1284,7 +1275,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateClientParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1306,8 +1296,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1328,16 +1321,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.core.client.v1.Msg"; } @@ -1627,7 +1610,7 @@ impl ::prost::Name for QueryClientStatusResponse { /// QueryClientParamsRequest is the request type for the Query/ClientParams RPC /// method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryClientParamsRequest {} impl ::prost::Name for QueryClientParamsRequest { const NAME: &'static str = "QueryClientParamsRequest"; @@ -1661,7 +1644,7 @@ impl ::prost::Name for QueryClientParamsResponse { /// QueryUpgradedClientStateRequest is the request type for the /// Query/UpgradedClientState RPC method #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryUpgradedClientStateRequest {} impl ::prost::Name for QueryUpgradedClientStateRequest { const NAME: &'static str = "QueryUpgradedClientStateRequest"; @@ -1697,7 +1680,7 @@ impl ::prost::Name for QueryUpgradedClientStateResponse { /// QueryUpgradedConsensusStateRequest is the request type for the /// Query/UpgradedConsensusState RPC method #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryUpgradedConsensusStateRequest {} impl ::prost::Name for QueryUpgradedConsensusStateRequest { const NAME: &'static str = "QueryUpgradedConsensusStateRequest"; @@ -2147,19 +2130,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -2222,7 +2203,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.client.v1.Query/ClientState" => { #[allow(non_camel_case_types)] @@ -2253,7 +2233,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClientStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2299,7 +2278,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClientStatesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2345,7 +2323,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConsensusStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2391,7 +2368,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConsensusStatesSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2440,7 +2416,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConsensusStateHeightsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2486,7 +2461,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClientStatusSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2532,7 +2506,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClientParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2580,7 +2553,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradedClientStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2630,7 +2602,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpgradedConsensusStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2652,8 +2623,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2674,16 +2648,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.core.client.v1.Query"; } diff --git a/src/prost/ibc.core.connection.v1.rs b/src/prost/ibc.core.connection.v1.rs index 705dd4d6..d26254df 100644 --- a/src/prost/ibc.core.connection.v1.rs +++ b/src/prost/ibc.core.connection.v1.rs @@ -171,7 +171,7 @@ impl ::prost::Name for Version { } /// Params defines the set of Connection parameters. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Params { /// maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the /// largest amount of time that the chain might reasonably take to produce the next block under normal operating @@ -281,7 +281,7 @@ impl ::prost::Name for MsgConnectionOpenInit { /// MsgConnectionOpenInitResponse defines the Msg/ConnectionOpenInit response /// type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgConnectionOpenInitResponse {} impl ::prost::Name for MsgConnectionOpenInitResponse { const NAME: &'static str = "MsgConnectionOpenInitResponse"; @@ -346,7 +346,7 @@ impl ::prost::Name for MsgConnectionOpenTry { } /// MsgConnectionOpenTryResponse defines the Msg/ConnectionOpenTry response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgConnectionOpenTryResponse {} impl ::prost::Name for MsgConnectionOpenTryResponse { const NAME: &'static str = "MsgConnectionOpenTryResponse"; @@ -405,7 +405,7 @@ impl ::prost::Name for MsgConnectionOpenAck { } /// MsgConnectionOpenAckResponse defines the Msg/ConnectionOpenAck response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgConnectionOpenAckResponse {} impl ::prost::Name for MsgConnectionOpenAckResponse { const NAME: &'static str = "MsgConnectionOpenAckResponse"; @@ -445,7 +445,7 @@ impl ::prost::Name for MsgConnectionOpenConfirm { /// MsgConnectionOpenConfirmResponse defines the Msg/ConnectionOpenConfirm /// response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgConnectionOpenConfirmResponse {} impl ::prost::Name for MsgConnectionOpenConfirmResponse { const NAME: &'static str = "MsgConnectionOpenConfirmResponse"; @@ -482,7 +482,7 @@ impl ::prost::Name for MsgUpdateParams { } /// MsgUpdateParamsResponse defines the MsgUpdateParams response type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgUpdateParamsResponse {} impl ::prost::Name for MsgUpdateParamsResponse { const NAME: &'static str = "MsgUpdateParamsResponse"; @@ -785,19 +785,17 @@ pub mod msg_server { /// Msg defines the ibc/connection Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -860,7 +858,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.connection.v1.Msg/ConnectionOpenInit" => { #[allow(non_camel_case_types)] @@ -891,7 +888,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionOpenInitSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -935,7 +931,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionOpenTrySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -979,7 +974,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionOpenAckSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1025,7 +1019,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionOpenConfirmSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1069,7 +1062,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = UpdateConnectionParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1091,8 +1083,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1113,16 +1108,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.core.connection.v1.Msg"; } @@ -1364,7 +1349,7 @@ impl ::prost::Name for QueryConnectionConsensusStateResponse { } /// QueryConnectionParamsRequest is the request type for the Query/ConnectionParams RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryConnectionParamsRequest {} impl ::prost::Name for QueryConnectionParamsRequest { const NAME: &'static str = "QueryConnectionParamsRequest"; @@ -1378,7 +1363,7 @@ impl ::prost::Name for QueryConnectionParamsRequest { } /// QueryConnectionParamsResponse is the response type for the Query/ConnectionParams RPC method. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryConnectionParamsResponse { /// params defines the parameters of the module. #[prost(message, optional, tag = "1")] @@ -1719,19 +1704,17 @@ pub mod query_server { /// Query provides defines the gRPC querier service #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -1794,7 +1777,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.core.connection.v1.Query/Connection" => { #[allow(non_camel_case_types)] @@ -1825,7 +1807,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1871,7 +1852,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1917,7 +1897,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ClientConnectionsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -1966,7 +1945,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionClientStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2016,7 +1994,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionConsensusStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2062,7 +2039,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ConnectionParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2084,8 +2060,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2106,16 +2085,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.core.connection.v1.Query"; } diff --git a/src/prost/ibc.lightclients.localhost.v2.rs b/src/prost/ibc.lightclients.localhost.v2.rs index 649f5bef..86bebfff 100644 --- a/src/prost/ibc.lightclients.localhost.v2.rs +++ b/src/prost/ibc.lightclients.localhost.v2.rs @@ -1,7 +1,7 @@ // This file is @generated by prost-build. /// ClientState defines the 09-localhost client state #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ClientState { /// the latest block height #[prost(message, optional, tag = "1")] diff --git a/src/prost/ibc.lightclients.tendermint.v1.rs b/src/prost/ibc.lightclients.tendermint.v1.rs index c8f1fb73..a1eb7a29 100644 --- a/src/prost/ibc.lightclients.tendermint.v1.rs +++ b/src/prost/ibc.lightclients.tendermint.v1.rs @@ -160,7 +160,7 @@ impl ::prost::Name for Header { /// Fraction defines the protobuf message type for tmmath.Fraction that only /// supports positive values. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Fraction { #[prost(uint64, tag = "1")] pub numerator: u64, diff --git a/src/prost/ibc.lightclients.wasm.v1.rs b/src/prost/ibc.lightclients.wasm.v1.rs index ac01e9e9..234e7354 100644 --- a/src/prost/ibc.lightclients.wasm.v1.rs +++ b/src/prost/ibc.lightclients.wasm.v1.rs @@ -61,7 +61,7 @@ impl ::prost::Name for MsgRemoveChecksum { } /// MsgStoreChecksumResponse defines the response type for the StoreCode rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgRemoveChecksumResponse {} impl ::prost::Name for MsgRemoveChecksumResponse { const NAME: &'static str = "MsgRemoveChecksumResponse"; @@ -102,7 +102,7 @@ impl ::prost::Name for MsgMigrateContract { } /// MsgMigrateContractResponse defines the response type for the MigrateContract rpc #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgMigrateContractResponse {} impl ::prost::Name for MsgMigrateContractResponse { const NAME: &'static str = "MsgMigrateContractResponse"; @@ -321,19 +321,17 @@ pub mod msg_server { /// Msg defines the ibc/08-wasm Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -396,7 +394,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.lightclients.wasm.v1.Msg/StoreCode" => { #[allow(non_camel_case_types)] @@ -425,7 +422,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = StoreCodeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -469,7 +465,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = RemoveChecksumSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -513,7 +508,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = MigrateContractSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -535,8 +529,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -557,16 +554,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "ibc.lightclients.wasm.v1.Msg"; } @@ -818,19 +805,17 @@ pub mod query_server { /// Query service for wasm module #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -893,7 +878,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/ibc.lightclients.wasm.v1.Query/Checksums" => { #[allow(non_camel_case_types)] @@ -924,7 +908,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = ChecksumsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -968,7 +951,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = CodeSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -990,8 +972,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -1012,16 +997,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "ibc.lightclients.wasm.v1.Query"; } diff --git a/src/prost/ibc.mock.rs b/src/prost/ibc.mock.rs index 40f632e2..51f0287a 100644 --- a/src/prost/ibc.mock.rs +++ b/src/prost/ibc.mock.rs @@ -1,6 +1,6 @@ // This file is @generated by prost-build. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Header { #[prost(message, optional, tag = "1")] pub height: ::core::option::Option, @@ -18,7 +18,7 @@ impl ::prost::Name for Header { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ClientState { #[prost(message, optional, tag = "1")] pub header: ::core::option::Option
, @@ -38,7 +38,7 @@ impl ::prost::Name for ClientState { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ConsensusState { #[prost(message, optional, tag = "1")] pub header: ::core::option::Option
, diff --git a/src/prost/interchain_security.ccv.consumer.v1.rs b/src/prost/interchain_security.ccv.consumer.v1.rs index 41ba559f..418b0e43 100644 --- a/src/prost/interchain_security.ccv.consumer.v1.rs +++ b/src/prost/interchain_security.ccv.consumer.v1.rs @@ -33,7 +33,7 @@ impl ::prost::Name for CrossChainValidator { /// /// Note this type is only used internally to the consumer CCV module. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SlashRecord { #[prost(bool, tag = "1")] pub waiting_on_reply: bool, @@ -89,7 +89,7 @@ impl ::prost::Name for NextFeeDistributionEstimate { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryNextFeeDistributionEstimateRequest {} impl ::prost::Name for QueryNextFeeDistributionEstimateRequest { const NAME: &'static str = "QueryNextFeeDistributionEstimateRequest"; @@ -122,7 +122,7 @@ impl ::prost::Name for QueryNextFeeDistributionEstimateResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryParamsRequest {} impl ::prost::Name for QueryParamsRequest { const NAME: &'static str = "QueryParamsRequest"; @@ -153,7 +153,7 @@ impl ::prost::Name for QueryParamsResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryProviderInfoRequest {} impl ::prost::Name for QueryProviderInfoRequest { const NAME: &'static str = "QueryProviderInfoRequest"; @@ -423,19 +423,17 @@ pub mod query_server { } #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -498,7 +496,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/interchain_security.ccv.consumer.v1.Query/QueryNextFeeDistribution" => { #[allow(non_camel_case_types)] @@ -533,7 +530,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryNextFeeDistributionSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -577,7 +573,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryParamsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -623,7 +618,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryProviderInfoSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -645,8 +639,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -667,16 +664,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "interchain_security.ccv.consumer.v1.Query"; } diff --git a/src/prost/interchain_security.ccv.provider.v1.rs b/src/prost/interchain_security.ccv.provider.v1.rs index 19cc0648..5c2a3e14 100644 --- a/src/prost/interchain_security.ccv.provider.v1.rs +++ b/src/prost/interchain_security.ccv.provider.v1.rs @@ -25,7 +25,7 @@ impl ::prost::Name for MsgAssignConsumerKey { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgAssignConsumerKeyResponse {} impl ::prost::Name for MsgAssignConsumerKeyResponse { const NAME: &'static str = "MsgAssignConsumerKeyResponse"; @@ -62,7 +62,7 @@ impl ::prost::Name for MsgSubmitConsumerMisbehaviour { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitConsumerMisbehaviourResponse {} impl ::prost::Name for MsgSubmitConsumerMisbehaviourResponse { const NAME: &'static str = "MsgSubmitConsumerMisbehaviourResponse"; @@ -106,7 +106,7 @@ impl ::prost::Name for MsgSubmitConsumerDoubleVoting { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitConsumerDoubleVotingResponse {} impl ::prost::Name for MsgSubmitConsumerDoubleVotingResponse { const NAME: &'static str = "MsgSubmitConsumerDoubleVotingResponse"; @@ -332,19 +332,17 @@ pub mod msg_server { /// Msg defines the Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -407,7 +405,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/interchain_security.ccv.provider.v1.Msg/AssignConsumerKey" => { #[allow(non_camel_case_types)] @@ -436,7 +433,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = AssignConsumerKeySvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -483,7 +479,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitConsumerMisbehaviourSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -530,7 +525,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitConsumerDoubleVotingSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -552,8 +546,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -574,16 +571,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "interchain_security.ccv.provider.v1.Msg"; } @@ -993,7 +980,7 @@ impl ::prost::Name for InitTimeoutTimestamp { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VscSendTimestamp { #[prost(uint64, tag = "1")] pub vsc_id: u64, @@ -1187,7 +1174,7 @@ impl ::prost::Name for QueryConsumerGenesisResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryConsumerChainsRequest {} impl ::prost::Name for QueryConsumerChainsRequest { const NAME: &'static str = "QueryConsumerChainsRequest"; @@ -1216,7 +1203,7 @@ impl ::prost::Name for QueryConsumerChainsResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryConsumerChainStartProposalsRequest {} impl ::prost::Name for QueryConsumerChainStartProposalsRequest { const NAME: &'static str = "QueryConsumerChainStartProposalsRequest"; @@ -1249,7 +1236,7 @@ impl ::prost::Name for QueryConsumerChainStartProposalsResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryConsumerChainStopProposalsRequest {} impl ::prost::Name for QueryConsumerChainStopProposalsRequest { const NAME: &'static str = "QueryConsumerChainStopProposalsRequest"; @@ -1374,7 +1361,7 @@ impl ::prost::Name for QueryValidatorProviderAddrResponse { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryThrottleStateRequest {} impl ::prost::Name for QueryThrottleStateRequest { const NAME: &'static str = "QueryThrottleStateRequest"; @@ -1506,7 +1493,7 @@ impl ::prost::Name for ThrottledPacketDataWrapper { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueryRegisteredConsumerRewardDenomsRequest {} impl ::prost::Name for QueryRegisteredConsumerRewardDenomsRequest { const NAME: &'static str = "QueryRegisteredConsumerRewardDenomsRequest"; @@ -2010,19 +1997,17 @@ pub mod query_server { } #[derive(Debug)] pub struct QueryServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl QueryServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -2085,7 +2070,6 @@ pub mod query_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/interchain_security.ccv.provider.v1.Query/QueryConsumerGenesis" => { #[allow(non_camel_case_types)] @@ -2116,7 +2100,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryConsumerGenesisSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2162,7 +2145,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryConsumerChainsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2212,7 +2194,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryConsumerChainStartsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2262,7 +2243,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryConsumerChainStopsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2312,7 +2292,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryValidatorConsumerAddrSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2362,7 +2341,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryValidatorProviderAddrSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2408,7 +2386,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryThrottleStateSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2461,7 +2438,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryThrottledConsumerPacketDataSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2514,7 +2490,6 @@ pub mod query_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = QueryRegisteredConsumerRewardDenomsSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -2536,8 +2511,11 @@ pub mod query_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -2558,16 +2536,6 @@ pub mod query_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for QueryServer { const NAME: &'static str = "interchain_security.ccv.provider.v1.Query"; } @@ -2670,7 +2638,7 @@ impl ::prost::Name for ConsumerState { /// ValsetUpdateIdToHeight defines the genesis information for the mapping /// of each valset udpate id to a block height #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ValsetUpdateIdToHeight { #[prost(uint64, tag = "1")] pub valset_update_id: u64, diff --git a/src/prost/interchain_security.ccv.v1.rs b/src/prost/interchain_security.ccv.v1.rs index 38756f5b..f9cca6c6 100644 --- a/src/prost/interchain_security.ccv.v1.rs +++ b/src/prost/interchain_security.ccv.v1.rs @@ -31,7 +31,7 @@ impl ::prost::Name for ValidatorSetChangePacketData { /// This packet is sent from the consumer chain to the provider chain /// to notify that a VSC packet reached maturity on the consumer chain. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VscMaturedPacketData { /// the id of the VSC packet that reached maturity #[prost(uint64, tag = "1")] @@ -398,7 +398,7 @@ impl ::prost::Name for ConsumerGenesisState { /// HeightValsetUpdateID represents a mapping internal to the consumer CCV module /// AND used in shared consumer genesis state, which links a block height to each recv valset update id. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct HeightToValsetUpdateId { #[prost(uint64, tag = "1")] pub height: u64, @@ -438,7 +438,7 @@ impl ::prost::Name for OutstandingDowntime { /// pools were transmitted to the provider chain. This type is used internally /// to the consumer CCV module AND used in shared consumer genesis state. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct LastTransmissionBlockHeight { #[prost(int64, tag = "1")] pub height: i64, @@ -458,7 +458,7 @@ impl ::prost::Name for LastTransmissionBlockHeight { /// back to the provider. This type is used internally to the consumer CCV module /// AND used in shared consumer genesis state. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MaturingVscPacket { #[prost(uint64, tag = "1")] pub vsc_id: u64, diff --git a/src/prost/proto_descriptor.bin b/src/prost/proto_descriptor.bin index 096028263110bc61e8f1d8644d8042f767f8a452..7a44e269b6107e65ffadf54f6baf77c5d894df48 100644 GIT binary patch delta 22916 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 diff --git a/src/prost/stride.interchainquery.v1.rs b/src/prost/stride.interchainquery.v1.rs index 4e89d9e9..26702ff5 100644 --- a/src/prost/stride.interchainquery.v1.rs +++ b/src/prost/stride.interchainquery.v1.rs @@ -29,7 +29,7 @@ impl ::prost::Name for MsgSubmitQueryResponse { /// MsgSubmitQueryResponseResponse defines the MsgSubmitQueryResponse response /// type. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MsgSubmitQueryResponseResponse {} impl ::prost::Name for MsgSubmitQueryResponseResponse { const NAME: &'static str = "MsgSubmitQueryResponseResponse"; @@ -181,19 +181,17 @@ pub mod msg_server { /// Msg defines the interchainquery Msg service. #[derive(Debug)] pub struct MsgServer { - inner: _Inner, + inner: Arc, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, max_decoding_message_size: Option, max_encoding_message_size: Option, } - struct _Inner(Arc); impl MsgServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); Self { inner, accept_compression_encodings: Default::default(), @@ -256,7 +254,6 @@ pub mod msg_server { Poll::Ready(Ok(())) } fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); match req.uri().path() { "/stride.interchainquery.v1.Msg/SubmitQueryResponse" => { #[allow(non_camel_case_types)] @@ -287,7 +284,6 @@ pub mod msg_server { let max_encoding_message_size = self.max_encoding_message_size; let inner = self.inner.clone(); let fut = async move { - let inner = inner.0; let method = SubmitQueryResponseSvc(inner); let codec = tonic::codec::ProstCodec::default(); let mut grpc = tonic::server::Grpc::new(codec) @@ -309,8 +305,11 @@ pub mod msg_server { Ok( http::Response::builder() .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") + .header("grpc-status", tonic::Code::Unimplemented as i32) + .header( + http::header::CONTENT_TYPE, + tonic::metadata::GRPC_CONTENT_TYPE, + ) .body(empty_body()) .unwrap(), ) @@ -331,16 +330,6 @@ pub mod msg_server { } } } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } impl tonic::server::NamedService for MsgServer { const NAME: &'static str = "stride.interchainquery.v1.Msg"; } diff --git a/tools/proto-compiler/Cargo.toml b/tools/proto-compiler/Cargo.toml index b9e4da95..c98e17db 100644 --- a/tools/proto-compiler/Cargo.toml +++ b/tools/proto-compiler/Cargo.toml @@ -8,10 +8,10 @@ rust-version = "1.60" [dependencies] git2 = "0.19" -prost-build = "0.12" +prost-build = "0.13" walkdir = "2.3" argh = "0.1" -tonic = "0.11" -tonic-build = "0.11" +tonic = "0.12" +tonic-build = "0.12" similar = "2.2" informalsystems-pbjson-build = "0.7.0"