Update to latest tokio version 1.16.1

Cargo.toml

@@ -13,7 +13,7 @@ bitcoin-wallet = "1.1.0"
 bitcoin = "0.25"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "0.3", features = ["full"] }
+tokio = { version = "1.16.1", features = ["full"] }
 log = "^0.4"
 env_logger = "0.7"
 futures = "0.3"

src/maker_protocol.rs

@@ -2,10 +2,9 @@ use std::net::{Ipv4Addr, SocketAddr};
 use std::sync::{Arc, RwLock};
 use std::time::{Duration, Instant};
 
-use tokio::io::BufReader;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::tcp::WriteHalf;
 use tokio::net::TcpListener;
-use tokio::prelude::*;
 use tokio::select;
 use tokio::sync::mpsc;
 use tokio::time::sleep;
@@ -260,7 +259,8 @@ async fn send_message(
     socket_writer: &mut WriteHalf<'_>,
     first_message: &MakerToTakerMessage,
 ) -> Result<(), Error> {
-    let mut message_bytes = serde_json::to_vec(first_message).map_err(|e| io::Error::from(e))?;
+    let mut message_bytes =
+        serde_json::to_vec(first_message).map_err(|e| std::io::Error::from(e))?;
     message_bytes.push(b'\n');
     socket_writer.write_all(&message_bytes).await?;
     Ok(())

src/offerbook_sync.rs

@@ -1,6 +1,5 @@
-use tokio::io::BufReader;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::TcpStream;
-use tokio::prelude::*;
 use tokio::sync::mpsc;
 
 use crate::messages::{GiveOffer, MakerToTakerMessage, Offer, TakerHello, TakerToMakerMessage};

src/taker_protocol.rs

@@ -3,10 +3,9 @@ use std::io::ErrorKind;
 use std::iter::once;
 use std::time::Duration;
 
-use tokio::io::BufReader;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::tcp::{ReadHalf, WriteHalf};
 use tokio::net::TcpStream;
-use tokio::prelude::*;
 use tokio::time::sleep;
 
 use bitcoin::consensus::encode::deserialize;
@@ -406,7 +405,7 @@ async fn send_message(
     message: TakerToMakerMessage,
 ) -> Result<(), Error> {
     log::debug!("==> {:#?}", message);
-    let mut result_bytes = serde_json::to_vec(&message).map_err(|e| io::Error::from(e))?;
+    let mut result_bytes = serde_json::to_vec(&message).map_err(|e| std::io::Error::from(e))?;
     result_bytes.push(b'\n');
     socket_writer.write_all(&result_bytes).await?;
     Ok(())
@@ -416,7 +415,7 @@ async fn read_message(reader: &mut BufReader<ReadHalf<'_>>) -> Result<MakerToTak
     let mut line = String::new();
     let n = reader.read_line(&mut line).await?;
     if n == 0 {
-        return Err(Error::Network(Box::new(io::Error::new(
+        return Err(Error::Network(Box::new(std::io::Error::new(
             ErrorKind::ConnectionReset,
             "EOF",
         ))));

src/watchtower_client.rs

@@ -1,6 +1,5 @@
-use tokio::io::BufReader;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::TcpStream;
-use tokio::prelude::*;
 
 use crate::error::Error;
 use crate::watchtower_protocol::{

src/watchtower_protocol.rs

@@ -4,10 +4,9 @@ use std::net::Ipv4Addr;
 use std::sync::{Arc, RwLock};
 use std::time::Duration;
 
-use tokio::io::BufReader;
+use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::tcp::WriteHalf;
 use tokio::net::TcpListener;
-use tokio::prelude::*;
 use tokio::select;
 use tokio::sync::mpsc;
 use tokio::time::sleep;
@@ -265,7 +264,7 @@ async fn send_message(
     socket_writer: &mut WriteHalf<'_>,
     message: &WatchtowerToMakerMessage,
 ) -> Result<(), Error> {
-    let mut message_bytes = serde_json::to_vec(message).map_err(|e| io::Error::from(e))?;
+    let mut message_bytes = serde_json::to_vec(message).map_err(|e| std::io::Error::from(e))?;
     message_bytes.push(b'\n');
     socket_writer.write_all(&message_bytes).await?;
     Ok(())