fix: update cache clearing calls (#106)

* fix: update cache clearing calls

Adapt to the changes in rust-fil-proofs.

BREAKING CHANGE: `clear_cache()` and `clear_synthetic_proofs` no longer
take the sector size as input.

* feat: update rust-toolchain to 1.83.0
feat: point to later proofs master
style: fix require clippy updates

---------

Co-authored-by: nemo <[email protected]>

Author: vmx

Cargo.toml

@@ -28,3 +28,9 @@ big-tests = []
 # This feature enables a fixed number of discarded rows for TreeR. The `FIL_PROOFS_ROWS_TO_DISCARD`
 # setting is ignored, no `TemporaryAux` file will be written.
 fixed-rows-to-discard = ["filecoin-proofs-v1/fixed-rows-to-discard", "storage-proofs-core/fixed-rows-to-discard"]
+
+[patch.crates-io]
+filecoin-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs" }
+fr32 = { git = "https://github.com/filecoin-project/rust-fil-proofs" }
+filecoin-hashers = { git = "https://github.com/filecoin-project/rust-fil-proofs" }
+storage-proofs-core = { git = "https://github.com/filecoin-project/rust-fil-proofs" }

rust-toolchain

@@ -1 +1 @@
-1.70.0
+1.83.0

src/registry.rs

@@ -982,6 +982,8 @@ mod tests {
     }
 
     fn test_porep_id_aux(rsp: &RegisteredSealProof) {
+        use std::fmt::Write;
+
         let expected_porep_id = match rsp {
             RegisteredSealProof::StackedDrg2KiBV1 => {
                 "0000000000000000000000000000000000000000000000000000000000000000"
@@ -1044,11 +1046,10 @@ mod tests {
                 "1300000000000000000000000000000000000000000000000000000000000000"
             }
         };
-        let hex: String = rsp
-            .porep_id()
-            .iter()
-            .map(|x| format!("{:01$x}", x, 2))
-            .collect();
+        let hex: String = rsp.porep_id().iter().fold(String::new(), |mut output, x| {
+            let _ = write!(output, "{:01$x}", x, 2);
+            output
+        });
 
         assert_eq!(expected_porep_id, &hex);
     }

src/seal.rs

@@ -330,16 +330,13 @@ pub struct SealCommitPhase2Output {
     pub proof: Vec<u8>,
 }
 
-/// Ensure that any persisted cached data for specified sector size is discarded.
+/// Ensure that any persisted cached data is discarded.
 ///
 /// # Arguments
 ///
-/// * `sector_size` - Sector size associated with cache data to clear.
 /// * `cache_path` - Path to directory where cached data is stored.
-pub fn clear_cache(sector_size: u64, cache_path: &Path) -> Result<()> {
-    use filecoin_proofs_v1::clear_cache;
-
-    with_shape!(sector_size, clear_cache, cache_path)
+pub fn clear_cache(cache_path: &Path) -> Result<()> {
+    filecoin_proofs_v1::clear_cache(cache_path)
 }
 
 /// Generate and persist synthetic Merkle tree proofs for sector replica. Must be called with output from [`seal_pre_commit_phase2`].
@@ -424,12 +421,9 @@ fn generate_synth_proofs_inner<Tree: 'static + MerkleTreeTrait>(
 ///
 /// # Arguments
 ///
-/// * `sector_size` - Sector size associated with cache data to clear.
 /// * `cache_path` - Path to directory where cached data is stored.
-pub fn clear_synthetic_proofs(sector_size: u64, cache_path: &Path) -> Result<()> {
-    use filecoin_proofs_v1::clear_synthetic_proofs;
-
-    with_shape!(sector_size, clear_synthetic_proofs, cache_path)
+pub fn clear_synthetic_proofs(cache_path: &Path) -> Result<()> {
+    filecoin_proofs_v1::clear_synthetic_proofs(cache_path)
 }
 
 /// First step in sector sealing process. Called before [`seal_pre_commit_phase2`].
@@ -1793,7 +1787,7 @@ pub fn unseal_range<T: Into<PathBuf> + AsRef<Path>, R: Read, W: Write>(
 ///
 /// * `registered_proof` - Selected seal proof for this byte source.
 /// * `source` - A readable source of unprocessed piece bytes. The piece's commitment will be
-/// generated for the bytes read from the source plus any added padding.
+///    generated for the bytes read from the source plus any added padding.
 /// * `piece_size` - The number of unpadded user-bytes which can be read from source before EOF.
 ///
 /// Returns piece commitment in [`PieceInfo`] struct.