feat(wasm-utxo): refactor PSBT fixture test macro to include format parameter

Updates the test_psbt_fixtures macro to include the transaction format as
an explicit parameter instead of hardcoding it within each test function.
This reduces code duplication and makes the test infrastructure more
flexible.

Issue: BTC-2652

Co-authored-by: llm-git <[email protected]>

Author: OttoAllmendinger

packages/wasm-utxo/src/bitgo_psbt/mod.rs

@@ -184,9 +184,8 @@ mod tests {
         }
     }
 
-    crate::test_psbt_fixtures!(test_parse_network_mainnet_only, network, {
-        test_parse_with_format(fixtures::TxFormat::Psbt, network);
-        test_parse_with_format(fixtures::TxFormat::PsbtLite, network);
+    crate::test_psbt_fixtures!(test_parse_network_mainnet_only, network, format, {
+        test_parse_with_format(format, network);
     });
 
     #[test]
@@ -242,9 +241,8 @@ mod tests {
         }
     }
 
-    crate::test_psbt_fixtures!(test_round_trip_mainnet_only, network, {
-        test_round_trip_with_format(fixtures::TxFormat::Psbt, network);
-        test_round_trip_with_format(fixtures::TxFormat::PsbtLite, network);
+    crate::test_psbt_fixtures!(test_round_trip_mainnet_only, network, format, {
+        test_round_trip_with_format(format, network);
     });
 
     fn parse_derivation_path(path: &str) -> Result<(u32, u32), String> {
@@ -281,26 +279,6 @@ mod tests {
         Ok((chain, index))
     }
 
-    fn find_input_with_script_type(
-        fixture: &fixtures::PsbtFixture,
-        script_type: fixtures::ScriptType,
-    ) -> Result<(usize, &fixtures::PsbtInputFixture), String> {
-        let result = fixture
-            .psbt_inputs
-            .iter()
-            .enumerate()
-            .filter(|(_, input)| script_type.matches_fixture(input))
-            .collect::<Vec<_>>();
-        if result.len() != 1 {
-            return Err(format!(
-                "Expected 1 input with script type {}, got {}",
-                script_type.as_str(),
-                result.len()
-            ));
-        }
-        Ok(result[0])
-    }
-
     fn get_output_script_from_non_witness_utxo(
         input: &fixtures::P2shInput,
         index: usize,
@@ -343,7 +321,7 @@ mod tests {
 
         // Check if the script type is supported by the network
         let output_script_support = network.output_script_support();
-        let input_fixture = find_input_with_script_type(&fixture, script_type);
+        let input_fixture = fixture.find_input_with_script_type(script_type);
         if !script_type.is_supported_by(&output_script_support) {
             // Script type not supported by network - skip test (no fixture expected)
             assert!(
@@ -441,101 +419,47 @@ mod tests {
         Ok(())
     }
 
-    crate::test_psbt_fixtures!(test_p2sh_script_generation_from_fixture, network, {
-        test_wallet_script_type(
-            fixtures::ScriptType::P2sh,
-            network,
-            fixtures::TxFormat::Psbt,
-        )
-        .unwrap();
-        test_wallet_script_type(
-            fixtures::ScriptType::P2sh,
-            network,
-            fixtures::TxFormat::PsbtLite,
-        )
-        .unwrap();
+    crate::test_psbt_fixtures!(test_p2sh_script_generation_from_fixture, network, format, {
+        test_wallet_script_type(fixtures::ScriptType::P2sh, network, format).unwrap();
     });
 
-    crate::test_psbt_fixtures!(test_p2sh_p2wsh_script_generation_from_fixture, network, {
-        test_wallet_script_type(
-            fixtures::ScriptType::P2shP2wsh,
-            network,
-            fixtures::TxFormat::Psbt,
-        )
-        .unwrap();
-        test_wallet_script_type(
-            fixtures::ScriptType::P2shP2wsh,
-            network,
-            fixtures::TxFormat::PsbtLite,
-        )
-        .unwrap();
-    });
+    crate::test_psbt_fixtures!(
+        test_p2sh_p2wsh_script_generation_from_fixture,
+        network,
+        format,
+        {
+            test_wallet_script_type(fixtures::ScriptType::P2shP2wsh, network, format).unwrap();
+        }
+    );
 
-    crate::test_psbt_fixtures!(test_p2wsh_script_generation_from_fixture, network, {
-        test_wallet_script_type(
-            fixtures::ScriptType::P2wsh,
-            network,
-            fixtures::TxFormat::Psbt,
-        )
-        .unwrap();
-        test_wallet_script_type(
-            fixtures::ScriptType::P2wsh,
-            network,
-            fixtures::TxFormat::PsbtLite,
-        )
-        .unwrap();
-    });
+    crate::test_psbt_fixtures!(
+        test_p2wsh_script_generation_from_fixture,
+        network,
+        format,
+        {
+            test_wallet_script_type(fixtures::ScriptType::P2wsh, network, format).unwrap();
+        }
+    );
 
-    crate::test_psbt_fixtures!(test_p2tr_script_generation_from_fixture, network, {
-        test_wallet_script_type(
-            fixtures::ScriptType::P2tr,
-            network,
-            fixtures::TxFormat::Psbt,
-        )
-        .unwrap();
-        test_wallet_script_type(
-            fixtures::ScriptType::P2tr,
-            network,
-            fixtures::TxFormat::PsbtLite,
-        )
-        .unwrap();
+    crate::test_psbt_fixtures!(test_p2tr_script_generation_from_fixture, network, format, {
+        test_wallet_script_type(fixtures::ScriptType::P2tr, network, format).unwrap();
     });
 
     crate::test_psbt_fixtures!(
         test_p2tr_musig2_script_path_generation_from_fixture,
         network,
+        format,
         {
-            test_wallet_script_type(
-                fixtures::ScriptType::P2trMusig2,
-                network,
-                fixtures::TxFormat::Psbt,
-            )
-            .unwrap();
-            test_wallet_script_type(
-                fixtures::ScriptType::P2trMusig2,
-                network,
-                fixtures::TxFormat::PsbtLite,
-            )
-            .unwrap();
+            test_wallet_script_type(fixtures::ScriptType::P2trMusig2, network, format).unwrap();
         }
     );
 
     crate::test_psbt_fixtures!(
         test_p2tr_musig2_key_path_spend_script_generation_from_fixture,
         network,
+        format,
         {
-            test_wallet_script_type(
-                fixtures::ScriptType::TaprootKeypath,
-                network,
-                fixtures::TxFormat::Psbt,
-            )
-            .unwrap();
-            test_wallet_script_type(
-                fixtures::ScriptType::TaprootKeypath,
-                network,
-                fixtures::TxFormat::PsbtLite,
-            )
-            .unwrap();
+            test_wallet_script_type(fixtures::ScriptType::TaprootKeypath, network, format).unwrap();
         }
     );
 

packages/wasm-utxo/src/fixed_script_wallet/test_utils/fixtures.rs

@@ -269,6 +269,26 @@ impl PsbtFixture {
         )?;
         Ok(psbt)
     }
+
+    pub fn find_input_with_script_type(
+        &self,
+        script_type: ScriptType,
+    ) -> Result<(usize, &PsbtInputFixture), String> {
+        let result = self
+            .psbt_inputs
+            .iter()
+            .enumerate()
+            .filter(|(_, input)| script_type.matches_fixture(input))
+            .collect::<Vec<_>>();
+        if result.len() != 1 {
+            return Err(format!(
+                "Expected 1 input with script type {}, got {}",
+                script_type.as_str(),
+                result.len()
+            ));
+        }
+        Ok(result[0])
+    }
 }
 
 // Output script fixture types
@@ -729,20 +749,22 @@ impl ScriptType {
 }
 
 /// Macro for testing PSBT fixtures across all mainnet networks (excluding testnets and BSV)
+/// and both transaction formats (Psbt and PsbtLite)
 ///
 /// This macro generates test cases for mainnet networks only: Bitcoin, BitcoinCash, Ecash,
-/// BitcoinGold, Dash, Dogecoin, Litecoin, and Zcash.
+/// BitcoinGold, Dash, Dogecoin, Litecoin, and Zcash, combined with both TxFormat variants.
+/// This creates a cartesian product of 8 networks × 2 formats = 16 test cases.
 ///
 /// # Example
 /// ```rust,no_run
-/// test_psbt_fixtures!(test_my_feature, network, {
+/// test_psbt_fixtures!(test_my_feature, network, format, {
 ///     let fixture = load_psbt_fixture_with_network(network, SignatureState::Fullsigned).unwrap();
-///     // ... test logic here
+///     // ... test logic using both network and format
 /// });
 /// ```
 #[macro_export]
 macro_rules! test_psbt_fixtures {
-    ($test_name:ident, $network:ident, $body:block) => {
+    ($test_name:ident, $network:ident, $format:ident, $body:block) => {
         #[rstest::rstest]
         #[case::bitcoin($crate::Network::Bitcoin)]
         #[case::bitcoin_cash($crate::Network::BitcoinCash)]
@@ -752,7 +774,13 @@ macro_rules! test_psbt_fixtures {
         #[case::dogecoin($crate::Network::Dogecoin)]
         #[case::litecoin($crate::Network::Litecoin)]
         #[case::zcash($crate::Network::Zcash)]
-        fn $test_name(#[case] $network: $crate::Network) $body
+        fn $test_name(
+            #[case] $network: $crate::Network,
+            #[values(
+                $crate::fixed_script_wallet::test_utils::fixtures::TxFormat::Psbt,
+                $crate::fixed_script_wallet::test_utils::fixtures::TxFormat::PsbtLite
+            )] $format: $crate::fixed_script_wallet::test_utils::fixtures::TxFormat
+        ) $body
     };
 }