Merge pull request #34 from cita-cloud/bump_dept

Bump dept

cloud-proto/Cargo.toml

@@ -1,24 +1,24 @@
 [package]
 name = "cita_cloud_proto"
-version = "6.7.3"
+version = "6.7.4"
 authors = ["Rivtower Technologies <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
 description = "cita-cloud proto library"
 
 
 [dependencies]
-tonic = "0.11"
-prost = "0.12"
-tokio = { version = "1.36", default-features = false, features = ["macros"] }
+tonic = "0.12"
+prost = "0.13"
+tokio = { version = "1.38", default-features = false, features = ["macros"] }
 thiserror = "1.0"
-http = "0.2"
+http = "1.1"
 futures-retry = "0.6"
 backoff = "0.4"
 async-trait = "0.1"
 tracing = "0.1"
-tracing-opentelemetry = "0.22"
-opentelemetry = "0.21"
+tracing-opentelemetry = "0.24"
+opentelemetry = "0.23"
 
 [build-dependencies]
-tonic-build = { version = "0.11", optional = true }
+tonic-build = { version = "0.12", optional = true }

cloud-proto/src/proto/blockchain.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct BlockHeader {

cloud-proto/src/proto/common.rs

@@ -1,5 +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 Empty {}
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -66,7 +67,7 @@ pub struct ConsensusConfiguration {
     pub validators: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct StatusCode {
     #[prost(uint32, tag = "1")]
     pub code: u32,

cloud-proto/src/proto/consensus.rs

@@ -1,3 +1,4 @@
+// This file is @generated by prost-build.
 /// Generated client implementations.
 pub mod consensus_service_client {
     #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
@@ -144,19 +145,17 @@ pub mod consensus_service_server {
     }
     #[derive(Debug)]
     pub struct ConsensusServiceServer<T: ConsensusService> {
-        inner: _Inner<T>,
+        inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    struct _Inner<T>(Arc<T>);
     impl<T: ConsensusService> ConsensusServiceServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
         pub fn from_arc(inner: Arc<T>) -> Self {
-            let inner = _Inner(inner);
             Self {
                 inner,
                 accept_compression_encodings: Default::default(),
@@ -216,7 +215,6 @@ pub mod consensus_service_server {
             Poll::Ready(Ok(()))
         }
         fn call(&mut self, req: http::Request<B>) -> Self::Future {
-            let inner = self.inner.clone();
             match req.uri().path() {
                 "/consensus.ConsensusService/Reconfigure" => {
                     #[allow(non_camel_case_types)]
@@ -244,7 +242,6 @@ pub mod consensus_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 = ReconfigureSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -287,7 +284,6 @@ pub mod consensus_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 = CheckBlockSvc(inner);
                         let codec = tonic::codec::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
@@ -307,8 +303,11 @@ pub mod consensus_service_server {
                 _ => Box::pin(async move {
                     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())
                 }),
@@ -327,16 +326,6 @@ pub mod consensus_service_server {
             }
         }
     }
-    impl<T: ConsensusService> Clone for _Inner<T> {
-        fn clone(&self) -> Self {
-            Self(Arc::clone(&self.0))
-        }
-    }
-    impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "{:?}", self.0)
-        }
-    }
     impl<T: ConsensusService> tonic::server::NamedService for ConsensusServiceServer<T> {
         const NAME: &'static str = "consensus.ConsensusService";
     }