Change e.into() into Box::new(e)

For some reason, the former is not Send and that is needed when these errors are async returned.
ava-labs · Nov 14, 2023 · a08d9b2 · a08d9b2
1 parent 57a7774
commit a08d9b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/firewood/src/db.rs b/firewood/src/db.rs
@@ -323,7 +323,7 @@ impl<S: ShaleStore<Node> + Send + Sync> DbRev<S> {
         // TODO: get first key when start_key is None
         self.merkle
             .get_iter(start_key, self.header.kv_root)
-            .map_err(|e| api::Error::InternalError(e.into()))
+            .map_err(|e| api::Error::InternalError(Box::new(e)))
     }
 
     fn flush_dirty(&mut self) -> Option<()> {
@@ -455,7 +455,7 @@ impl Db {
         }
 
         block_in_place(|| Db::new_internal(db_path, cfg.clone()))
-            .map_err(|e| api::Error::InternalError(e.into()))
+            .map_err(|e| api::Error::InternalError(Box::new(e)))
     }
 
     /// Open a database.

diff --git a/firewood/src/merkle.rs b/firewood/src/merkle.rs
@@ -1244,7 +1244,7 @@ impl<'a, S: shale::ShaleStore<node::Node> + Send + Sync> Stream for MerkleKeyVal
                 let root_node = self
                     .merkle
                     .get_node(self.merkle_root)
-                    .map_err(|e| api::Error::InternalError(e.into()))?;
+                    .map_err(|e| api::Error::InternalError(Box::new(e)))?;
                 let mut last_node = root_node;
                 let mut parents = vec![];
                 let leaf = loop {
@@ -1259,7 +1259,7 @@ impl<'a, S: shale::ShaleStore<node::Node> + Send + Sync> Stream for MerkleKeyVal
                                 let next = self
                                     .merkle
                                     .get_node(leftmost_address.unwrap())
-                                    .map_err(|e| api::Error::InternalError(e.into()))?;
+                                    .map_err(|e| api::Error::InternalError(Box::new(e)))?;
 
                                 parents.push((last_node, leftmost_position as u8));
 
@@ -1295,12 +1295,12 @@ impl<'a, S: shale::ShaleStore<node::Node> + Send + Sync> Stream for MerkleKeyVal
                 let root_node = self
                     .merkle
                     .get_node(self.merkle_root)
-                    .map_err(|e| api::Error::InternalError(e.into()))?;
+                    .map_err(|e| api::Error::InternalError(Box::new(e)))?;
 
                 let (found_node, parents) = self
                     .merkle
                     .get_node_and_parents_by_key(root_node, &key)
-                    .map_err(|e| api::Error::InternalError(e.into()))?;
+                    .map_err(|e| api::Error::InternalError(Box::new(e)))?;
 
                 let Some(last_node) = found_node else {
                     return Poll::Ready(None);
@@ -1338,7 +1338,7 @@ impl<'a, S: shale::ShaleStore<node::Node> + Send + Sync> Stream for MerkleKeyVal
                         let current_node = self
                             .merkle
                             .get_node(child_address)
-                            .map_err(|e| api::Error::InternalError(e.into()))?;
+                            .map_err(|e| api::Error::InternalError(Box::new(e)))?;
 
                         let found_key = key_from_parents(&parents);
 
@@ -1381,7 +1381,7 @@ impl<'a, S: shale::ShaleStore<node::Node> + Send + Sync> Stream for MerkleKeyVal
                                         .merkle
                                         .get_node(addr)
                                         .map(|node| (node, u8::MAX))
-                                        .map_err(|e| api::Error::InternalError(e.into()))?;
+                                        .map_err(|e| api::Error::InternalError(Box::new(e)))?;
 
                                     // stop_descending if:
                                     //  - on a branch and it has a value; OR

diff --git a/firewood/src/v2/db.rs b/firewood/src/v2/db.rs
@@ -32,11 +32,13 @@ pub struct Db<T> {
 impl From<DbError> for api::Error {
     fn from(value: DbError) -> Self {
         match value {
-            DbError::InvalidParams => api::Error::InternalError(value.into()),
-            DbError::Merkle(e) => api::Error::InternalError(e.into()),
+            DbError::InvalidParams => api::Error::InternalError(Box::new(value)),
+            DbError::Merkle(e) => api::Error::InternalError(Box::new(e)),
             DbError::System(e) => api::Error::IO(e.into()),
-            DbError::KeyNotFound | DbError::CreateError => api::Error::InternalError(value.into()),
-            DbError::Shale(e) => api::Error::InternalError(e.into()),
+            DbError::KeyNotFound | DbError::CreateError => {
+                api::Error::InternalError(Box::new(value))
+            }
+            DbError::Shale(e) => api::Error::InternalError(Box::new(e)),
             DbError::IO(e) => api::Error::IO(e),
             DbError::InvalidProposal => api::Error::InvalidProposal,
         }