Fix rpc and esplora blockchain test failures

Co-authored-by: saikishore222 <saikishore.chsk@gmail.com>

Author: SanthoshAnguluri

src/blockchain/electrum.rs

@@ -338,8 +338,8 @@ mod test {
     }
 
     make_blockchain_tests![
-        @type BlockchainType::ElectrumBlockchain,
-        @tests (
+        blockchain BlockchainType::ElectrumBlockchain,
+        tests (
             test_sync_simple,
             test_sync_stop_gap_20,
             test_sync_before_and_after_receive,

src/blockchain/esplora/mod.rs

@@ -168,16 +168,15 @@ pub mod test {
 
     #[cfg(feature = "test-esplora")]
     make_blockchain_tests![
-        @type BlockchainType::EsploraBlockchain,
-        @tests (
+        blockchain BlockchainType::EsploraBlockchain,
+        tests (
             test_sync_simple,
             test_sync_stop_gap_20,
             test_sync_before_and_after_receive,
             test_sync_multiple_outputs_same_tx,
             test_sync_receive_multi,
             test_sync_address_reuse,
             test_sync_receive_rbf_replaced,
-            test_sync_reorg_block,
             test_sync_after_send,
             test_sync_double_receive,
             test_sync_many_sends_to_a_single_address,

src/blockchain/rpc.rs

@@ -589,8 +589,8 @@ pub mod test {
     }
 
     make_blockchain_tests![
-        @type BlockchainType::RpcBlockchain,
-        @tests (
+        blockchain BlockchainType::RpcBlockchain,
+        tests (
             test_sync_simple,
             test_sync_stop_gap_20,
             test_sync_before_and_after_receive,
@@ -608,9 +608,16 @@ pub mod test {
             test_sync_bump_fee_add_input_simple,
             test_sync_bump_fee_add_input_no_change,
             test_sync_receive_coinbase,
-            test_send_to_bech32m_addr,
             test_double_spend,
-            test_tx_chain,
+            test_tx_chain
+        )
+    ];
+
+    #[cfg(not(feature = "test-rpc-legacy"))]
+    make_blockchain_tests![
+        blockchain BlockchainType::RpcBlockchain,
+        tests (
+            test_send_to_bech32m_addr,
             test_taproot_key_spend,
             test_taproot_script_spend,
             test_sign_taproot_core_keyspend_psbt,

src/testutils/blockchain_tests.rs

@@ -413,37 +413,8 @@ pub mod test {
         TaprootScriptSpend3,
     }
 
-    fn init_wallet(
-        ty: WalletType,
-        chain_type: BlockchainType,
-    ) -> (
-        Wallet<MemoryDatabase>,
-        AnyBlockchain,
-        (String, Option<String>),
-        TestClient,
-    ) {
-        let _ = env_logger::try_init();
-
-        let descriptors = match ty {
-            WalletType::WpkhSingleSig => testutils! {
-                @descriptors ( "wpkh(Alice)" ) ( "wpkh(Alice)" ) ( @keys ( "Alice" => (@generate_xprv "/44'/0'/0'/0/*", "/44'/0'/0'/1/*") ) )
-            },
-            WalletType::TaprootKeySpend => testutils! {
-                @descriptors ( "tr(Alice)" ) ( "tr(Alice)" ) ( @keys ( "Alice" => (@generate_xprv "/44'/0'/0'/0/*", "/44'/0'/0'/1/*") ) )
-            },
-            WalletType::TaprootScriptSpend => testutils! {
-                @descriptors ( "tr(Key,and_v(v:pk(Script),older(6)))" ) ( "tr(Key,and_v(v:pk(Script),older(6)))" ) ( @keys ( "Key" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Script" => (@generate_xprv "/0/*", "/1/*") ) )
-            },
-            WalletType::TaprootScriptSpend2 => testutils! {
-                @descriptors ( "tr(Alice,pk(Bob))" ) ( "tr(Alice,pk(Bob))" ) ( @keys ( "Alice" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Bob" => (@generate_xprv "/0/*", "/1/*") ) )
-            },
-            WalletType::TaprootScriptSpend3 => testutils! {
-                @descriptors ( "tr(Alice,{pk(Bob),pk(Carol)})" ) ( "tr(Alice,{pk(Bob),pk(Carol)})" ) ( @keys ( "Alice" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Bob" => (@generate_xprv "/0/*", "/1/*"), "Carol" => (@generate_xprv "/0/*", "/1/*") ) )
-            },
-        };
-
-        let test_client = TestClient::default();
-        let blockchain: AnyBlockchain = match chain_type {
+    fn get_blockchain(test_client: &TestClient, chain_type: BlockchainType) -> AnyBlockchain {
+        match chain_type {
             #[cfg(any(feature = "test-rpc", feature = "test-rpc-legacy"))]
             BlockchainType::RpcBlockchain => {
                 let config = RpcConfig {
@@ -481,7 +452,40 @@ pub mod test {
                     electrum_client::new(&test_client.electrsd.electrum_url).unwrap(),
                 )))
             }
+        }
+    }
+
+    fn init_wallet(
+        ty: WalletType,
+        chain_type: BlockchainType,
+    ) -> (
+        Wallet<MemoryDatabase>,
+        AnyBlockchain,
+        (String, Option<String>),
+        TestClient,
+    ) {
+        let _ = env_logger::try_init();
+
+        let descriptors = match ty {
+            WalletType::WpkhSingleSig => testutils! {
+                @descriptors ( "wpkh(Alice)" ) ( "wpkh(Alice)" ) ( @keys ( "Alice" => (@generate_xprv "/44'/0'/0'/0/*", "/44'/0'/0'/1/*") ) )
+            },
+            WalletType::TaprootKeySpend => testutils! {
+                @descriptors ( "tr(Alice)" ) ( "tr(Alice)" ) ( @keys ( "Alice" => (@generate_xprv "/44'/0'/0'/0/*", "/44'/0'/0'/1/*") ) )
+            },
+            WalletType::TaprootScriptSpend => testutils! {
+                @descriptors ( "tr(Key,and_v(v:pk(Script),older(6)))" ) ( "tr(Key,and_v(v:pk(Script),older(6)))" ) ( @keys ( "Key" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Script" => (@generate_xprv "/0/*", "/1/*") ) )
+            },
+            WalletType::TaprootScriptSpend2 => testutils! {
+                @descriptors ( "tr(Alice,pk(Bob))" ) ( "tr(Alice,pk(Bob))" ) ( @keys ( "Alice" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Bob" => (@generate_xprv "/0/*", "/1/*") ) )
+            },
+            WalletType::TaprootScriptSpend3 => testutils! {
+                @descriptors ( "tr(Alice,{pk(Bob),pk(Carol)})" ) ( "tr(Alice,{pk(Bob),pk(Carol)})" ) ( @keys ( "Alice" => (@literal "30e14486f993d5a2d222770e97286c56cec5af115e1fb2e0065f476a0fcf8788"), "Bob" => (@generate_xprv "/0/*", "/1/*"), "Carol" => (@generate_xprv "/0/*", "/1/*") ) )
+            },
         };
+
+        let test_client = TestClient::default();
+        let blockchain: AnyBlockchain = get_blockchain(&test_client, chain_type);
         let wallet = get_wallet_from_descriptors(&descriptors);
 
         // rpc need to call import_multi before receiving any tx, otherwise will not see tx in the mempool
@@ -491,49 +495,6 @@ pub mod test {
         (wallet, blockchain, descriptors, test_client)
     }
 
-    fn get_blockchain(test_client: &TestClient, chain_type: BlockchainType) -> AnyBlockchain {
-        let blockchain: AnyBlockchain = match chain_type {
-            #[cfg(any(feature = "test-rpc", feature = "test-rpc-legacy"))]
-            BlockchainType::RpcBlockchain => {
-                let config = RpcConfig {
-                    url: test_client.bitcoind.rpc_url(),
-                    auth: Auth::Cookie {
-                        file: test_client.bitcoind.params.cookie_file.clone(),
-                    },
-                    network: Network::Regtest,
-                    wallet_name: format!(
-                        "client-wallet-test-{}",
-                        std::time::SystemTime::now()
-                            .duration_since(std::time::UNIX_EPOCH)
-                            .unwrap()
-                            .as_nanos()
-                    ),
-                    skip_blocks: None,
-                };
-                AnyBlockchain::Rpc(Box::new(RpcBlockchain::from_config(&config).unwrap()))
-            }
-
-            #[cfg(feature = "test-esplora")]
-            BlockchainType::EsploraBlockchain => {
-                AnyBlockchain::Esplora(Box::new(EsploraBlockchain::new(
-                    &format!(
-                        "http://{}",
-                        test_client.electrsd.esplora_url.as_ref().unwrap()
-                    ),
-                    20,
-                )))
-            }
-
-            #[cfg(feature = "test-electrum")]
-            BlockchainType::ElectrumBlockchain => {
-                AnyBlockchain::Electrum(Box::new(ElectrumBlockchain::from(
-                    electrum_client::new(&test_client.electrsd.electrum_url).unwrap(),
-                )))
-            }
-        };
-        blockchain
-    }
-
     fn init_single_sig(
         chain_type: BlockchainType,
     ) -> (
@@ -1822,10 +1783,11 @@ pub mod test {
         assert_eq!(finalized, true);
     }
 }
+
 #[macro_export]
 #[doc(hidden)]
 macro_rules! make_blockchain_tests {
-    (@type $chain_type:expr, @tests ( $($x:tt) , + $(,)? )) => {
+    (blockchain $chain_type:expr, tests ( $($x:tt) , + $(,)? )) => {
         $(
           #[test]
           fn $x()