Rename Bare to BareCtx

Author: sanket1729

src/descriptor/mod.rs

@@ -44,7 +44,7 @@ use policy;
 use push_opcode_size;
 use script_num_size;
 use util::witness_to_scriptsig;
-use Bare;
+use BareCtx;
 use Error;
 use MiniscriptKey;
 use Satisfier;
@@ -70,7 +70,7 @@ pub type KeyMap = HashMap<DescriptorPublicKey, DescriptorSecretKey>;
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Descriptor<Pk: MiniscriptKey> {
     /// A raw scriptpubkey (including pay-to-pubkey) under Legacy context
-    Bare(Miniscript<Pk, Bare>),
+    Bare(Miniscript<Pk, BareCtx>),
     /// Pay-to-Pubkey
     Pk(Pk),
     /// Pay-to-PubKey-Hash
@@ -766,7 +766,7 @@ where
             }
             _ => {
                 let sub = Miniscript::from_tree(&top)?;
-                Bare::top_level_checks(&sub)?;
+                BareCtx::top_level_checks(&sub)?;
                 Ok(Descriptor::Bare(sub))
             }
         }

src/lib.rs

@@ -130,7 +130,7 @@ use bitcoin::hashes::{hash160, sha256, Hash};
 
 pub use descriptor::{Descriptor, DescriptorPublicKey, DescriptorPublicKeyCtx};
 pub use interpreter::Interpreter;
-pub use miniscript::context::{Bare, Legacy, ScriptContext, Segwitv0};
+pub use miniscript::context::{BareCtx, Legacy, ScriptContext, Segwitv0};
 pub use miniscript::decode::Terminal;
 pub use miniscript::satisfy::{BitcoinSig, Satisfier};
 pub use miniscript::Miniscript;

src/miniscript/context.rs

@@ -396,9 +396,9 @@ impl ScriptContext for Segwitv0 {
 /// In general, it is not recommended to use Bare descriptors
 /// as they as strongly limited by standardness policies.
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub enum Bare {}
+pub enum BareCtx {}
 
-impl ScriptContext for Bare {
+impl ScriptContext for BareCtx {
     fn check_terminal_non_malleable<Pk: MiniscriptKey, Ctx: ScriptContext>(
         _frag: &Terminal<Pk, Ctx>,
     ) -> Result<(), ScriptContextError> {
@@ -499,12 +499,12 @@ impl ScriptContext for NoChecks {
 
 /// Private Mod to prevent downstream from implementing this public trait
 mod private {
-    use super::{Bare, Legacy, NoChecks, Segwitv0};
+    use super::{BareCtx, Legacy, NoChecks, Segwitv0};
 
     pub trait Sealed {}
 
     // Implement for those same types, but no others.
-    impl Sealed for Bare {}
+    impl Sealed for BareCtx {}
     impl Sealed for Legacy {}
     impl Sealed for Segwitv0 {}
     impl Sealed for NoChecks {}

src/miniscript/mod.rs

@@ -30,7 +30,7 @@ use std::{fmt, str};
 use bitcoin;
 use bitcoin::blockdata::script;
 
-pub use self::context::{Bare, Legacy, Segwitv0};
+pub use self::context::{BareCtx, Legacy, Segwitv0};
 
 pub mod analyzable;
 pub mod astelem;

src/psbt/finalizer.rs

@@ -27,7 +27,7 @@ use interpreter;
 use Descriptor;
 use Miniscript;
 use NullCtx;
-use {Bare, Legacy, Segwitv0};
+use {BareCtx, Legacy, Segwitv0};
 // Get the scriptpubkey for the psbt input
 fn get_scriptpubkey(psbt: &Psbt, index: usize) -> Result<&Script, InputError> {
     let script_pubkey;
@@ -192,7 +192,7 @@ fn get_descriptor(psbt: &Psbt, index: usize) -> Result<Descriptor<PublicKey>, In
         if inp.redeem_script.is_some() {
             return Err(InputError::NonEmptyRedeemScript);
         }
-        let ms = Miniscript::<bitcoin::PublicKey, Bare>::parse_insane(script_pubkey)?;
+        let ms = Miniscript::<bitcoin::PublicKey, BareCtx>::parse_insane(script_pubkey)?;
         Ok(Descriptor::Bare(ms))
     }
 }