reverse the change to get_bound_port, make it tokio again

Author: ChrisSon15

rpc/tests/cli.rs

@@ -13,6 +13,7 @@ use predicates::str;
 use rpc::server::{WalletImpl, WalletServer};
 use rpc::wallet::{TxConfidence, WalletService, WalletServiceImpl, WalletServiceMock, WalletTx};
 use testenv::TestEnv;
+use tokio::net::TcpListener;
 use tokio::task::{self, JoinHandle};
 use tonic::transport::server::TcpIncoming;
 use tonic::transport::{self, Server};
@@ -100,7 +101,7 @@ fn test_cli_no_connection() {
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_cli_wallet_balance() {
     let testenv = TestEnv::new().expect("testEnv could not start");
-    let (port, listener) = TestEnv::get_bound_port().expect("listener");
+    let (port, listener) = TestEnv::get_bound_port().await.expect("listener");
     spawn_wallet_grpc_service(
         listener,
         WalletServiceImpl::create_with_rpc_params(testenv.bitcoin_core_rpc_client().unwrap()),
@@ -116,7 +117,7 @@ async fn test_cli_wallet_balance() {
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_cli_new_address() {
     let testenv = TestEnv::new().expect("testEnv could not start"); // TODO: this doesnt make sense as a CLI make only sense if the bitcoind is
-    let (port, listener) = TestEnv::get_bound_port().expect("listener");
+    let (port, listener) = TestEnv::get_bound_port().await.expect("listener");
     spawn_wallet_grpc_service(
         listener,
         WalletServiceImpl::create_with_rpc_params(testenv.bitcoin_core_rpc_client().unwrap()),
@@ -141,7 +142,7 @@ async fn test_cli_list_unspent() {
         .some_call(matching!()).returns(vec![mock_utxo()]);
     let mock_wallet_service = Unimock::new(clause).no_verify_in_drop();
 
-    let (port, listener) = TestEnv::get_bound_port().expect("listener");
+    let (port, listener) = TestEnv::get_bound_port().await.expect("listener");
     spawn_wallet_grpc_service(listener, mock_wallet_service);
 
     task::spawn_blocking(move || assert_cli_with_port(port, ["list-unspent"]))
@@ -159,7 +160,7 @@ async fn test_cli_notify_confidence() {
         .answers(&|_, _| mock_confidence_stream());
     let mock_wallet_service = Unimock::new(clause).no_verify_in_drop();
 
-    let (port, listener) = TestEnv::get_bound_port().expect("listener");
+    let (port, listener) = TestEnv::get_bound_port().await.expect("listener");
     spawn_wallet_grpc_service(listener, mock_wallet_service);
 
     task::spawn_blocking(move || assert_cli_with_port(port, ["notify-confidence",
@@ -236,13 +237,11 @@ fn assert_cli_with_port<'a>(port: u16, args: impl IntoIterator<Item=&'a str>) ->
 }
 
 fn spawn_wallet_grpc_service(
-    listener: std::net::TcpListener,
+    listener: TcpListener,
     wallet_service: impl WalletService + Send + Sync + 'static,
 ) -> JoinHandle<Result<(), transport::Error>> {
-    listener.set_nonblocking(true).expect("set_nonblocking");
-    let tokio_listener = tokio::net::TcpListener::from_std(listener).expect("from_std");
     let wallet = WalletImpl { wallet_service: Arc::new(wallet_service) };
-    let incoming = TcpIncoming::from(tokio_listener);
+    let incoming = TcpIncoming::from(listener);
 
     task::spawn(async move {
         Server::builder()

testenv/src/lib.rs

@@ -23,6 +23,7 @@ use secp::Scalar;
 use sha2::Sha256;
 use simple_semaphore::{Permit, Semaphore};
 use tempfile::{tempdir, TempDir};
+use tokio::net::TcpListener;
 
 /// Bitcoin regtest environment manager
 pub struct TestEnv {
@@ -497,9 +498,9 @@ impl TestEnv {
 
     /// Returns a `TcpListener` bound to an available port (port 0 lets OS assign).
     /// This avoids race conditions by keeping the port bound until used.
-    pub fn get_bound_port() -> Result<(u16, std::net::TcpListener)> {
-        let listener = std::net::TcpListener::bind("127.0.0.1:0")?;
-        let port = listener.local_addr()?.port();
+    pub async fn get_bound_port() -> Result<(u16, TcpListener)> {
+        let listener = TcpListener::bind("127.0.0.1:0").await?;
+        let port = listener.local_addr().unwrap().port();
         Ok((port, listener))
     }
 }