aboutsummaryrefslogtreecommitdiff
path: root/src/table/merkle.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-06-06 16:29:02 +0200
committerAlex Auvolat <alex@adnab.me>2022-06-06 16:29:02 +0200
commit1dabd98330cedd108c42b7613a1f29fc4e4123ad (patch)
treeee2620290c92f8e1a974f341c80f26dc356d2139 /src/table/merkle.rs
parent9238fda9b245beb3ff535a16eda7859aed277bc6 (diff)
downloadgarage-1dabd98330cedd108c42b7613a1f29fc4e4123ad.tar.gz
garage-1dabd98330cedd108c42b7613a1f29fc4e4123ad.zip
Improve things in block manager & correctly propagate .len() errors
Diffstat (limited to 'src/table/merkle.rs')
-rw-r--r--src/table/merkle.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/table/merkle.rs b/src/table/merkle.rs
index e7f2442e..7685b193 100644
--- a/src/table/merkle.rs
+++ b/src/table/merkle.rs
@@ -316,12 +316,12 @@ where
MerkleNode::decode_opt(&ent)
}
- pub fn merkle_tree_len(&self) -> usize {
- self.data.merkle_tree.len().unwrap() // TODO fix unwrap
+ pub fn merkle_tree_len(&self) -> Result<usize, Error> {
+ Ok(self.data.merkle_tree.len()?)
}
- pub fn todo_len(&self) -> usize {
- self.data.merkle_todo.len().unwrap() // TODO fix unwrap
+ pub fn todo_len(&self) -> Result<usize, Error> {
+ Ok(self.data.merkle_todo.len()?)
}
}