aboutsummaryrefslogtreecommitdiff
path: root/src/table/merkle.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-03 15:08:37 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-03 15:08:37 +0100
commit426d8784dac0e39879af52d980887d3692fc907c (patch)
treea5bf205a5e8cd013e98cc88fe57aeaeebb86e30b /src/table/merkle.rs
parenta81200d345e23b93b8f6e1d879b6b14efbdfb2bb (diff)
downloadgarage-426d8784dac0e39879af52d980887d3692fc907c.tar.gz
garage-426d8784dac0e39879af52d980887d3692fc907c.zip
cleanup
Diffstat (limited to 'src/table/merkle.rs')
-rw-r--r--src/table/merkle.rs17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/table/merkle.rs b/src/table/merkle.rs
index 736354fa..2d593e6d 100644
--- a/src/table/merkle.rs
+++ b/src/table/merkle.rs
@@ -65,11 +65,7 @@ pub enum MerkleNode {
Leaf(Vec<u8>, Hash),
}
-impl<F, R> MerkleUpdater<F, R>
-where
- F: TableSchema + 'static,
- R: TableReplication + 'static,
-{
+impl<F: TableSchema, R: TableReplication> MerkleUpdater<F, R> {
pub(crate) fn new(data: Arc<TableData<F, R>>) -> Arc<Self> {
let empty_node_hash = blake2sum(&rmp_to_vec_all_named(&MerkleNode::Empty).unwrap()[..]);
@@ -303,17 +299,10 @@ where
}
}
-struct MerkleWorker<F, R>(Arc<MerkleUpdater<F, R>>)
-where
- F: TableSchema + 'static,
- R: TableReplication + 'static;
+struct MerkleWorker<F: TableSchema, R: TableReplication>(Arc<MerkleUpdater<F, R>>);
#[async_trait]
-impl<F, R> Worker for MerkleWorker<F, R>
-where
- F: TableSchema + 'static,
- R: TableReplication + 'static,
-{
+impl<F: TableSchema, R: TableReplication> Worker for MerkleWorker<F, R> {
fn name(&self) -> String {
format!("{} Merkle", F::TABLE_NAME)
}