Skip to content

Commit 9bd330e

Browse files
apoelstraapoelstra
committed
run cargo fmt
1 parent 928bf29 commit 9bd330e

File tree

18 files changed

+54
-58
lines changed

18 files changed

+54
-58
lines changed

‎src/descriptor/bare.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use crate::miniscript::context::ScriptContext;
2929
use crate::policy::{semantic, Liftable};
3030
use crate::util::{varint_len, witness_to_scriptsig};
3131
use crate::{
32-
elementssig_to_rawsig, BareCtx, Error, ForEach, ForEachKey, Miniscript,
33-
MiniscriptKey, Satisfier, ToPublicKey, TranslatePk, Translator,
32+
elementssig_to_rawsig, BareCtx, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey,
33+
Satisfier, ToPublicKey, TranslatePk, Translator,
3434
};
3535

3636
/// Create a Bare Descriptor. That is descriptor that is
@@ -357,4 +357,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Pkh<P> {
357357
Ok(Pkh::new(t.pk(&self.pk)?))
358358
}
359359
}
360-

‎src/descriptor/blinded.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use elements::{self, Script};
2525
use super::checksum::{desc_checksum, strip_checksum, verify_checksum};
2626
use super::{Descriptor, TranslatePk};
2727
use crate::expression::{self, FromTree};
28-
use crate::extensions::{CovenantExt, CovExtArgs};
28+
use crate::extensions::{CovExtArgs, CovenantExt};
2929
use crate::policy::{semantic, Liftable};
3030
use crate::{Error, MiniscriptKey, Satisfier, ToPublicKey, Translator};
3131

‎src/descriptor/mod.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ use self::checksum::verify_checksum;
4040
use crate::extensions::{CovExtArgs, ExtParam, ParseableExt};
4141
use crate::miniscript::{Legacy, Miniscript, Segwitv0};
4242
use crate::{
43-
expression, miniscript, BareCtx, CovenantExt, Error, Extension, ExtTranslator, ForEach, ForEachKey,
44-
MiniscriptKey, NoExt, Satisfier, ToPublicKey, TranslateExt, TranslatePk, Translator,
43+
expression, miniscript, BareCtx, CovenantExt, Error, ExtTranslator, Extension, ForEach,
44+
ForEachKey, MiniscriptKey, NoExt, Satisfier, ToPublicKey, TranslateExt, TranslatePk,
45+
Translator,
4546
};
4647

4748
mod bare;
@@ -287,7 +288,9 @@ impl<Pk: MiniscriptKey, Ext: Extension> From<Tr<Pk, NoExt>> for Descriptor<Pk, E
287288
}
288289
}
289290

290-
impl<Pk: MiniscriptKey, Arg: ExtParam> From<LegacyCSFSCov<Pk, CovenantExt<Arg>>> for Descriptor<Pk, CovenantExt<Arg>> {
291+
impl<Pk: MiniscriptKey, Arg: ExtParam> From<LegacyCSFSCov<Pk, CovenantExt<Arg>>>
292+
for Descriptor<Pk, CovenantExt<Arg>>
293+
{
291294
#[inline]
292295
fn from(inner: LegacyCSFSCov<Pk, CovenantExt<Arg>>) -> Self {
293296
Descriptor::LegacyCSFSCov(inner)
@@ -417,10 +420,7 @@ impl<Pk: MiniscriptKey, Ext: Extension> Descriptor<Pk, Ext> {
417420

418421
/// Create new tr descriptor
419422
/// Errors when miniscript exceeds resource limits under Tap context
420-
pub fn new_tr_ext(
421-
key: Pk,
422-
script: Option<tr::TapTree<Pk, Ext>>,
423-
) -> Result<Self, Error> {
423+
pub fn new_tr_ext(key: Pk, script: Option<tr::TapTree<Pk, Ext>>) -> Result<Self, Error> {
424424
Ok(Descriptor::TrExt(Tr::new(key, script)?))
425425
}
426426

@@ -720,8 +720,7 @@ where
720720
}
721721
}
722722

723-
impl<PExt, QExt, Pk> TranslateExt<PExt, QExt>
724-
for Descriptor<Pk, PExt>
723+
impl<PExt, QExt, Pk> TranslateExt<PExt, QExt> for Descriptor<Pk, PExt>
725724
where
726725
PExt: Extension + TranslateExt<PExt, QExt, Output = QExt>,
727726
QExt: Extension,

‎src/descriptor/pegin/dynafed_pegin.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use elements::secp256k1_zkp;
2929

3030
use crate::descriptor::checksum::{desc_checksum, verify_checksum};
3131
use crate::expression::{self, FromTree};
32-
use crate::extensions::{CovenantExt, CovExtArgs};
32+
use crate::extensions::{CovExtArgs, CovenantExt};
3333
use crate::policy::{semantic, Liftable};
3434
use crate::{
3535
BtcDescriptor, BtcError, BtcFromTree, BtcLiftable, BtcPolicy, BtcSatisfier, BtcTree,
@@ -50,7 +50,10 @@ pub struct Pegin<Pk: MiniscriptKey> {
5050

5151
impl<Pk: MiniscriptKey> Pegin<Pk> {
5252
/// Create a new LegacyPegin descriptor
53-
pub fn new(fed_desc: BtcDescriptor<Pk>, elem_desc: Descriptor<Pk, CovenantExt<CovExtArgs>>) -> Self {
53+
pub fn new(
54+
fed_desc: BtcDescriptor<Pk>,
55+
elem_desc: Descriptor<Pk, CovenantExt<CovExtArgs>>,
56+
) -> Self {
5457
Self {
5558
fed_desc,
5659
elem_desc,

‎src/descriptor/pegin/legacy_pegin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use elements::secp256k1_zkp;
3434

3535
use crate::descriptor::checksum::{desc_checksum, verify_checksum};
3636
use crate::expression::{self, FromTree};
37-
use crate::extensions::{CovenantExt, CovExtArgs};
37+
use crate::extensions::{CovExtArgs, CovenantExt};
3838
use crate::policy::{semantic, Liftable};
3939
use crate::util::varint_len;
4040
use crate::{

‎src/descriptor/segwitv0.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ use crate::miniscript::context::{ScriptContext, ScriptContextError};
2828
use crate::policy::{semantic, Liftable};
2929
use crate::util::varint_len;
3030
use crate::{
31-
elementssig_to_rawsig, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey,
32-
Satisfier, Segwitv0, ToPublicKey, TranslatePk, Translator,
31+
elementssig_to_rawsig, Error, ForEach, ForEachKey, Miniscript, MiniscriptKey, Satisfier,
32+
Segwitv0, ToPublicKey, TranslatePk, Translator,
3333
};
3434
/// A Segwitv0 wsh descriptor
3535
#[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
@@ -519,4 +519,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Wpkh<P> {
519519
Ok(Wpkh::new(t.pk(&self.pk)?).expect("Uncompressed keys in Wpkh"))
520520
}
521521
}
522-

‎src/descriptor/sh.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use crate::miniscript::context::ScriptContext;
2929
use crate::policy::{semantic, Liftable};
3030
use crate::util::{varint_len, witness_to_scriptsig};
3131
use crate::{
32-
push_opcode_size, Error, ForEach, ForEachKey, Legacy, Miniscript, MiniscriptKey,
33-
Satisfier, Segwitv0, ToPublicKey, TranslatePk, Translator,
32+
push_opcode_size, Error, ForEach, ForEachKey, Legacy, Miniscript, MiniscriptKey, Satisfier,
33+
Segwitv0, ToPublicKey, TranslatePk, Translator,
3434
};
3535

3636
/// A Legacy p2sh Descriptor
@@ -403,4 +403,3 @@ impl<P: MiniscriptKey, Q: MiniscriptKey> TranslatePk<P, Q> for Sh<P> {
403403
Ok(Sh { inner })
404404
}
405405
}
406-

‎src/descriptor/tr.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,7 @@ impl<Pk: MiniscriptKey, Ext: Extension> TapTree<Pk, Ext> {
146146
}
147147

148148
// Helper function to translate extensions
149-
fn translate_ext_helper<T, QExt, Error>(
150-
&self,
151-
t: &mut T,
152-
) -> Result<TapTree<Pk, QExt>, Error>
149+
fn translate_ext_helper<T, QExt, Error>(&self, t: &mut T) -> Result<TapTree<Pk, QExt>, Error>
153150
where
154151
T: crate::ExtTranslator<Ext, QExt, Error>,
155152
QExt: Extension,

‎src/extensions/arith.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use crate::miniscript::satisfy::{Satisfaction, Witness};
1616
use crate::miniscript::types::extra_props::{OpLimits, TimelockInfo};
1717
use crate::miniscript::types::{Base, Correctness, Dissat, ExtData, Input, Malleability};
1818
use crate::{
19-
expression, interpreter, miniscript, script_num_size, Error, Extension,
20-
Satisfier, ToPublicKey, TranslateExt,
19+
expression, interpreter, miniscript, script_num_size, Error, Extension, Satisfier, ToPublicKey,
20+
TranslateExt,
2121
};
2222

2323
/// Enum representing arithmetic operations with transaction amounts.

‎src/extensions/csfs.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ use bitcoin::XOnlyPublicKey;
99
use elements::hashes::hex;
1010
use elements::{self, opcodes, secp256k1_zkp};
1111

12-
use super::{ArgFromStr, CovExtArgs, ExtParam, ParseableExt, TxEnv};
1312
use super::param::{ExtParamTranslator, TranslateExtParam};
13+
use super::{ArgFromStr, CovExtArgs, ExtParam, ParseableExt, TxEnv};
1414
use crate::miniscript::context::ScriptContextError;
1515
use crate::miniscript::lex::{Token as Tk, TokenIter};
1616
use crate::miniscript::limits::MAX_STANDARD_P2WSH_STACK_ITEM_SIZE;
1717
use crate::miniscript::satisfy::{Satisfaction, Witness};
1818
use crate::miniscript::types::extra_props::{OpLimits, TimelockInfo};
1919
use crate::miniscript::types::{Base, Correctness, Dissat, ExtData, Input, Malleability};
2020
use crate::{
21-
expression, interpreter, miniscript, Error, Extension, ExtTranslator, Satisfier, ToPublicKey, TranslateExt,
21+
expression, interpreter, miniscript, Error, ExtTranslator, Extension, Satisfier, ToPublicKey,
22+
TranslateExt,
2223
};
2324

2425
/// CheckSigFromStack struct
@@ -113,7 +114,8 @@ impl<T: ExtParam> Extension for CheckSigFromStack<T> {
113114
}
114115
}
115116

116-
impl<PArg, QArg> TranslateExt<CheckSigFromStack<PArg>, CheckSigFromStack<QArg>> for CheckSigFromStack<PArg>
117+
impl<PArg, QArg> TranslateExt<CheckSigFromStack<PArg>, CheckSigFromStack<QArg>>
118+
for CheckSigFromStack<PArg>
117119
where
118120
CheckSigFromStack<PArg>: Extension,
119121
CheckSigFromStack<QArg>: Extension,
@@ -143,8 +145,6 @@ where
143145
}
144146
}
145147

146-
147-
148148
/// Wrapper around CheckSigFromStack signature messages
149149
#[derive(Debug, Clone, Eq, Ord, PartialOrd, PartialEq, Hash)]
150150
pub struct CsfsMsg(Vec<u8>);

0 commit comments

Comments
 (0)