miniscript: remove unused Result from extdata type_check

Author: apoelstra

src/miniscript/mod.rs

@@ -163,7 +163,7 @@ mod private {
         pub fn from_ast(t: Terminal<Pk, Ctx>) -> Result<Miniscript<Pk, Ctx>, Error> {
             let res = Miniscript {
                 ty: Type::type_check(&t)?,
-                ext: ExtData::type_check(&t)?,
+                ext: ExtData::type_check(&t),
                 node: t,
                 phantom: PhantomData,
             };

src/miniscript/types/extra_props.rs

@@ -6,7 +6,7 @@
 use core::cmp;
 use core::iter::once;
 
-use super::{Error, ScriptContext};
+use super::ScriptContext;
 use crate::miniscript::context::SigType;
 use crate::prelude::*;
 use crate::{script_num_size, AbsLockTime, MiniscriptKey, RelLockTime, Terminal};
@@ -924,7 +924,7 @@ impl ExtData {
 
     /// Compute the type of a fragment assuming all the children of
     /// Miniscript have been computed already.
-    pub fn type_check<Pk, Ctx>(fragment: &Terminal<Pk, Ctx>) -> Result<Self, Error>
+    pub fn type_check<Pk, Ctx>(fragment: &Terminal<Pk, Ctx>) -> Self
     where
         Ctx: ScriptContext,
         Pk: MiniscriptKey,
@@ -990,7 +990,7 @@ impl ExtData {
             }
         };
         ret.sanity_checks();
-        Ok(ret)
+        ret
     }
 }
 

src/policy/compiler.rs

@@ -540,7 +540,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> AstElemExt<Pk, Ctx> {
         //Types and ExtData are already cached and stored in children. So, we can
         //type_check without cache. For Compiler extra data, we supply a cache.
         let ty = types::Type::type_check(&ast)?;
-        let ext = types::ExtData::type_check(&ast)?;
+        let ext = types::ExtData::type_check(&ast);
         let comp_ext_data = CompilerExtData::type_check_with_child(&ast, lookup_ext);
         Ok(AstElemExt {
             ms: Arc::new(Miniscript::from_components_unchecked(ast, ty, ext)),
@@ -563,7 +563,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> AstElemExt<Pk, Ctx> {
         //Types and ExtData are already cached and stored in children. So, we can
         //type_check without cache. For Compiler extra data, we supply a cache.
         let ty = types::Type::type_check(&ast)?;
-        let ext = types::ExtData::type_check(&ast)?;
+        let ext = types::ExtData::type_check(&ast);
         let comp_ext_data = CompilerExtData::type_check_with_child(&ast, lookup_ext);
         Ok(AstElemExt {
             ms: Arc::new(Miniscript::from_components_unchecked(ast, ty, ext)),