Change try_into_translator_err to expect_translator_err

Author: heap-coder

src/descriptor/mod.rs

@@ -581,10 +581,8 @@ impl Descriptor<DescriptorPublicKey> {
 
             translate_hash_clone!(DescriptorPublicKey, DescriptorPublicKey, ConversionError);
         }
-        self.translate_pk(&mut Derivator(index)).map_err(|e| {
-            e.try_into_translator_err()
-                .expect("No Context errors while translating")
-        })
+        self.translate_pk(&mut Derivator(index))
+            .map_err(|e| e.expect_translator_err("No Context errors while translating"))
     }
 
     #[deprecated(note = "use at_derivation_index instead")]
@@ -699,8 +697,7 @@ impl Descriptor<DescriptorPublicKey> {
         let descriptor = Descriptor::<String>::from_str(s)?;
         let descriptor = descriptor.translate_pk(&mut keymap_pk).map_err(|e| {
             Error::Unexpected(
-                e.try_into_translator_err()
-                    .expect("No Outer context errors")
+                e.expect_translator_err("No Outer context errors")
                     .to_string(),
             )
         })?;
@@ -830,10 +827,9 @@ impl Descriptor<DescriptorPublicKey> {
 
         for (i, desc) in descriptors.iter_mut().enumerate() {
             let mut index_choser = IndexChoser(i);
-            *desc = desc.translate_pk(&mut index_choser).map_err(|e| {
-                e.try_into_translator_err()
-                    .expect("No Context errors possible")
-            })?;
+            *desc = desc
+                .translate_pk(&mut index_choser)
+                .map_err(|e| e.expect_translator_err("No Context errors possible"))?;
         }
 
         Ok(descriptors)
@@ -886,10 +882,7 @@ impl Descriptor<DefiniteDescriptorKey> {
         let derived = self.translate_pk(&mut Derivator(secp));
         match derived {
             Ok(derived) => Ok(derived),
-            Err(e) => match e.try_into_translator_err() {
-                Ok(e) => Err(e),
-                Err(_) => unreachable!("No Context errors when deriving keys"),
-            },
+            Err(e) => Err(e.expect_translator_err("No Context errors when deriving keys")),
         }
     }
 }

src/lib.rs

@@ -391,14 +391,14 @@ impl<E> TranslateErr<E> {
     /// - Translating into multi-path descriptors should have same number of path
     /// for all the keys in the descriptor
     ///
-    /// # Errors
+    /// # Panics
     ///
-    /// This function will return an error if the Error is OutError.
-    pub fn try_into_translator_err(self) -> Result<E, Self> {
+    /// This function will panic if the Error is OutError.
+    pub fn expect_translator_err(self, msg: &str) -> E {
         if let Self::TranslatorErr(v) = self {
-            Ok(v)
+            v
         } else {
-            Err(self)
+            panic!("{}", msg)
         }
     }
 }

src/psbt/mod.rs

@@ -1238,10 +1238,7 @@ fn update_item_with_descriptor_helper<F: PsbtFields>(
         let mut bip32_derivation = KeySourceLookUp(BTreeMap::new(), Secp256k1::verification_only());
         let derived = descriptor
             .translate_pk(&mut bip32_derivation)
-            .map_err(|e| {
-                e.try_into_translator_err()
-                    .expect("No Outer Context errors in translations")
-            })?;
+            .map_err(|e| e.expect_translator_err("No Outer Context errors in translations"))?;
 
         if let Some(check_script) = check_script {
             if check_script != &derived.script_pubkey() {