fix: finish rebase

consensus-shipyard · Jul 19, 2024 · 7431138 · 7431138
1 parent 8b938d4
commit 7431138
Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/fendermint/app/Cargo.toml b/fendermint/app/Cargo.toml
@@ -65,7 +65,6 @@ fendermint_vm_snapshot = { path = "../vm/snapshot" }
 fendermint_vm_topdown = { path = "../vm/topdown" }
 
 
-
 fvm = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 fvm_ipld_car = { workspace = true }

diff --git a/fendermint/app/src/app.rs b/fendermint/app/src/app.rs
@@ -26,8 +26,7 @@ use fendermint_vm_interpreter::fvm::store::ReadOnlyBlockstore;
 use fendermint_vm_interpreter::fvm::{FvmApplyRet, FvmGenesisOutput, PowerUpdates};
 use fendermint_vm_interpreter::signed::InvalidSignature;
 use fendermint_vm_interpreter::{
-    CheckInterpreter, ExecInterpreter, GenesisInterpreter, ProcessResult, ProposalInterpreter,
-    QueryInterpreter,
+    CheckInterpreter, ExecInterpreter, GenesisInterpreter, ProposalInterpreter, QueryInterpreter,
 };
 use fendermint_vm_message::query::FvmQueryHeight;
 use fendermint_vm_snapshot::{SnapshotClient, SnapshotError};

diff --git a/fendermint/app/src/observe.rs b/fendermint/app/src/observe.rs
@@ -147,12 +147,6 @@ pub struct MpoolReceived {
 
 impl Recordable for MpoolReceived {
     fn record_metrics(&self) {
-        let from = self
-            .message
-            .as_ref()
-            .map(|m| m.from.to_string())
-            .unwrap_or("".to_string());
-
         MPOOL_RECEIVED
             .with_label_values(&[&self.accept.to_string()])
             .inc();

diff --git a/fendermint/vm/interpreter/src/fvm/state/exec.rs b/fendermint/vm/interpreter/src/fvm/state/exec.rs
@@ -176,13 +176,11 @@ where
 
     /// Execute message implicitly.
     pub fn execute_implicit(&mut self, msg: Message) -> ExecResult {
-        // TODO Karel - measure here
         self.execute_message(msg, ApplyKind::Implicit)
     }
 
     /// Execute message explicitly.
     pub fn execute_explicit(&mut self, msg: Message) -> ExecResult {
-        // TODO Karel - measure here
         self.execute_message(msg, ApplyKind::Explicit)
     }
 

diff --git a/fendermint/vm/interpreter/src/fvm/state/ipc.rs b/fendermint/vm/interpreter/src/fvm/state/ipc.rs
@@ -315,7 +315,7 @@ impl<DB: Blockstore + Clone> GatewayCaller<DB> {
         height: u64,
     ) -> anyhow::Result<Vec<EthAddress>> {
         let (_, _, addrs, _) = self.getter.call(state, |c| {
-            c.get_checkpoint_signature_bundle(et::U256::from(height))
+            c.get_checkpoint_signature_bundle(ethers::types::U256::from(height))
         })?;
 
         let addrs = addrs.into_iter().map(|a| a.into()).collect();