Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: finish rebase
Browse files Browse the repository at this point in the history
karlem committed Jul 19, 2024
1 parent 8b938d4 commit 7431138
Showing 5 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion fendermint/app/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
3 changes: 1 addition & 2 deletions fendermint/app/src/app.rs
Original file line number Diff line number Diff line change
@@ -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};
6 changes: 0 additions & 6 deletions fendermint/app/src/observe.rs
Original file line number Diff line number Diff line change
@@ -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();
2 changes: 0 additions & 2 deletions fendermint/vm/interpreter/src/fvm/state/exec.rs
Original file line number Diff line number Diff line change
@@ -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)
}

2 changes: 1 addition & 1 deletion fendermint/vm/interpreter/src/fvm/state/ipc.rs
Original file line number Diff line number Diff line change
@@ -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();

0 comments on commit 7431138

Please sign in to comment.