Skip to content

Commit 5870086

Browse files
committed
miniscript: rename fn dissat_sat to sat_dissat
The name of the function no longer implies its return value (which is a struct rather than a tuple that needs to be carefully ordered). So change the name to be consistent with the name of the module.
1 parent 711f29e commit 5870086

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/miniscript/satisfy/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
10261026
Ctx: ScriptContext,
10271027
P: AssetProvider<Pk>,
10281028
{
1029-
Self::dissat_sat(node, provider, false, root_has_sig, leaf_hash).sat
1029+
Self::sat_dissat(node, provider, false, root_has_sig, leaf_hash).sat
10301030
}
10311031

10321032
pub(crate) fn build_template_mall<P, Ctx>(
@@ -1039,7 +1039,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
10391039
Ctx: ScriptContext,
10401040
P: AssetProvider<Pk>,
10411041
{
1042-
Self::dissat_sat(node, provider, true, root_has_sig, leaf_hash).sat
1042+
Self::sat_dissat(node, provider, true, root_has_sig, leaf_hash).sat
10431043
}
10441044

10451045
// produce a non-malleable satisafaction for thesh frag

src/miniscript/satisfy/sat_dissat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
310310
/// If the `malleable` flag is set to true, more efficient satisfactions may be found,
311311
/// but which a 3rd party may be able to replace with less efficient versions. (This
312312
/// flag does not affect dissatisfactions.)
313-
pub(super) fn dissat_sat<Ctx, Sat>(
313+
pub(super) fn sat_dissat<Ctx, Sat>(
314314
node: &Miniscript<Pk, Ctx>,
315315
stfr: &Sat,
316316
malleable: bool,

0 commit comments

Comments
 (0)