From e1bfb29868cf49b949560bc3328ea824400a1319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sun, 24 Dec 2023 14:14:29 +0100 Subject: refactor: use hyper 1.0 in grpc test server (#21584) Ref https://github.com/denoland/deno/issues/21578 --- test_util/src/servers/grpc.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'test_util/src/servers') diff --git a/test_util/src/servers/grpc.rs b/test_util/src/servers/grpc.rs index b957d4c92..08d297a4c 100644 --- a/test_util/src/servers/grpc.rs +++ b/test_util/src/servers/grpc.rs @@ -1,8 +1,9 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use futures::StreamExt; -use hyper::header::HeaderValue; -use hyper::http; +use h2_04 as h2; +use hyper1::header::HeaderName; +use hyper1::header::HeaderValue; use rustls_tokio_stream::TlsStream; use tokio::net::TcpStream; use tokio::task::LocalSet; @@ -47,7 +48,7 @@ pub async fn h2_grpc_server(h2_grpc_port: u16, h2s_grpc_port: u16) { } async fn handle_request( - mut request: http::Request, + mut request: hyper1::Request, mut respond: h2::server::SendResponse, ) -> Result<(), anyhow::Error> { let body = request.body_mut(); @@ -58,17 +59,17 @@ pub async fn h2_grpc_server(h2_grpc_port: u16, h2s_grpc_port: u16) { let maybe_recv_trailers = body.trailers().await?; - let response = http::Response::new(()); + let response = hyper1::Response::new(()); let mut send = respond.send_response(response, false)?; send.send_data(bytes::Bytes::from_static(b"hello "), false)?; send.send_data(bytes::Bytes::from_static(b"world\n"), false)?; - let mut trailers = http::HeaderMap::new(); + let mut trailers = hyper1::HeaderMap::new(); trailers.insert( - http::HeaderName::from_static("abc"), + HeaderName::from_static("abc"), HeaderValue::from_static("def"), ); trailers.insert( - http::HeaderName::from_static("opr"), + HeaderName::from_static("opr"), HeaderValue::from_static("stv"), ); if let Some(recv_trailers) = maybe_recv_trailers { -- cgit v1.2.3