feat: remove request stream in SyncPieces (#214)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Nov 16, 2023 · 8fdd8c8 · 8fdd8c8
1 parent ac4597d
commit 8fdd8c8
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 94 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dragonfly-api"
-version = "2.0.51"
+version = "2.0.52"
 authors = ["Gaius <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/pkg/apis/dfdaemon/v2/dfdaemon.pb.go b/pkg/apis/dfdaemon/v2/dfdaemon.pb.go
diff --git a/pkg/apis/dfdaemon/v2/dfdaemon.proto b/pkg/apis/dfdaemon/v2/dfdaemon.proto
@@ -105,7 +105,7 @@ service Dfdaemon {
   rpc GetPieceNumbers(GetPieceNumbersRequest) returns(GetPieceNumbersResponse);
 
   // SyncPieces syncs pieces from the other peer.
-  rpc SyncPieces(stream SyncPiecesRequest)returns(stream SyncPiecesResponse);
+  rpc SyncPieces(SyncPiecesRequest)returns(stream SyncPiecesResponse);
 
   // DownloadTask downloads task back-to-source.
   rpc DownloadTask(DownloadTaskRequest) returns(stream DownloadTaskResponse);

diff --git a/pkg/apis/dfdaemon/v2/dfdaemon_grpc.pb.go b/pkg/apis/dfdaemon/v2/dfdaemon_grpc.pb.go
diff --git a/pkg/apis/dfdaemon/v2/mocks/dfdaemon_mock.go b/pkg/apis/dfdaemon/v2/mocks/dfdaemon_mock.go
diff --git a/proto/dfdaemon.proto b/proto/dfdaemon.proto
@@ -98,7 +98,7 @@ service Dfdaemon{
   rpc GetPieceNumbers(GetPieceNumbersRequest) returns(GetPieceNumbersResponse);
 
   // SyncPieces syncs pieces from the other peer.
-  rpc SyncPieces(stream SyncPiecesRequest)returns(stream SyncPiecesResponse);
+  rpc SyncPieces(SyncPiecesRequest)returns(stream SyncPiecesResponse);
 
   // DownloadTask downloads task back-to-source.
   rpc DownloadTask(DownloadTaskRequest) returns(stream DownloadTaskResponse);

diff --git a/src/descriptor.bin b/src/descriptor.bin
diff --git a/src/dfdaemon.v2.rs b/src/dfdaemon.v2.rs
@@ -233,7 +233,7 @@ pub mod dfdaemon_client {
         /// SyncPieces syncs pieces from the other peer.
         pub async fn sync_pieces(
             &mut self,
-            request: impl tonic::IntoStreamingRequest<Message = super::SyncPiecesRequest>,
+            request: impl tonic::IntoRequest<super::SyncPiecesRequest>,
         ) -> std::result::Result<
             tonic::Response<tonic::codec::Streaming<super::SyncPiecesResponse>>,
             tonic::Status,
@@ -251,10 +251,10 @@ pub mod dfdaemon_client {
             let path = http::uri::PathAndQuery::from_static(
                 "/dfdaemon.v2.Dfdaemon/SyncPieces",
             );
-            let mut req = request.into_streaming_request();
+            let mut req = request.into_request();
             req.extensions_mut()
                 .insert(GrpcMethod::new("dfdaemon.v2.Dfdaemon", "SyncPieces"));
-            self.inner.streaming(req, path, codec).await
+            self.inner.server_streaming(req, path, codec).await
         }
         /// DownloadTask downloads task back-to-source.
         pub async fn download_task(
@@ -380,7 +380,7 @@ pub mod dfdaemon_server {
         /// SyncPieces syncs pieces from the other peer.
         async fn sync_pieces(
             &self,
-            request: tonic::Request<tonic::Streaming<super::SyncPiecesRequest>>,
+            request: tonic::Request<super::SyncPiecesRequest>,
         ) -> std::result::Result<tonic::Response<Self::SyncPiecesStream>, tonic::Status>;
         /// Server streaming response type for the DownloadTask method.
         type DownloadTaskStream: futures_core::Stream<
@@ -546,7 +546,7 @@ pub mod dfdaemon_server {
                     struct SyncPiecesSvc<T: Dfdaemon>(pub Arc<T>);
                     impl<
                         T: Dfdaemon,
-                    > tonic::server::StreamingService<super::SyncPiecesRequest>
+                    > tonic::server::ServerStreamingService<super::SyncPiecesRequest>
                     for SyncPiecesSvc<T> {
                         type Response = super::SyncPiecesResponse;
                         type ResponseStream = T::SyncPiecesStream;
@@ -556,9 +556,7 @@ pub mod dfdaemon_server {
                         >;
                         fn call(
                             &mut self,
-                            request: tonic::Request<
-                                tonic::Streaming<super::SyncPiecesRequest>,
-                            >,
+                            request: tonic::Request<super::SyncPiecesRequest>,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
                             let fut = async move { (*inner).sync_pieces(request).await };
@@ -583,7 +581,7 @@ pub mod dfdaemon_server {
                                 max_decoding_message_size,
                                 max_encoding_message_size,
                             );
-                        let res = grpc.streaming(method, req).await;
+                        let res = grpc.server_streaming(method, req).await;
                         Ok(res)
                     };
                     Box::pin(fut)