Disk-only MT (#796)

* feat(storage-proofs): replace DiskMmapStore with disk-only DiskStore

* use released version

Author: schomatis

storage-proofs/Cargo.toml

@@ -15,7 +15,7 @@ bench = false
 bitvec = "0.5"
 rand = "0.4"
 libc = "0.2"
-merkletree = "0.7.1"
+merkletree = "=0.8"
 failure = "0.1"
 byteorder = "1"
 config = "0.9.3"

storage-proofs/src/drgraph.rs

@@ -12,7 +12,7 @@ use crate::parameter_cache::ParameterSetMetadata;
 use crate::util::{data_at_node, NODE_SIZE};
 
 #[cfg(feature = "disk-trees")]
-use crate::merkle::DiskMmapStore;
+use crate::merkle::DiskStore;
 #[cfg(feature = "disk-trees")]
 use merkletree::merkle::next_pow2;
 #[cfg(feature = "disk-trees")]
@@ -122,10 +122,9 @@ pub trait Graph<H: Hasher>: ::std::fmt::Debug + Clone + PartialEq + Eq {
                 top_half_path.to_str()
             );
 
-            let leaves_disk_mmap =
-                DiskMmapStore::new_with_path(next_pow2(self.size()), leaves_path);
+            let leaves_disk_mmap = DiskStore::new_with_path(next_pow2(self.size()), leaves_path);
             let top_half_disk_mmap =
-                DiskMmapStore::new_with_path(next_pow2(self.size()), top_half_path);
+                DiskStore::new_with_path(next_pow2(self.size()), top_half_path);
 
             // FIXME: `new_with_path` is using the `from_iter` implementation,
             //  instead the `parallel` flag should be passed also as argument
@@ -138,7 +137,7 @@ pub trait Graph<H: Hasher>: ::std::fmt::Debug + Clone + PartialEq + Eq {
                 top_half_disk_mmap,
             ))
         // If path is `None` use the existing code that will eventually
-        // call the default `DiskMmapStore::new` creating a temporary
+        // call the default `DiskStore::new` creating a temporary
         // file.
         } else if parallel {
             Ok(MerkleTree::from_par_iter(

storage-proofs/src/layered_drgporep.rs

@@ -337,14 +337,6 @@ pub trait Layers {
                     })
                     .collect::<Result<Vec<_>>>()?;
 
-                // Offload the data tree, we won't use it in the next iteration,
-                // only `tree_r` is reused (as the new `tree_d`).
-                aux[layer].try_offload_store();
-                // Only if this is the last iteration also offload `tree_r`.
-                if layer == layers - 1 {
-                    aux[layer + 1].try_offload_store();
-                }
-
                 Ok(partition_proofs)
             })
             .collect::<Result<Vec<_>>>()
@@ -569,7 +561,6 @@ pub trait Layers {
                 // replications many times in the same run so they may end up
                 // reusing the same files with invalid (old) data and failing.
 
-                tree_d.try_offload_store();
                 return tree_d;
             }
         }

storage-proofs/src/merkle.rs

@@ -16,10 +16,10 @@ use crate::hasher::{Domain, Hasher};
 // `mmap`ed `MerkleTree` (replacing the previously `Vec`-backed
 // `MerkleTree`, now encapsulated in `merkle::VecStore` and exposed
 // as `VecMerkleTree`).
-pub type DiskMmapStore<E> = merkletree::merkle::DiskMmapStore<E>;
+pub type DiskStore<E> = merkletree::merkle::DiskStore<E>;
 pub type VecMerkleTree<T, A> = merkle::MerkleTree<T, A, VecStore<T>>;
 #[cfg(feature = "disk-trees")]
-pub type MerkleTree<T, A> = merkle::MerkleTree<T, A, DiskMmapStore<T>>;
+pub type MerkleTree<T, A> = merkle::MerkleTree<T, A, DiskStore<T>>;
 #[cfg(not(feature = "disk-trees"))]
 pub type MerkleTree<T, A> = merkle::MerkleTree<T, A, MmapStore<T>>;