Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/rpc/tests/eip7702_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl TestSetup {

// Deploy Minimal7702Account contract
let deploy_data = Minimal7702Account::BYTECODE.to_vec();
let (account_deploy_tx, account_contract_address, _) =
let (account_deploy_tx, account_contract_address, _account_deploy_hash) =
deployer.create_deployment_tx(Bytes::from(deploy_data), 0)?;

Ok(Self { harness, account_contract_address, account_deploy_tx })
Expand Down
6 changes: 3 additions & 3 deletions crates/runner/src/extensions/canon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ impl FlashblocksCanonExtension {

impl BaseNodeExtension for FlashblocksCanonExtension {
/// Applies the extension to the supplied builder.
fn apply(&self, builder: OpBuilder) -> OpBuilder {
let flashblocks = self.config.clone();
fn apply(self: Box<Self>, builder: OpBuilder) -> OpBuilder {
let flashblocks = self.config;
let flashblocks_enabled = flashblocks.is_some();
let flashblocks_cell = self.cell.clone();
let flashblocks_cell = self.cell;

builder.install_exex_if(flashblocks_enabled, "flashblocks-canon", move |mut ctx| {
let flashblocks_cell = flashblocks_cell.clone();
Expand Down
2 changes: 1 addition & 1 deletion crates/runner/src/extensions/extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{BaseNodeConfig, extensions::OpBuilder};
/// A node builder extension that can apply additional wiring to the builder.
pub trait BaseNodeExtension: Send + Sync + Debug {
/// Applies the extension to the supplied builder.
fn apply(&self, builder: OpBuilder) -> OpBuilder;
fn apply(self: Box<Self>, builder: OpBuilder) -> OpBuilder;
}

/// An extension that can be constructed from [`BaseNodeConfig`].
Expand Down
8 changes: 4 additions & 4 deletions crates/runner/src/extensions/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ impl BaseRpcExtension {

impl BaseNodeExtension for BaseRpcExtension {
/// Applies the extension to the supplied builder.
fn apply(&self, builder: OpBuilder) -> OpBuilder {
let flashblocks_cell = self.flashblocks_cell.clone();
let flashblocks = self.flashblocks.clone();
fn apply(self: Box<Self>, builder: OpBuilder) -> OpBuilder {
let flashblocks_cell = self.flashblocks_cell;
let flashblocks = self.flashblocks;
let metering_enabled = self.metering_enabled;
let sequencer_rpc = self.sequencer_rpc.clone();
let sequencer_rpc = self.sequencer_rpc;

builder.extend_rpc_modules(move |ctx| {
if metering_enabled {
Expand Down
2 changes: 1 addition & 1 deletion crates/runner/src/extensions/tracing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl TransactionTracingExtension {

impl BaseNodeExtension for TransactionTracingExtension {
/// Applies the extension to the supplied builder.
fn apply(&self, builder: OpBuilder) -> OpBuilder {
fn apply(self: Box<Self>, builder: OpBuilder) -> OpBuilder {
let tracing = self.config;
builder.install_exex_if(tracing.enabled, "tracex", move |ctx| async move {
Ok(tracex_exex(ctx, tracing.logs_enabled))
Expand Down