|
18 | 18 | use super::*; |
19 | 19 | use crate::helpers::{NestedMap, NestedMapRead}; |
20 | 20 | use console::prelude::{FromBytes, anyhow, cfg_into_iter}; |
21 | | -use snarkvm_utilities::bytes::unchecked_deserialize; |
| 21 | +use snarkvm_utilities::{LoggableError, bytes::unchecked_deserialize}; |
22 | 22 |
|
23 | 23 | use anyhow::Context; |
24 | 24 | use core::{fmt, fmt::Debug, hash::Hash, mem}; |
25 | 25 | use std::{borrow::Cow, sync::atomic::Ordering}; |
26 | | -use tracing::error; |
27 | 26 |
|
28 | 27 | #[cfg(not(feature = "serial"))] |
29 | 28 | use rayon::iter::{IntoParallelIterator, ParallelIterator}; |
@@ -648,28 +647,19 @@ impl< |
648 | 647 | let (map_key, value) = self.db_iter.item()?; |
649 | 648 |
|
650 | 649 | // Extract the bytes belonging to the map and the key. |
651 | | - let (entry_map, entry_key) = get_map_and_key(map_key) |
652 | | - .map_err(|e| { |
653 | | - error!("RocksDB NestedIter get_map_and_key error: {e}"); |
654 | | - }) |
655 | | - .ok()?; |
| 650 | + let (entry_map, entry_key) = |
| 651 | + get_map_and_key(map_key).map_err(|err| err.log_error("RocksDB NestedIter get_map_and_key error")).ok()?; |
656 | 652 |
|
657 | 653 | // Deserialize the map, key, and value. |
658 | 654 | let map = unchecked_deserialize(entry_map) |
659 | | - .map_err(|e| { |
660 | | - error!("RocksDB NestedIter deserialize(map) error: {e}"); |
661 | | - }) |
| 655 | + .map_err(|err| err.log_error("RocksDB NestedIter deserialize(map) error")) |
662 | 656 | .ok()?; |
663 | 657 | let key = unchecked_deserialize(entry_key) |
664 | | - .map_err(|e| { |
665 | | - error!("RocksDB NestedIter deserialize(key) error: {e}"); |
666 | | - }) |
| 658 | + .map_err(|err| err.log_error("RocksDB NestedIter deserialize(key) error")) |
667 | 659 | .ok()?; |
668 | 660 | // Deserialize the value. |
669 | 661 | let value = unchecked_deserialize(value) |
670 | | - .map_err(|e| { |
671 | | - error!("RocksDB NestedIter deserialize(value) error: {e}"); |
672 | | - }) |
| 662 | + .map_err(|err| err.log_error("RocksDB NestedIter deserialize(value) error")) |
673 | 663 | .ok()?; |
674 | 664 |
|
675 | 665 | self.db_iter.next(); |
@@ -715,22 +705,15 @@ impl< |
715 | 705 | let map_key = self.db_iter.key()?; |
716 | 706 |
|
717 | 707 | // Extract the bytes belonging to the map and the key. |
718 | | - let (entry_map, entry_key) = get_map_and_key(map_key) |
719 | | - .map_err(|e| { |
720 | | - error!("RocksDB NestedKeys get_map_and_key error: {e}"); |
721 | | - }) |
722 | | - .ok()?; |
| 708 | + let (entry_map, entry_key) = |
| 709 | + get_map_and_key(map_key).map_err(|err| err.log_error("RocksDB NestedKeys get_map_and_key error")).ok()?; |
723 | 710 |
|
724 | 711 | // Deserialize the map and key. |
725 | 712 | let map = unchecked_deserialize(entry_map) |
726 | | - .map_err(|e| { |
727 | | - error!("RocksDB NestedKeys deserialize(map) error: {e}"); |
728 | | - }) |
| 713 | + .map_err(|err| err.log_error("RocksDB NestedKeys deserialize(map) error")) |
729 | 714 | .ok()?; |
730 | 715 | let key = unchecked_deserialize(entry_key) |
731 | | - .map_err(|e| { |
732 | | - error!("RocksDB NestedKeys deserialize(key) error: {e}"); |
733 | | - }) |
| 716 | + .map_err(|err| err.log_error("RocksDB NestedKeys deserialize(key) error")) |
734 | 717 | .ok()?; |
735 | 718 |
|
736 | 719 | self.db_iter.next(); |
@@ -763,8 +746,8 @@ impl<'a, V: 'a + Clone + Serialize + DeserializeOwned> Iterator for NestedValues |
763 | 746 |
|
764 | 747 | // Deserialize the value. |
765 | 748 | let value = unchecked_deserialize(value) |
766 | | - .map_err(|e| { |
767 | | - error!("RocksDB NestedValues deserialize(value) error: {e}"); |
| 749 | + .map_err(|err| { |
| 750 | + err.log_error("RocksDB NestedValues deserialize(value) error"); |
768 | 751 | }) |
769 | 752 | .ok()?; |
770 | 753 |
|
|
0 commit comments