Remove legacy error downcasting from miner actor

filecoin-project · Jun 27, 2023 · 8213ac2 · 8213ac2
1 parent f414380
commit 8213ac2
Show file tree

Hide file tree

Showing 14 changed files with 1,062 additions and 1,484 deletions.
diff --git a/actors/miner/src/bitfield_queue.rs b/actors/miner/src/bitfield_queue.rs
@@ -1,10 +1,11 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use anyhow::Context;
 use std::convert::TryInto;
 
 use cid::Cid;
-use fil_actors_runtime::{ActorDowncast, Array};
+use fil_actors_runtime::Array;
 use fvm_ipld_amt::Error as AmtError;
 use fvm_ipld_bitfield::BitField;
 use fvm_ipld_blockstore::Blockstore;
@@ -35,13 +36,13 @@ impl<'db, BS: Blockstore> BitFieldQueue<'db, BS> {
         let bitfield = self
             .amt
             .get(epoch)
-            .map_err(|e| e.downcast_wrap(format!("failed to lookup queue epoch {}", epoch)))?
+            .with_context(|| format!("failed to lookup queue epoch {}", epoch))?
             .cloned()
             .unwrap_or_default();
 
         self.amt
             .set(epoch, &bitfield | values)
-            .map_err(|e| e.downcast_wrap(format!("failed to set queue epoch {}", epoch)))?;
+            .with_context(|| format!("failed to set queue epoch {}", epoch))?;
 
         Ok(())
     }
@@ -73,11 +74,11 @@ impl<'db, BS: Blockstore> BitFieldQueue<'db, BS> {
 
                 Ok(())
             })
-            .map_err(|e| e.downcast_wrap("failed to cut from bitfield queue"))?;
+            .context("failed to cut from bitfield queue")?;
 
         self.amt
             .batch_delete(epochs_to_remove, true)
-            .map_err(|e| e.downcast_wrap("failed to remove empty epochs from bitfield queue"))?;
+            .context("failed to remove empty epochs from bitfield queue")?;
 
         Ok(())
     }