apply review changes

Author: sdmg15

rpc/tests/cli.rs

@@ -101,8 +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 listener = testenv::get_bound_port().await.expect("listener");
-    let port = listener.local_addr().unwrap().port();
+    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()),
@@ -118,8 +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 listener = testenv::get_bound_port().await.expect("listener");
-    let port = listener.local_addr().unwrap().port();
+    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()),
@@ -144,8 +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 listener = testenv::get_bound_port().await.expect("listener");
-    let port = listener.local_addr().unwrap().port();
+    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"]))
@@ -163,8 +160,7 @@ async fn test_cli_notify_confidence() {
         .answers(&|_, _| mock_confidence_stream());
     let mock_wallet_service = Unimock::new(clause).no_verify_in_drop();
 
-    let listener = testenv::get_bound_port().await.expect("listener");
-    let port = listener.local_addr().unwrap().port();
+    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",

testenv/src/lib.rs

@@ -15,12 +15,6 @@ use bdk_wallet::bitcoin::secp256k1::All;
 use bdk_wallet::bitcoin::{Address, Amount, BlockHash, Network, Transaction, Txid};
 use bmp_tracing::tracing;
 use tokio::net::TcpListener;
-
-/// 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 async fn get_bound_port() -> Result<TcpListener> {
-    TcpListener::bind("127.0.0.1:0").await.map_err(Into::into)
-}
 use electrsd::corepc_node::Node;
 use electrsd::electrum_client::{Client, ElectrumApi};
 use electrsd::{ElectrsD, corepc_node};
@@ -468,6 +462,14 @@ impl TestEnv {
     pub fn p2p_socket_addr(&self) -> Option<SocketAddrV4> {
         self.bitcoind.params.p2p_socket
     }
+
+    /// 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 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))
+    }
 }
 
 impl Drop for TestEnv {