refactor: integrate env and cache tasks #92
+419
−596
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,134 +1,130 @@ | ||
| //! Tests for the block building task. | ||
| use alloy::{ | ||
| network::Ethereum, | ||
| node_bindings::Anvil, | ||
| primitives::U256, | ||
| providers::{Provider, RootProvider}, | ||
| signers::local::PrivateKeySigner, | ||
| }; | ||
| use builder::{ | ||
| tasks::{block::sim::Simulator, cache::CacheTask}, | ||
| test_utils::{new_signed_tx, setup_logging, setup_test_config, test_block_env}, | ||
| }; | ||
| use signet_sim::{SimCache, SimItem}; | ||
| use signet_types::constants::SignetSystemConstants; | ||
| use std::time::{Duration, Instant}; | ||
| use tokio::{sync::mpsc::unbounded_channel, time::timeout}; | ||
|
|
||
| /// Tests the `handle_build` method of the `Simulator`. | ||
| /// | ||
| /// This test sets up a simulated environment using Anvil, creates a block builder, | ||
| /// and verifies that the block builder can successfully build a block containing | ||
| /// transactions from multiple senders. | ||
| #[ignore = "integration test"] | ||
| #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | ||
| async fn test_handle_build() { | ||
| use alloy::eips::BlockId; | ||
|
|
||
| setup_logging(); | ||
|
|
||
| // Make a test config | ||
| let config = setup_test_config().unwrap(); | ||
| let constants = SignetSystemConstants::pecorino(); | ||
|
|
||
| // Create an anvil instance for testing | ||
| let anvil_instance = Anvil::new().chain_id(signet_constants::pecorino::RU_CHAIN_ID).spawn(); | ||
|
|
||
| // Create a wallet | ||
| let keys = anvil_instance.keys(); | ||
| let test_key_0 = PrivateKeySigner::from_signing_key(keys[0].clone().into()); | ||
| let test_key_1 = PrivateKeySigner::from_signing_key(keys[1].clone().into()); | ||
|
|
||
| // Create a rollup provider | ||
| let ru_provider = RootProvider::<Ethereum>::new_http(anvil_instance.endpoint_url()); | ||
|
|
||
| let block_env = config.env_task().spawn().0; | ||
|
|
||
| let block_builder = Simulator::new(&config, ru_provider.clone(), block_env); | ||
|
|
||
| // Setup a sim cache | ||
| let sim_items = SimCache::new(); | ||
|
|
||
| // Add two transactions from two senders to the sim cache | ||
| let tx_1 = new_signed_tx(&test_key_0, 0, U256::from(1_f64), 11_000).unwrap(); | ||
| sim_items.add_item(SimItem::Tx(tx_1), 0); | ||
|
|
||
| let tx_2 = new_signed_tx(&test_key_1, 0, U256::from(2_f64), 10_000).unwrap(); | ||
| sim_items.add_item(SimItem::Tx(tx_2), 0); | ||
|
|
||
| // Setup the block env | ||
| let finish_by = Instant::now() + Duration::from_secs(2); | ||
| let header = ru_provider.get_block(BlockId::latest()).await.unwrap().unwrap().header.inner; | ||
| let number = header.number + 1; | ||
| let timestamp = header.timestamp + config.slot_calculator.slot_duration(); | ||
| let block_env = test_block_env(config, number, 7, timestamp); | ||
|
|
||
| // Spawn the block builder task | ||
| let got = block_builder.handle_build(constants, sim_items, finish_by, block_env).await; | ||
|
|
||
| // Assert on the built block | ||
| assert!(got.is_ok()); | ||
| assert!(got.unwrap().tx_count() == 2); | ||
| } | ||
|
|
||
| /// Tests the full block builder loop, including transaction ingestion and block simulation. | ||
| /// | ||
| /// This test sets up a simulated environment using Anvil, creates a block builder, | ||
| /// and verifies that the builder can process incoming transactions and produce a block | ||
| /// within a specified timeout. | ||
| #[ignore = "integration test"] | ||
| #[tokio::test(flavor = "multi_thread", worker_threads = 2)] | ||
| async fn test_spawn() { | ||
| setup_logging(); | ||
|
|
||
| // Make a test config | ||
| let config = setup_test_config().unwrap(); | ||
| let constants = SignetSystemConstants::pecorino(); | ||
|
|
||
| // Create an anvil instance for testing | ||
| let anvil_instance = Anvil::new().chain_id(signet_constants::pecorino::RU_CHAIN_ID).spawn(); | ||
|
|
||
| // Create a wallet | ||
| let keys = anvil_instance.keys(); | ||
| let test_key_0 = PrivateKeySigner::from_signing_key(keys[0].clone().into()); | ||
| let test_key_1 = PrivateKeySigner::from_signing_key(keys[1].clone().into()); | ||
|
|
||
| // Plumb inputs for the test setup | ||
| let (tx_sender, tx_receiver) = unbounded_channel(); | ||
| let (_, bundle_receiver) = unbounded_channel(); | ||
| let (block_sender, mut block_receiver) = unbounded_channel(); | ||
|
|
||
| let env_task = config.env_task(); | ||
| let (block_env, _env_jh) = env_task.spawn(); | ||
|
|
||
| let cache_task = CacheTask::new(block_env.clone(), bundle_receiver, tx_receiver); | ||
| let (sim_cache, _cache_jh) = cache_task.spawn(); | ||
|
|
||
| // Create a rollup provider | ||
| let ru_provider = RootProvider::<Ethereum>::new_http(anvil_instance.endpoint_url()); | ||
|
|
||
| let sim = Simulator::new(&config, ru_provider.clone(), block_env); | ||
|
|
||
| // Finally, Kick off the block builder task. | ||
| sim.spawn_simulator_task(constants, sim_cache.clone(), block_sender); | ||
|
|
||
| // Feed in transactions to the tx_sender and wait for the block to be simulated | ||
| let tx_1 = new_signed_tx(&test_key_0, 0, U256::from(1_f64), 11_000).unwrap(); | ||
| let tx_2 = new_signed_tx(&test_key_1, 0, U256::from(2_f64), 10_000).unwrap(); | ||
| tx_sender.send(tx_1).unwrap(); | ||
| tx_sender.send(tx_2).unwrap(); | ||
|
|
||
| // Wait for a block with timeout | ||
| let result = timeout(Duration::from_secs(5), block_receiver.recv()).await; | ||
| assert!(result.is_ok(), "Did not receive block within 5 seconds"); | ||
|
|
||
| // Assert on the block | ||
| let block = result.unwrap(); | ||
| assert!(block.is_some(), "Block channel closed without receiving a block"); | ||
| assert!(block.unwrap().tx_count() == 2); // TODO: Why is this failing? I'm seeing EVM errors but haven't tracked them down yet. | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| use builder::test_utils; | ||
| use eyre::Result; | ||
|
|
||
| #[ignore = "integration test"] | ||
| #[tokio::test] | ||
| async fn test_bundle_poller_roundtrip() -> Result<()> { | ||
| let config = test_utils::setup_test_config().unwrap(); | ||
| let token = config.oauth_token(); | ||
|
|
||
| let mut bundle_poller = builder::tasks::cache::BundlePoller::new(&config, token); | ||
|
|
||
| let _ = bundle_poller.check_bundle_cache().await?; | ||
|
|
||
| Ok(()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| use builder::test_utils::{setup_logging, setup_test_config}; | ||
| use init4_bin_base::deps::tracing::warn; | ||
| use std::time::Duration; | ||
|
|
||
| #[ignore = "integration test. This test will take >12 seconds to run, and requires Authz configuration env vars."] | ||
| #[tokio::test] | ||
| async fn test_bundle_poller_roundtrip() -> eyre::Result<()> { | ||
| setup_logging(); | ||
|
|
||
| let config = setup_test_config().unwrap(); | ||
|
|
||
| let (block_env, _jh) = config.env_task().spawn(); | ||
| let cache = config.spawn_cache_system(block_env); | ||
|
|
||
| tokio::time::sleep(Duration::from_secs(12)).await; | ||
|
|
||
| warn!(txns = ?cache.sim_cache.read_best(5)); | ||
|
|
||
| Ok(()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| use builder::test_utils::{setup_logging, setup_test_config}; | ||
|
|
||
| #[ignore = "integration test. This test will take between 0 and 12 seconds to run."] | ||
| #[tokio::test] | ||
| async fn test_bundle_poller_roundtrip() { | ||
| setup_logging(); | ||
|
|
||
| let config = setup_test_config().unwrap(); | ||
| let env_task = config.env_task(); | ||
| let (mut env_watcher, _jh) = env_task.spawn(); | ||
|
|
||
| env_watcher.changed().await.unwrap(); | ||
| let env = env_watcher.borrow_and_update(); | ||
| assert!(env.as_ref().is_some(), "Env should be Some"); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,48 @@ | ||
| use alloy::{primitives::U256, signers::local::PrivateKeySigner}; | ||
| use builder::{ | ||
| config::BuilderConfig, | ||
| tasks::cache::TxPoller, | ||
| test_utils::{new_signed_tx, setup_logging, setup_test_config}, | ||
| }; | ||
| // Import the refactored function | ||
| use eyre::{Ok, Result}; | ||
|
|
||
| #[ignore = "integration test"] | ||
| #[tokio::test] | ||
| async fn test_tx_roundtrip() -> Result<()> { | ||
| setup_logging(); | ||
|
|
||
| // Create a new test environment | ||
| let config = setup_test_config()?; | ||
|
|
||
| // Post a transaction to the cache | ||
| post_tx(&config).await?; | ||
|
|
||
| // Create a new poller | ||
| let mut poller = TxPoller::new(&config); | ||
|
|
||
| // Fetch transactions the pool | ||
| let transactions = poller.check_tx_cache().await?; | ||
|
|
||
| // Ensure at least one transaction exists | ||
| assert!(!transactions.is_empty()); | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| async fn post_tx(config: &BuilderConfig) -> Result<()> { | ||
| let client = reqwest::Client::new(); | ||
|
|
||
| let wallet = PrivateKeySigner::random(); | ||
| let tx_envelope = new_signed_tx(&wallet, 1, U256::from(1), 10_000)?; | ||
|
|
||
| let url = format!("{}/transactions", config.tx_pool_url); | ||
| let response = client.post(&url).json(&tx_envelope).send().await?; | ||
|
|
||
| if !response.status().is_success() { | ||
| let error_text = response.text().await?; | ||
| eyre::bail!("Failed to post transaction: {}", error_text); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this seems to have been giving incorrect output. we need to sub remaining from duration, then add that to now