Make max satisfaction API consistent

Author: sanket1729

src/descriptor/segwitv0.rs

@@ -214,17 +214,16 @@ where
     }
 
     fn max_satisfaction_weight(&self) -> Option<usize> {
-        // TODO: Change the max sat functions in sortedmulti for consistency
         let (script_size, max_sat_elems, max_sat_size) = match self.inner {
             WshInner::SortedMulti(ref smv) => (
                 smv.script_size(),
                 smv.max_satisfaction_witness_elements(),
-                smv.max_satisfaction_size(2), // OP_1 size dummy parameter
+                smv.max_satisfaction_size(),
             ),
             WshInner::Ms(ref ms) => (
                 ms.script_size(),
                 ms.max_satisfaction_witness_elements()?,
-                ms.max_satisfaction_size()?, // OP_1 size dummy parameter
+                ms.max_satisfaction_size()?,
             ),
         };
         Some(

src/descriptor/sh.rs

@@ -309,7 +309,7 @@ where
             ShInner::SortedMulti(ref smv) => {
                 let ss = smv.script_size();
                 let ps = push_opcode_size(ss);
-                let scriptsig_len = ps + ss + smv.max_satisfaction_size(1);
+                let scriptsig_len = ps + ss + smv.max_satisfaction_size();
                 4 * (varint_len(scriptsig_len) + scriptsig_len)
             }
             // add weighted script sig, len byte stays the same

src/descriptor/sortedmulti.rs

@@ -188,23 +188,15 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
         2 + self.k
     }
 
-    /// Maximum size, in bytes, of a satisfying witness. For Segwit outputs
-    /// `one_cost` should be set to 2, since the number `1` requires two
-    /// bytes to encode. For non-segwit outputs `one_cost` should be set to
-    /// 1, since `OP_1` is available in scriptSigs.
-    ///
+    /// Maximum size, in bytes, of a satisfying witness.
     /// In general, it is not recommended to use this function directly, but
     /// to instead call the corresponding function on a `Descriptor`, which
     /// will handle the segwit/non-segwit technicalities for you.
     ///
     /// All signatures are assumed to be 73 bytes in size, including the
     /// length prefix (segwit) or push opcode (pre-segwit) and sighash
     /// postfix.
-    ///
-    /// This function may panic on malformed `Miniscript` objects which do not
-    /// correspond to semantically sane Scripts. (Such scripts should be
-    /// rejected at parse time. Any exceptions are bugs.)
-    pub fn max_satisfaction_size(&self, _: usize) -> usize {
+    pub fn max_satisfaction_size(&self) -> usize {
         1 + 73 * self.k
     }
 }