working on FEC tests again

• pass n to try_all_decoding_combinations and don't try to decode when shards have been recoded (\#shards > n) and there are no recoded shards in the k combination under review (\max(is) < n)
• pass recoding_steps and should_not_be_decodable as arguments to end_to_end_with_recoding_template
• fix n = 5 => this leads to tests that run in less than 10sec again
• add (k, n) = (8, 10) => tests still run in less than 13sec
• split recoding scenarii into "simple" and "chain"
• show indices in a "pretty" format, i.e. showing indices greater than n as (n), (n + 1), ...

src/fec.rs

@@ -377,64 +377,61 @@ mod tests {
     fn end_to_end_with_recoding() {
         let bytes = bytes();
 
-        let ks = [3, 5];
-        let n = 5;
-
-        #[rustfmt::skip]
-        let scenarii = [
-            // ```mermaid
-            // graph TD;
-            //     a[n+1]; b[n+2]; c[n+3];
-            //
-            //     1;
-            //     3-->a; 5-->a;
-            //     2-->b; 4-->b;
-            //     a-->c; b-->c;
-            // ```
-            (
-                "simple",
-                vec![
-                    vec![2, 4],       // =  n
-                    vec![1, 3],       // = (n + 1)
-                    vec![n, (n + 1)], // = (n + 2) = ((2, 4), (1, 3))
-                ],
-                vec![
-                    vec![2, 4, n],
-
-                    vec![1, 3, (n + 1)],
-
-                    vec![n, (n + 1), (n + 2)],
-                    vec![1, 3, n, (n + 2)],
-                    vec![2, 4, (n + 1), (n + 2)],
-                    vec![1, 2, 3, 4, (n + 2)],
-                ],
-            ),
-            // ```mermaid
-            // graph TD;
-            //     a[n+1]; b[n+2];
-            //
-            //     1-->a; a-->b;
-            //     2; 3; 4; 5;
-            // ```
-            (
-                "chain",
-                vec![
-                    vec![0],   // = (n) = (0)
-                    vec![(n)], // = (n + 1) = (0)
-                ],
-                vec![vec![0, (n)], vec![0, (n + 1)], vec![(n), (n + 1)]],
-            ),
-        ];
+        fn get_scenarii(n: usize) -> Vec<(String, Vec<Vec<usize>>, Vec<Vec<usize>>)> {
+            vec![
+                // ```mermaid
+                // graph TD;
+                //     a[n+1]; b[n+2]; c[n+3];
+                //
+                //     1;
+                //     3-->a; 5-->a;
+                //     2-->b; 4-->b;
+                //     a-->c; b-->c;
+                // ```
+                (
+                    "simple".into(),
+                    vec![
+                        vec![2, 4],       // =  n
+                        vec![1, 3],       // = (n + 1)
+                        vec![n, (n + 1)], // = (n + 2) = ((2, 4), (1, 3))
+                    ],
+                    vec![
+                        vec![2, 4, n],
+                        //
+                        vec![1, 3, (n + 1)],
+                        vec![n, (n + 1), (n + 2)],
+                        vec![1, 3, n, (n + 2)],
+                        vec![2, 4, (n + 1), (n + 2)],
+                        vec![1, 2, 3, 4, (n + 2)],
+                    ],
+                ),
+                // ```mermaid
+                // graph TD;
+                //     a[n+1]; b[n+2];
+                //
+                //     1-->a; a-->b;
+                //     2; 3; 4; 5;
+                // ```
+                (
+                    "chain".into(),
+                    vec![
+                        vec![0],   // = (n) = (0)
+                        vec![(n)], // = (n + 1) = (0)
+                    ],
+                    vec![vec![0, (n)], vec![0, (n + 1)], vec![(n), (n + 1)]],
+                ),
+            ]
+        }
 
-        for k in ks {
-            for (name, steps, should_not_decode) in scenarii.clone() {
+        for (k, n) in [(3, 5), (5, 5)] {
+            for (name, steps, should_not_decode) in get_scenarii(n) {
                 end_to_end_with_recoding_template::<Fr>(
                     &bytes,
                     k,
                     n,
                     steps,
                     should_not_decode,
-                    name,
+                    &name,
                 );
             }
         }