Skip to content

Commit 83b8e89

Browse files
committed
fmt
1 parent 70460eb commit 83b8e89

File tree

5 files changed

+234
-143
lines changed

5 files changed

+234
-143
lines changed

grovedb/src/lib.rs

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ pub use grovedb_merk::proofs::query::query_item::QueryItem;
180180
pub use grovedb_merk::proofs::Query;
181181
#[cfg(feature = "full")]
182182
use grovedb_merk::tree::kv::ValueDefinedCostType;
183+
use grovedb_merk::ChunkProducer;
183184
#[cfg(feature = "full")]
184185
use grovedb_merk::{
185186
self,
186187
tree::{combine_hash, value_hash},
187188
BatchEntry, CryptoHash, KVIterator, Merk,
188189
};
189-
use grovedb_merk::ChunkProducer;
190190
#[cfg(feature = "full")]
191191
use grovedb_path::SubtreePath;
192192
#[cfg(feature = "full")]
@@ -217,11 +217,11 @@ use crate::element::helpers::raw_decode;
217217
pub use crate::error::Error;
218218
#[cfg(feature = "full")]
219219
use crate::operations::proof::util::hex_to_ascii;
220+
use crate::replication::util_encode_vec_ops;
220221
#[cfg(feature = "full")]
221222
use crate::util::{root_merk_optional_tx, storage_context_optional_tx};
222223
#[cfg(feature = "full")]
223224
use crate::Error::MerkError;
224-
use crate::replication::util_encode_vec_ops;
225225

226226
#[cfg(feature = "full")]
227227
type Hash = [u8; 32];
@@ -340,8 +340,7 @@ impl GroveDb {
340340
tx: &'db Transaction,
341341
batch: Option<&'db StorageBatch>,
342342
grove_version: &GroveVersion,
343-
) -> CostResult<Merk<PrefixedRocksDbTransactionContext>, Error>
344-
{
343+
) -> CostResult<Merk<PrefixedRocksDbTransactionContext>, Error> {
345344
let mut cost = OperationCost::default();
346345
let storage = self
347346
.db
@@ -354,19 +353,22 @@ impl GroveDb {
354353
is_sum_tree,
355354
Some(&Element::value_defined_cost_for_serialized_value),
356355
grove_version,
357-
).map_err(|_| {
358-
Error::CorruptedData("cannot open a subtree by prefix with given root key".to_owned())
359-
}).add_cost(cost)
360-
}
361-
else {
356+
)
357+
.map_err(|_| {
358+
Error::CorruptedData(
359+
"cannot open a subtree by prefix with given root key".to_owned(),
360+
)
361+
})
362+
.add_cost(cost)
363+
} else {
362364
Merk::open_base(
363365
storage,
364366
false,
365367
Some(&Element::value_defined_cost_for_serialized_value),
366368
grove_version,
367-
).map_err(|_| {
368-
Error::CorruptedData("cannot open a root subtree by prefix".to_owned())
369-
}).add_cost(cost)
369+
)
370+
.map_err(|_| Error::CorruptedData("cannot open a root subtree by prefix".to_owned()))
371+
.add_cost(cost)
370372
}
371373
}
372374

@@ -377,7 +379,14 @@ impl GroveDb {
377379
path: SubtreePath<'b, B>,
378380
tx: &'tx Transaction<'db>,
379381
grove_version: &GroveVersion,
380-
) -> Result<(Merk<PrefixedRocksDbImmediateStorageContext<'tx>>, Option<Vec<u8>>, bool), Error>
382+
) -> Result<
383+
(
384+
Merk<PrefixedRocksDbImmediateStorageContext<'tx>>,
385+
Option<Vec<u8>>,
386+
bool,
387+
),
388+
Error,
389+
>
381390
where
382391
B: AsRef<[u8]> + 'b,
383392
{
@@ -405,19 +414,19 @@ impl GroveDb {
405414
let is_sum_tree = element.is_sum_tree();
406415
if let Element::Tree(root_key, _) | Element::SumTree(root_key, ..) = element {
407416
Ok((
408-
Merk::open_layered_with_root_key(
409-
storage,
410-
root_key.clone(),
411-
is_sum_tree,
412-
Some(&Element::value_defined_cost_for_serialized_value),
413-
grove_version,
414-
)
415-
.map_err(|_| {
416-
Error::CorruptedData("cannot open a subtree with given root key".to_owned())
417-
})
418-
.unwrap()?,
417+
Merk::open_layered_with_root_key(
418+
storage,
419+
root_key.clone(),
420+
is_sum_tree,
421+
Some(&Element::value_defined_cost_for_serialized_value),
422+
grove_version,
423+
)
424+
.map_err(|_| {
425+
Error::CorruptedData("cannot open a subtree with given root key".to_owned())
426+
})
427+
.unwrap()?,
419428
root_key,
420-
is_sum_tree
429+
is_sum_tree,
421430
))
422431
} else {
423432
Err(Error::CorruptedPath(
@@ -426,16 +435,16 @@ impl GroveDb {
426435
}
427436
} else {
428437
Ok((
429-
Merk::open_base(
430-
storage,
431-
false,
432-
None::<&fn(&[u8], &GroveVersion) -> Option<ValueDefinedCostType>>,
433-
grove_version,
434-
)
435-
.map_err(|_| Error::CorruptedData("cannot open a the root subtree".to_owned()))
436-
.unwrap()?,
438+
Merk::open_base(
439+
storage,
440+
false,
441+
None::<&fn(&[u8], &GroveVersion) -> Option<ValueDefinedCostType>>,
442+
grove_version,
443+
)
444+
.map_err(|_| Error::CorruptedData("cannot open a the root subtree".to_owned()))
445+
.unwrap()?,
437446
None,
438-
false
447+
false,
439448
))
440449
}
441450
}
@@ -513,8 +522,7 @@ impl GroveDb {
513522
is_sum_tree: bool,
514523
batch: Option<&'db StorageBatch>,
515524
grove_version: &GroveVersion,
516-
) -> CostResult<Merk<PrefixedRocksDbStorageContext>, Error>
517-
{
525+
) -> CostResult<Merk<PrefixedRocksDbStorageContext>, Error> {
518526
let mut cost = OperationCost::default();
519527
let storage = self
520528
.db
@@ -527,19 +535,22 @@ impl GroveDb {
527535
is_sum_tree,
528536
Some(&Element::value_defined_cost_for_serialized_value),
529537
grove_version,
530-
).map_err(|_| {
531-
Error::CorruptedData("cannot open a subtree by prefix with given root key".to_owned())
532-
}).add_cost(cost)
533-
}
534-
else {
538+
)
539+
.map_err(|_| {
540+
Error::CorruptedData(
541+
"cannot open a subtree by prefix with given root key".to_owned(),
542+
)
543+
})
544+
.add_cost(cost)
545+
} else {
535546
Merk::open_base(
536547
storage,
537548
false,
538549
Some(&Element::value_defined_cost_for_serialized_value),
539550
grove_version,
540-
).map_err(|_| {
541-
Error::CorruptedData("cannot open a root subtree by prefix".to_owned())
542-
}).add_cost(cost)
551+
)
552+
.map_err(|_| Error::CorruptedData("cannot open a root subtree by prefix".to_owned()))
553+
.add_cost(cost)
543554
}
544555
}
545556

0 commit comments

Comments
 (0)