Merge #930: Followup to #895: rename dissat_sat function and use struct rather than tuple for return values

f7f1689 miniscript: rename fn dissat_sat to sat_dissat (Andrew Poelstra)
2bcc858 miniscript: make dissat_sat return a struct rather than a tuple (Andrew Poelstra)

Pull request description:

  Makes naming more consistent and reduces confusion caused by having a tuple with two entries of the same type.


ACKs for top commit:
  apoelstra:
    On f7f1689 successfully ran local tests
  tcharding:
    ACK f7f1689


Tree-SHA512: 80753b6414059dbd68ed85f32401bdd3a466ebfe793250dd1ed5b93b14c84029dc0897077390c48ee3e82ec5f867e13775ed0ac4ac8c336303067e4a3fd871f0

Author: apoelstra

src/miniscript/satisfy/mod.rs

@@ -1026,7 +1026,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
         Ctx: ScriptContext,
         P: AssetProvider<Pk>,
     {
-        Self::dissat_sat(node, provider, false, root_has_sig, leaf_hash).1
+        Self::sat_dissat(node, provider, false, root_has_sig, leaf_hash).sat
     }
 
     pub(crate) fn build_template_mall<P, Ctx>(
@@ -1039,7 +1039,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
         Ctx: ScriptContext,
         P: AssetProvider<Pk>,
     {
-        Self::dissat_sat(node, provider, true, root_has_sig, leaf_hash).1
+        Self::sat_dissat(node, provider, true, root_has_sig, leaf_hash).sat
     }
 
     // produce a non-malleable satisafaction for thesh frag