fix: F25 (#1342)

* Fix missing error propagation * Upgrade lru for cargo audit Co-authored-by: noot <[email protected]>
ChainSafe · Jan 6, 2022 · efd56e9 · efd56e9
1 parent bdd4d91
commit efd56e9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/blockchain/chain/Cargo.toml b/blockchain/chain/Cargo.toml
@@ -31,7 +31,7 @@ async-std = { version = "1.9", features = ["tokio1"] }
 types = { package = "fil_types", version = "0.2" }
 lazy_static = "1.4"
 interpreter = { path = "../../vm/interpreter/" }
-lru = "0.6"
+lru = "0.7.2"
 forest_car = { path = "../../ipld/car" }
 forest_ipld = "0.1.1"
 networks = { path = "../../types/networks" }

diff --git a/blockchain/chain_sync/Cargo.toml b/blockchain/chain_sync/Cargo.toml
@@ -27,7 +27,7 @@ async-std = { version = "1.9", features = ["tokio1", "unstable"] }
 forest_libp2p = { path = "../../node/forest_libp2p" }
 futures = "0.3.5"
 futures-util = "0.3.5"
-lru = "0.6"
+lru = "0.7.2"
 thiserror = "1.0"
 num-traits = "0.2"
 fil_types = "0.2"

diff --git a/blockchain/message_pool/Cargo.toml b/blockchain/message_pool/Cargo.toml
@@ -14,7 +14,7 @@ cid = { package = "forest_cid", version = "0.3" }
 encoding = { package = "forest_encoding", version = "0.2.1" }
 blockstore = { package = "ipld_blockstore", version = "0.1" }
 num-bigint = { path = "../../utils/bigint", package = "forest_bigint" }
-lru = "0.6"
+lru = "0.7.2"
 crypto = { package = "forest_crypto", version = "0.5", features = ["blst"] }
 chain = { path = "../chain" }
 state_tree = { path = "../../vm/state_tree/" }

diff --git a/vm/interpreter/src/default_runtime.rs b/vm/interpreter/src/default_runtime.rs
@@ -314,9 +314,10 @@ where
                 e
             }
         });
-        if let Err(e) = self.state.borrow_mut().clear_snapshot() {
-            actor_error!(fatal("failed to clear snapshot: {}", e));
-        }
+        self.state
+            .borrow_mut()
+            .clear_snapshot()
+            .map_err(|e| actor_error!(fatal("failed to clear snapshot: {}", e)))?;
 
         ret
     }