feat(wasm-utxo): improve script names, suite names

Update ScriptType enum variants to have more consistent and descriptive
naming that better reflects their purpose:
- P2tr -> P2trLegacyScriptPath
- P2trMusig2 -> P2trMusig2ScriptPath
- TaprootKeypath -> P2trMusig2TaprootKeypath

Rename test functions to use more concise and consistent naming pattern.
Functions now use "suite" suffix instead of verbose "generation_from_fixture"
descriptions.

Issue: BTC-2652

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

Author: OttoAllmendinger

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

@@ -616,9 +616,9 @@ mod tests {
 
         let psbt_input_stages = psbt_input_stages.unwrap();
 
-        if script_type != fixtures::ScriptType::TaprootKeypath
-            && script_type != fixtures::ScriptType::P2trMusig2
-            && script_type != fixtures::ScriptType::P2tr
+        if script_type != fixtures::ScriptType::P2trMusig2TaprootKeypath
+            && script_type != fixtures::ScriptType::P2trMusig2ScriptPath
+            && script_type != fixtures::ScriptType::P2trLegacyScriptPath
         {
             assert_half_sign(
                 network,
@@ -655,7 +655,7 @@ mod tests {
         Ok(())
     }
 
-    crate::test_psbt_fixtures!(test_p2sh_script_generation_from_fixture, network, format, {
+    crate::test_psbt_fixtures!(test_p2sh_suite, network, format, {
         test_wallet_script_type(fixtures::ScriptType::P2sh, network, format).unwrap();
     }, ignore: [
         // TODO: sighash support
@@ -665,7 +665,7 @@ mod tests {
         ]);
 
     crate::test_psbt_fixtures!(
-        test_p2sh_p2wsh_script_generation_from_fixture,
+        test_p2sh_p2wsh_suite,
         network,
         format,
         {
@@ -676,7 +676,7 @@ mod tests {
     );
 
     crate::test_psbt_fixtures!(
-        test_p2wsh_script_generation_from_fixture,
+        test_p2wsh_suite,
         network,
         format,
         {
@@ -686,27 +686,24 @@ mod tests {
         ignore: [BitcoinGold]
     );
 
-    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_legacy_script_path_suite, network, format, {
+        test_wallet_script_type(fixtures::ScriptType::P2trLegacyScriptPath, 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, format).unwrap();
-        }
-    );
+    crate::test_psbt_fixtures!(test_p2tr_musig2_script_path_suite, network, format, {
+        test_wallet_script_type(fixtures::ScriptType::P2trMusig2ScriptPath, 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, format).unwrap();
-        }
-    );
+    crate::test_psbt_fixtures!(test_p2tr_musig2_key_path_suite, network, format, {
+        test_wallet_script_type(
+            fixtures::ScriptType::P2trMusig2TaprootKeypath,
+            network,
+            format,
+        )
+        .unwrap();
+    });
 
     crate::test_psbt_fixtures!(test_extract_transaction, network, format, {
         let fixture = fixtures::load_psbt_fixture_with_format(

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

@@ -689,12 +689,12 @@ mod tests {
             .expect("Failed to load fixture");
 
         let (input_index, input_fixture) = fixture
-            .find_input_with_script_type(ScriptType::TaprootKeypath)
+            .find_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
             .expect("Failed to find taprootKeyPathSpend input");
 
         let finalized_input_fixture = if signature_state == SignatureState::Fullsigned {
             let (finalized_input_index, finalized_input_fixture) = fixture
-                .find_finalized_input_with_script_type(ScriptType::TaprootKeypath)
+                .find_finalized_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
                 .expect("Failed to find taprootKeyPathSpend finalized input");
             assert_eq!(input_index, finalized_input_index);
             Some(finalized_input_fixture)

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

@@ -1143,9 +1143,12 @@ pub enum ScriptType {
     P2sh,
     P2shP2wsh,
     P2wsh,
-    P2tr,
-    P2trMusig2,
-    TaprootKeypath,
+    // Chain 30 and 31 - we only support script path spending for these
+    P2trLegacyScriptPath,
+    // Chain 40 and 41 - script path spend
+    P2trMusig2ScriptPath,
+    // Chain 40 and 41 - keypath spend
+    P2trMusig2TaprootKeypath,
 }
 
 impl ScriptType {
@@ -1155,9 +1158,9 @@ impl ScriptType {
             ScriptType::P2sh => "p2sh",
             ScriptType::P2shP2wsh => "p2shP2wsh",
             ScriptType::P2wsh => "p2wsh",
-            ScriptType::P2tr => "p2tr",
-            ScriptType::P2trMusig2 => "p2trMusig2",
-            ScriptType::TaprootKeypath => "taprootKeypath",
+            ScriptType::P2trLegacyScriptPath => "p2tr",
+            ScriptType::P2trMusig2ScriptPath => "p2trMusig2",
+            ScriptType::P2trMusig2TaprootKeypath => "taprootKeypath",
         }
     }
 
@@ -1168,13 +1171,16 @@ impl ScriptType {
             (ScriptType::P2sh, PsbtInputFixture::P2sh(_))
                 | (ScriptType::P2shP2wsh, PsbtInputFixture::P2shP2wsh(_))
                 | (ScriptType::P2wsh, PsbtInputFixture::P2wsh(_))
-                | (ScriptType::P2tr, PsbtInputFixture::P2trLegacy(_))
                 | (
-                    ScriptType::P2trMusig2,
+                    ScriptType::P2trLegacyScriptPath,
+                    PsbtInputFixture::P2trLegacy(_)
+                )
+                | (
+                    ScriptType::P2trMusig2ScriptPath,
                     PsbtInputFixture::P2trMusig2ScriptPath(_)
                 )
                 | (
-                    ScriptType::TaprootKeypath,
+                    ScriptType::P2trMusig2TaprootKeypath,
                     PsbtInputFixture::P2trMusig2KeyPath(_)
                 )
         )
@@ -1187,13 +1193,16 @@ impl ScriptType {
             (ScriptType::P2sh, PsbtFinalInputFixture::P2sh(_))
                 | (ScriptType::P2shP2wsh, PsbtFinalInputFixture::P2shP2wsh(_))
                 | (ScriptType::P2wsh, PsbtFinalInputFixture::P2wsh(_))
-                | (ScriptType::P2tr, PsbtFinalInputFixture::P2trLegacy(_))
                 | (
-                    ScriptType::P2trMusig2,
+                    ScriptType::P2trLegacyScriptPath,
+                    PsbtFinalInputFixture::P2trLegacy(_)
+                )
+                | (
+                    ScriptType::P2trMusig2ScriptPath,
                     PsbtFinalInputFixture::P2trMusig2ScriptPath(_)
                 )
                 | (
-                    ScriptType::TaprootKeypath,
+                    ScriptType::P2trMusig2TaprootKeypath,
                     PsbtFinalInputFixture::P2trMusig2KeyPath(_)
                 )
         )
@@ -1206,7 +1215,9 @@ impl ScriptType {
     pub fn is_taproot(&self) -> bool {
         matches!(
             self,
-            ScriptType::P2tr | ScriptType::P2trMusig2 | ScriptType::TaprootKeypath
+            ScriptType::P2trLegacyScriptPath
+                | ScriptType::P2trMusig2ScriptPath
+                | ScriptType::P2trMusig2TaprootKeypath
         )
     }
 
@@ -1520,7 +1531,7 @@ mod tests {
 
         // Test finding taproot key path finalized input
         let (index, input) = fixture
-            .find_finalized_input_with_script_type(ScriptType::TaprootKeypath)
+            .find_finalized_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
             .expect("Failed to find taproot key path finalized input");
         assert_eq!(index, 5);
         assert!(matches!(input, PsbtFinalInputFixture::P2trMusig2KeyPath(_)));