Set producer_stride to never exceed cache_window_nodes.

filecoin-project · Oct 6, 2020 · 1233043 · 1233043
1 parent f121730
commit 1233043
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/storage-proofs/porep/src/stacked/vanilla/create_label/multi.rs b/storage-proofs/porep/src/stacked/vanilla/create_label/multi.rs
@@ -219,17 +219,13 @@ fn create_layer_labels(
     let lookahead = settings.multicore_sdr_lookahead;
     let num_producers = settings.multicore_sdr_producers;
 
-    let producer_stride = settings.multicore_sdr_producer_stride;
     // NOTE: Stride must not exceed `sdr_parents_cache_window_nodes`.
     // If it does, the process will deadlock with producers and consumers
     // waiting for each other.
     let cache_window_nodes = parents_cache.size() / (4 * DEGREE);
-    assert!(
-        producer_stride <= cache_window_nodes as u64,
-        "sdr_producer_stride ({}) exceeds sdr_parents_cache_window_nodes ({})",
-        producer_stride,
-        cache_window_nodes
-    );
+    let producer_stride = settings
+        .multicore_sdr_producer_stride
+        .min(cache_window_nodes as u64);
 
     const BYTES_PER_NODE: usize = (NODE_SIZE * DEGREE) + 64;