wip: Change ScriptContext to Context

Author: tcharding

bitcoind-tests/bin/bitcoind

@@ -25,7 +25,7 @@ use bitcoin::secp256k1;
 use internals::hex::exts::DisplayHex;
 use miniscript::descriptor::{SinglePub, SinglePubKey};
 use miniscript::{
-    bitcoin, hash256, Descriptor, DescriptorPublicKey, Error, Miniscript, ScriptContext,
+    bitcoin, hash256, Descriptor, DescriptorPublicKey, Error, Miniscript, Context,
     TranslatePk, Translator,
 };
 use rand::RngCore;
@@ -150,7 +150,7 @@ pub fn random_pk(mut seed: u8) -> bitcoin::PublicKey {
 #[allow(dead_code)]
 // https://github.com/rust-lang/rust/issues/46379. The code is pub fn and integration test, but still shows warnings
 /// Parse an insane miniscript into a miniscript with the format described above at file header
-pub fn parse_insane_ms<Ctx: ScriptContext>(
+pub fn parse_insane_ms<Ctx: Context>(
     ms: &str,
     pubdata: &PubData,
 ) -> Miniscript<DescriptorPublicKey, Ctx> {

bitcoind-tests/tests/setup/test_util.rs

@@ -19,7 +19,7 @@ use bitcoin::{
 use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
 use miniscript::bitcoin::{self, ecdsa, taproot, ScriptBuf};
 use miniscript::psbt::{PsbtExt, PsbtInputExt};
-use miniscript::{Descriptor, Miniscript, ScriptContext, ToPublicKey};
+use miniscript::{Descriptor, Miniscript, Context, ToPublicKey};
 mod setup;
 
 use rand::RngCore;
@@ -318,7 +318,7 @@ pub fn test_desc_satisfy(
 }
 
 // Find all secret corresponding to the known public keys in ms
-fn find_sks_ms<Ctx: ScriptContext>(
+fn find_sks_ms<Ctx: Context>(
     ms: &Miniscript<bitcoin::PublicKey, Ctx>,
     testdata: &TestData,
 ) -> Vec<secp256k1::SecretKey> {

bitcoind-tests/tests/test_desc.rs

@@ -15,7 +15,7 @@ use bitcoin::{Address, Network, ScriptBuf};
 
 use super::checksum::{self, verify_checksum};
 use crate::expression::{self, FromTree};
-use crate::miniscript::context::{ScriptContext, ScriptContextError};
+use crate::miniscript::context::{Context, ContextError};
 use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
@@ -205,7 +205,7 @@ pub struct Pkh<Pk: Key> {
 
 impl<Pk: Key> Pkh<Pk> {
     /// Create a new Pkh descriptor
-    pub fn new(pk: Pk) -> Result<Self, ScriptContextError> {
+    pub fn new(pk: Pk) -> Result<Self, ContextError> {
         // do the top-level checks
         match BareCtx::check_pk(&pk) {
             Ok(()) => Ok(Pkh { pk }),

src/descriptor/bare.rs

@@ -13,7 +13,7 @@ use bitcoin::{Address, Network, ScriptBuf};
 use super::checksum::{self, verify_checksum};
 use super::SortedMultiVec;
 use crate::expression::{self, FromTree};
-use crate::miniscript::context::{ScriptContext, ScriptContextError};
+use crate::miniscript::context::{Context, ContextError};
 use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::varint_len;
@@ -303,7 +303,7 @@ pub struct Wpkh<Pk: Key> {
 
 impl<Pk: Key> Wpkh<Pk> {
     /// Create a new Wpkh descriptor
-    pub fn new(pk: Pk) -> Result<Self, ScriptContextError> {
+    pub fn new(pk: Pk) -> Result<Self, ContextError> {
         // do the top-level checks
         match Segwitv0::check_pk(&pk) {
             Ok(_) => Ok(Wpkh { pk }),
@@ -330,7 +330,7 @@ impl<Pk: Key> Wpkh<Pk> {
     /// Checks whether the descriptor is safe.
     pub fn sanity_check(&self) -> Result<(), Error> {
         if self.pk.is_uncompressed() {
-            Err(Error::ContextError(ScriptContextError::CompressedOnly(
+            Err(Error::ContextError(ContextError::CompressedOnly(
                 self.pk.to_string(),
             )))
         } else {

src/descriptor/segwitv0.rs

@@ -17,7 +17,7 @@ use bitcoin::{script, Address, Network, ScriptBuf};
 use super::checksum::{self, verify_checksum};
 use super::{SortedMultiVec, Wpkh, Wsh};
 use crate::expression::{self, FromTree};
-use crate::miniscript::context::ScriptContext;
+use crate::miniscript::context::Context;
 use crate::policy::{semantic, Liftable};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};

src/descriptor/sh.rs

@@ -12,7 +12,7 @@ use core::str::FromStr;
 
 use bitcoin::script;
 
-use crate::miniscript::context::ScriptContext;
+use crate::miniscript::context::Context;
 use crate::miniscript::decode::Terminal;
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::prelude::*;
@@ -23,16 +23,16 @@ use crate::{
 
 /// Contents of a "sortedmulti" descriptor
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct SortedMultiVec<Pk: Key, Ctx: ScriptContext> {
+pub struct SortedMultiVec<Pk: Key, Ctx: Context> {
     /// signatures required
     pub k: usize,
     /// public keys inside sorted Multi
     pub pks: Vec<Pk>,
-    /// The current ScriptContext for sortedmulti
+    /// The current Context for sortedmulti
     pub(crate) phantom: PhantomData<Ctx>,
 }
 
-impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> SortedMultiVec<Pk, Ctx> {
     /// Create a new instance of `SortedMultiVec` given a list of keys and the threshold
     ///
     /// Internally checks all the applicable size limits and pubkey types limitations according to the current `Ctx`.
@@ -98,13 +98,13 @@ impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> ForEachKey<Pk> for SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> ForEachKey<Pk> for SortedMultiVec<Pk, Ctx> {
     fn for_each_key<'a, F: FnMut(&'a Pk) -> bool>(&'a self, pred: F) -> bool {
         self.pks.iter().all(pred)
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> SortedMultiVec<Pk, Ctx> {
     /// utility function to sanity a sorted multi vec
     pub fn sanity_check(&self) -> Result<(), Error> {
         let ms: Miniscript<Pk, Ctx> =
@@ -116,7 +116,7 @@ impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> SortedMultiVec<Pk, Ctx> {
     /// Create Terminal::Multi containing sorted pubkeys
     pub fn sorted_node(&self) -> Terminal<Pk, Ctx>
     where
@@ -194,7 +194,7 @@ impl<Pk: Key, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> policy::Liftable<Pk> for SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> policy::Liftable<Pk> for SortedMultiVec<Pk, Ctx> {
     fn lift(&self) -> Result<policy::semantic::Policy<Pk>, Error> {
         let ret = policy::semantic::Policy::Threshold(
             self.k,
@@ -207,13 +207,13 @@ impl<Pk: Key, Ctx: ScriptContext> policy::Liftable<Pk> for SortedMultiVec<Pk, Ct
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> fmt::Debug for SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> fmt::Debug for SortedMultiVec<Pk, Ctx> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         fmt::Display::fmt(self, f)
     }
 }
 
-impl<Pk: Key, Ctx: ScriptContext> fmt::Display for SortedMultiVec<Pk, Ctx> {
+impl<Pk: Key, Ctx: Context> fmt::Display for SortedMultiVec<Pk, Ctx> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "sortedmulti({}", self.k)?;
         for k in &self.pks {

src/descriptor/sortedmulti.rs

@@ -19,7 +19,7 @@ use crate::policy::Liftable;
 use crate::prelude::*;
 use crate::util::{varint_len, witness_size};
 use crate::{
-    errstr, Error, ForEachKey, Key, Satisfier, ScriptContext, Tap, ToPublicKey, TranslateErr,
+    errstr, Error, ForEachKey, Key, Satisfier, Context, Tap, ToPublicKey, TranslateErr,
     TranslatePk, Translator,
 };
 

src/descriptor/tr.rs

@@ -6,7 +6,7 @@ use bitcoin::taproot::{ControlBlock, TAPROOT_ANNEX_PREFIX};
 use bitcoin::Witness;
 
 use super::{stack, BitcoinKey, Error, Stack};
-use crate::miniscript::context::{NoChecks, ScriptContext, SigType};
+use crate::miniscript::context::{NoChecks, Context, SigType};
 use crate::prelude::*;
 use crate::{BareCtx, ExtParams, Legacy, Miniscript, Segwitv0, Tap, ToPublicKey, Translator};
 
@@ -38,7 +38,7 @@ fn pk_from_stack_elem(
 
 // Parse the script with appropriate context to check for context errors like
 // correct usage of x-only keys or multi_a
-fn script_from_stack_elem<Ctx: ScriptContext>(
+fn script_from_stack_elem<Ctx: Context>(
     elem: &stack::Element<'_>,
 ) -> Result<Miniscript<Ctx::Key, Ctx>, Error> {
     match *elem {
@@ -368,7 +368,7 @@ pub(super) trait ToNoChecks {
     fn to_no_checks_ms(&self) -> Miniscript<BitcoinKey, NoChecks>;
 }
 
-impl<Ctx: ScriptContext> ToNoChecks for Miniscript<bitcoin::PublicKey, Ctx> {
+impl<Ctx: Context> ToNoChecks for Miniscript<bitcoin::PublicKey, Ctx> {
     fn to_no_checks_ms(&self) -> Miniscript<BitcoinKey, NoChecks> {
         struct TranslateFullPk;
 
@@ -385,7 +385,7 @@ impl<Ctx: ScriptContext> ToNoChecks for Miniscript<bitcoin::PublicKey, Ctx> {
     }
 }
 
-impl<Ctx: ScriptContext> ToNoChecks for Miniscript<bitcoin::key::XOnlyPublicKey, Ctx> {
+impl<Ctx: Context> ToNoChecks for Miniscript<bitcoin::key::XOnlyPublicKey, Ctx> {
     fn to_no_checks_ms(&self) -> Miniscript<BitcoinKey, NoChecks> {
         // specify the () error type as this cannot error
         struct TranslateXOnlyPk;

src/interpreter/inner.rs

@@ -15,7 +15,7 @@ use bitcoin::hashes::{hash160, ripemd160, sha256, Hash};
 use bitcoin::{absolute, secp256k1, sighash, taproot, Sequence, TxOut, Witness};
 
 use crate::miniscript::context::{NoChecks, SigType};
-use crate::miniscript::ScriptContext;
+use crate::miniscript::Context;
 use crate::prelude::*;
 use crate::{hash256, Descriptor, Miniscript, Terminal, ToPublicKey};
 
@@ -540,7 +540,7 @@ pub struct Iter<'intp, 'txin: 'intp> {
 ///Iterator for Iter
 impl<'intp, 'txin: 'intp> Iterator for Iter<'intp, 'txin>
 where
-    NoChecks: ScriptContext,
+    NoChecks: Context,
 {
     type Item = Result<SatisfiedConstraint, Error>;
 
@@ -560,7 +560,7 @@ where
 
 impl<'intp, 'txin: 'intp> Iter<'intp, 'txin>
 where
-    NoChecks: ScriptContext,
+    NoChecks: Context,
 {
     /// Helper function to push a NodeEvaluationState on state stack
     fn push_evaluation_state(