f - Remove ReadAdaptor in favor of reading into a buffer

Using block_on inside ReadAdaptor led to a test occasionally hanging.

Author: jkczyz

lightning-block-sync/src/http.rs

@@ -275,7 +275,12 @@ impl HttpClient {
 							std::io::ErrorKind::InvalidInput, "unsupported transfer coding"))
 				} else {
 					#[cfg(feature = "tokio")]
-					let reader = ReadAdapter(&mut reader);
+					let reader = {
+						// Read the stream into a buffer since chunked_transfer isn't async.
+						let mut buffer = Vec::new();
+						reader.read_to_end(&mut buffer).await?;
+						std::io::Cursor::new(buffer)
+					};
 					let mut decoder = chunked_transfer::Decoder::new(reader);
 					let mut content = Vec::new();
 					decoder.read_to_end(&mut content)?;
@@ -362,18 +367,6 @@ enum HttpMessageLength {
 	TransferEncoding(String),
 }
 
-/// An adaptor for making `tokio::io::AsyncRead` compatible with interfaces expecting
-/// `std::io::Read`. This effectively makes the adapted object synchronous.
-#[cfg(feature = "tokio")]
-struct ReadAdapter<'a, R: tokio::io::AsyncRead + std::marker::Unpin>(&'a mut R);
-
-#[cfg(feature = "tokio")]
-impl<'a, R: tokio::io::AsyncRead + std::marker::Unpin> std::io::Read for ReadAdapter<'a, R> {
-	fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-		futures::executor::block_on(self.0.read(buf))
-	}
-}
-
 /// An HTTP response body in binary format.
 pub(crate) struct BinaryResponse(pub(crate) Vec<u8>);