Use fold combinator instead of manual implementation

Currently we are using a mutable variable to manually implement the
logic that the `fold` combinator provides.

Author: tcharding

src/miniscript/types/extra_props.rs

@@ -775,17 +775,13 @@ impl Property for ExtData {
         let mut ops_count = 0;
         let mut ops_count_sat_vec = Vec::with_capacity(n);
         let mut ops_count_nsat_sum = 0;
-        let mut op_count_sat = Some(0);
         let mut timelocks = Vec::with_capacity(n);
         let mut stack_elem_count_sat_vec = Vec::with_capacity(n);
-        let mut stack_elem_count_sat = Some(0);
         let mut stack_elem_count_dissat = Some(0);
         let mut max_sat_size_vec = Vec::with_capacity(n);
-        let mut max_sat_size = Some((0, 0));
         let mut max_dissat_size = Some((0, 0));
         // the max element count is same as max sat element count when satisfying one element + 1
         let mut exec_stack_elem_count_sat_vec = Vec::with_capacity(n);
-        let mut exec_stack_elem_count_sat = Some(0);
         let mut exec_stack_elem_count_dissat = Some(0);
 
         for i in 0..n {
@@ -823,42 +819,59 @@ impl Property for ExtData {
         }
 
         stack_elem_count_sat_vec.sort_by(sat_minus_option_dissat);
-        // Sum of the cost by iterating through the sorted vector *backward*.
-        for (i, &(x, y)) in stack_elem_count_sat_vec.iter().rev().enumerate() {
-            stack_elem_count_sat = if i <= k {
-                x.and_then(|x| stack_elem_count_sat.map(|count| count + x))
-            } else {
-                y.and_then(|y| stack_elem_count_sat.map(|count| count + y))
-            };
-        }
+        let stack_elem_count_sat =
+            stack_elem_count_sat_vec
+                .iter()
+                .rev()
+                .enumerate()
+                .fold(Some(0), |acc, (i, &(x, y))| {
+                    if i <= k {
+                        opt_add(acc, x)
+                    } else {
+                        opt_add(acc, y)
+                    }
+                });
 
         exec_stack_elem_count_sat_vec.sort_by(sat_minus_option_dissat);
-        for (i, &(x, y)) in exec_stack_elem_count_sat_vec.iter().rev().enumerate() {
-            exec_stack_elem_count_sat = if i <= k {
-                opt_max(exec_stack_elem_count_sat, x)
-            } else {
-                opt_max(exec_stack_elem_count_sat, y)
-            };
-        }
+        let exec_stack_elem_count_sat = exec_stack_elem_count_sat_vec
+            .iter()
+            .rev()
+            .enumerate()
+            .fold(Some(0), |acc, (i, &(x, y))| {
+                if i <= k {
+                    opt_max(acc, x)
+                } else {
+                    opt_max(acc, y)
+                }
+            });
 
         // FIXME: Maybe make the ExtData struct aware of Ctx and add a one_cost() method here ?
         max_sat_size_vec.sort_by(sat_minus_dissat_witness);
-        for (i, &(x, y)) in max_sat_size_vec.iter().enumerate() {
-            max_sat_size = if i <= k {
-                x.and_then(|x| max_sat_size.map(|(w, s)| (w + x.0, s + x.1)))
-            } else {
-                y.and_then(|y| max_sat_size.map(|(w, s)| (w + y.0, s + y.1)))
-            };
-        }
+        let max_sat_size =
+            max_sat_size_vec
+                .iter()
+                .enumerate()
+                .fold(Some((0, 0)), |acc, (i, &(x, y))| {
+                    if i <= k {
+                        opt_tuple_add(acc, x)
+                    } else {
+                        opt_tuple_add(acc, y)
+                    }
+                });
 
         ops_count_sat_vec.sort_by(sat_minus_dissat);
-        for (i, &(x, y)) in ops_count_sat_vec.iter().enumerate() {
-            op_count_sat = if i <= k {
-                opt_add(op_count_sat, x)
-            } else {
-                opt_add(op_count_sat, Some(y))
-            };
-        }
+        let op_count_sat =
+            ops_count_sat_vec
+                .iter()
+                .enumerate()
+                .fold(Some(0), |acc, (i, &(x, y))| {
+                    if i <= k {
+                        opt_add(acc, x)
+                    } else {
+                        opt_add(acc, Some(y))
+                    }
+                });
+
         Ok(ExtData {
             pk_cost: pk_cost + n - 1, //all pk cost + (n-1)*ADD
             has_free_verify: true,
@@ -1056,7 +1069,7 @@ fn sat_minus_dissat_witness<'r, 's>(
         .cmp(&b.0.map(|x| b.1.map(|y| x.0 as isize - y.0 as isize)))
 }
 
-// Returns Some(max(x,y)) is both x and y are Some. Otherwise, return none
+/// Returns Some(max(x,y)) is both x and y are Some. Otherwise, returns `None`.
 fn opt_max<T: Ord>(a: Option<T>, b: Option<T>) -> Option<T> {
     if let (Some(x), Some(y)) = (a, b) {
         Some(cmp::max(x, y))
@@ -1065,7 +1078,12 @@ fn opt_max<T: Ord>(a: Option<T>, b: Option<T>) -> Option<T> {
     }
 }
 
-// Returns Some(x+y) is both x and y are Some. Otherwise, return none
+/// Returns Some(x+y) is both x and y are Some. Otherwise, returns `None`.
 fn opt_add(a: Option<usize>, b: Option<usize>) -> Option<usize> {
     a.and_then(|x| b.map(|y| x + y))
 }
+
+/// Returns Some((x0+y0, x1+y1)) is both x and y are Some. Otherwise, returns `None`.
+fn opt_tuple_add(a: Option<(usize, usize)>, b: Option<(usize, usize)>) -> Option<(usize, usize)> {
+    a.and_then(|x| b.map(|(w, s)| (w + x.0, s + x.1)))
+}