Fix Amt iter mut guard (#772)

* Fix changed deref on iter mut amt * Remove test skip
ChainSafe · Oct 21, 2020 · 34759a8 · 34759a8
1 parent 655eac2
commit 34759a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/conformance_tests/tests/conformance_runner.rs b/tests/conformance_tests/tests/conformance_runner.rs
@@ -57,7 +57,6 @@ lazy_static! {
         // Extracted miner faults
         Regex::new(r"fil_1_storageminer-DeclareFaults-Ok-3").unwrap(),
         Regex::new(r"fil_1_storageminer-DeclareFaults-Ok-7").unwrap(),
-        Regex::new(r"fil_1_storageminer-SubmitWindowedPoSt").unwrap(),
 
         // Other fault
         Regex::new(r"fail-insufficient-funds-for-transfer-in-inner-send--genesis").unwrap(),

diff --git a/vm/actor/src/builtin/miner/expiration_queue.rs b/vm/actor/src/builtin/miner/expiration_queue.rs
@@ -8,7 +8,7 @@ use cid::Cid;
 use clock::ChainEpoch;
 use encoding::tuple::*;
 use fil_types::{SectorNumber, SectorSize};
-use ipld_amt::{Amt, Error as AmtError};
+use ipld_amt::{Amt, Error as AmtError, ValueMut};
 use ipld_blockstore::BlockStore;
 use num_bigint::bigint_ser;
 use num_traits::{Signed, Zero};
@@ -660,7 +660,7 @@ impl<'db, BS: BlockStore> ExpirationQueue<'db, BS> {
         &mut self,
         mut f: impl FnMut(
             ChainEpoch,
-            &mut ExpirationSet,
+            &mut ValueMut<'_, ExpirationSet>,
         ) -> Result</* keep going */ bool, Box<dyn StdError>>,
     ) -> Result<(), Box<dyn StdError>> {
         let mut epochs_emptied = Vec::<ChainEpoch>::new();