Skip to content

Commit

Permalink
save compile err msg
Browse files Browse the repository at this point in the history
  • Loading branch information
rakita committed Dec 20, 2024
1 parent 832037e commit 26eed85
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 20 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ alloy-rpc-types-eth = "0.8"
alloy-rpc-types-trace = "0.8"
alloy-sol-types = "0.8"
alloy-primitives = { version = "0.8", features = ["map"] }
revm = { git = "https://github.com/bluealloy/revm.git", rev = "f84bfb58", default-features = false, features = [
revm = { git = "https://github.com/bluealloy/revm.git", rev = "ab62fe1a", default-features = false, features = [
"std",
] }
revm-inspector = { git = "https://github.com/bluealloy/revm.git", rev = "f84bfb58", default-features = false, features = [
revm-inspector = { git = "https://github.com/bluealloy/revm.git", rev = "ab62fe1a", default-features = false, features = [
"std",
] }

Expand All @@ -55,7 +55,7 @@ boa_gc = { version = "0.19", optional = true }

[dev-dependencies]
snapbox = { version = "0.6", features = ["term-svg"] }
revm-database = { git = "https://github.com/bluealloy/revm.git", rev = "f84bfb58", default-features = false, features = [
revm-database = { git = "https://github.com/bluealloy/revm.git", rev = "ab62fe1a", default-features = false, features = [
"std",
] }

Expand Down
2 changes: 1 addition & 1 deletion src/access_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl AccessListInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for AccessListInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for AccessListInspector
where
DB: Database,
{
Expand Down
2 changes: 1 addition & 1 deletion src/opcode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl OpcodeGasInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for OpcodeGasInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for OpcodeGasInspector
where
DB: Database,
{
Expand Down
8 changes: 6 additions & 2 deletions src/tracing/fourbyte.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
use alloy_primitives::{hex, Selector};
use alloy_rpc_types_trace::geth::FourByteFrame;
use revm::{
context::{BlockEnv, CfgEnv, ContextWire, ContextWiring, TxEnv},
interpreter::{interpreter::EthInterpreter, CallInputs, CallOutcome},
Database,
Context, Database,
};
use revm_inspector::{Inspector, PrevContext};
use std::collections::HashMap;
Expand All @@ -44,9 +45,12 @@ impl FourByteInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for FourByteInspector
/// TODO : rakita the type parameter `CTXW` is not constrained by the impl trait, self type, or predicates
/// unconstrained type parameter
impl<DB, CTXW> Inspector<ContextWire<DB, CTXW>, EthInterpreter> for FourByteInspector
where
DB: Database,
CTXW: ContextWiring<DB>,
{
fn call(
&mut self,
Expand Down
3 changes: 2 additions & 1 deletion src/tracing/js/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,10 @@ impl JsInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for JsInspector
impl<DB, W> Inspector<ContextWire<DB, W>, EthInterpreter> for JsInspector
where
DB: Database + DatabaseRef,
W: ContextWiring<DB>,
<DB as DatabaseRef>::Error: std::fmt::Display,
{
fn step(&mut self, interp: &mut Interpreter<EthInterpreter>, context: &mut PrevContext<DB>) {
Expand Down
2 changes: 1 addition & 1 deletion src/tracing/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ impl TracingInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for TracingInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for TracingInspector
where
DB: Database,
{
Expand Down
2 changes: 1 addition & 1 deletion src/tracing/mux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ impl MuxInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for MuxInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for MuxInspector
where
DB: Database,
{
Expand Down
2 changes: 1 addition & 1 deletion src/tracing/opcount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl OpcodeCountInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for OpcodeCountInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for OpcodeCountInspector
where
DB: Database,
{
Expand Down
2 changes: 1 addition & 1 deletion src/transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ impl TransferInspector {
}
}

impl<DB> Inspector<PrevContext<DB>, EthInterpreter> for TransferInspector
impl<DB,W> Inspector<ContextWire<DB,W>, EthInterpreter> for TransferInspector
where
DB: Database,
{
Expand Down
9 changes: 1 addition & 8 deletions tests/it/utils.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
use alloy_primitives::{Address, Bytes, U256};
use colorchoice::ColorChoice;
use revm::{
database_interface::EmptyDB,
primitives::{
BlockEnv, EVMError, Env, EnvWithHandlerCfg, ExecutionResult, HandlerCfg, ResultAndState,
SpecId, TransactTo, TxEnv,
},
Database, DatabaseCommit,
};
use revm::{database_interface::EmptyDB, Database, DatabaseCommit};
use revm_database::CacheDB;
use revm_inspector::{inspector_handler, Inspector};
use revm_inspectors::tracing::{
Expand Down

0 comments on commit 26eed85

Please sign in to comment.