Skip to content

Remove redundant account initialization #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2025
Merged

Remove redundant account initialization #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions crates/op-rbuilder/src/tests/flashblocks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use tokio_util::sync::CancellationToken;

use crate::{
args::{FlashblocksArgs, OpRbuilderArgs},
tests::{ChainDriverExt, LocalInstance, TransactionBuilderExt},
tests::{LocalInstance, TransactionBuilderExt},
};

#[rb_test(flashblocks, args = OpRbuilderArgs {
Expand All @@ -25,7 +25,6 @@ use crate::{
})]
async fn smoke_dynamic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -94,7 +93,6 @@ async fn smoke_dynamic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
})]
async fn smoke_dynamic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -163,7 +161,6 @@ async fn smoke_dynamic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
})]
async fn smoke_classic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -232,7 +229,6 @@ async fn smoke_classic_unichain(rbuilder: LocalInstance) -> eyre::Result<()> {
})]
async fn smoke_classic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -301,7 +297,6 @@ async fn smoke_classic_base(rbuilder: LocalInstance) -> eyre::Result<()> {
})]
async fn unichain_dynamic_with_lag(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down Expand Up @@ -372,7 +367,6 @@ async fn unichain_dynamic_with_lag(rbuilder: LocalInstance) -> eyre::Result<()>
})]
async fn dynamic_with_full_block_lag(rbuilder: LocalInstance) -> eyre::Result<()> {
let driver = rbuilder.driver().await?;
driver.fund_default_accounts().await?;

// Create a struct to hold received messages
let received_messages = Arc::new(Mutex::new(Vec::new()));
Expand Down
12 changes: 3 additions & 9 deletions crates/op-rbuilder/src/tests/framework/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
tests::{
create_test_db,
framework::{driver::ChainDriver, BUILDER_PRIVATE_KEY},
ChainDriverExt, EngineApi, Ipc, TransactionPoolObserver,
EngineApi, Ipc, TransactionPoolObserver,
},
tx::FBPooledTransaction,
tx_signer::Signer,
Expand Down Expand Up @@ -179,10 +179,7 @@ impl LocalInstance {
let Commands::Node(ref node_command) = args.command else {
unreachable!()
};
let instance = Self::new::<StandardBuilder>(node_command.ext.clone()).await?;
let driver = ChainDriver::<Ipc>::local(&instance).await?;
driver.fund_default_accounts().await?;
Ok(instance)
Self::new::<StandardBuilder>(node_command.ext.clone()).await
}

/// Creates new local instance of the OP builder node with the flashblocks builder configuration.
Expand All @@ -194,10 +191,7 @@ impl LocalInstance {
};
node_command.ext.flashblocks.enabled = true;
node_command.ext.flashblocks.flashblocks_port = 0; // use random os assigned port
let instance = Self::new::<FlashblocksBuilder>(node_command.ext.clone()).await?;
let driver = ChainDriver::<Ipc>::local(&instance).await?;
driver.fund_default_accounts().await?;
Ok(instance)
Self::new::<FlashblocksBuilder>(node_command.ext.clone()).await
}

pub const fn config(&self) -> &NodeConfig<OpChainSpec> {
Expand Down
Loading