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.

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", branch = "clear-api-cleanup" }
+fr32 = { git = "https://github.com/filecoin-project/rust-fil-proofs", branch = "clear-api-cleanup" }
+filecoin-hashers = { git = "https://github.com/filecoin-project/rust-fil-proofs", branch = "clear-api-cleanup" }
+storage-proofs-core = { git = "https://github.com/filecoin-project/rust-fil-proofs", branch = "clear-api-cleanup" }

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`].