refactor: cache directory

Author: prestwich

bin/builder.rs

@@ -1,7 +1,12 @@
 use builder::{
     config::BuilderConfig,
     service::serve_builder,
-    tasks::{block::sim::Simulator, bundler, metrics::MetricsTask, submit::SubmitTask, tx_poller},
+    tasks::{
+        block::sim::Simulator,
+        cache::{BundlePoller, TxPoller},
+        metrics::MetricsTask,
+        submit::SubmitTask,
+    },
 };
 use init4_bin_base::{deps::tracing, utils::from_env::FromEnv};
 use signet_sim::SimCache;
@@ -32,10 +37,10 @@ async fn main() -> eyre::Result<()> {
     let submit =
         SubmitTask { zenith, quincey, config: config.clone(), outbound_tx_channel: tx_channel };
 
-    let tx_poller = tx_poller::TxPoller::new(&config);
+    let tx_poller = TxPoller::new(&config);
     let (tx_receiver, tx_poller_jh) = tx_poller.spawn();
 
-    let bundle_poller = bundler::BundlePoller::new(&config, token);
+    let bundle_poller = BundlePoller::new(&config, token);
     let (bundle_receiver, bundle_poller_jh) = bundle_poller.spawn();
 
     let (submit_channel, submit_jh) = submit.spawn();

src/tasks/block/sim.rs

@@ -4,7 +4,7 @@
 use super::cfg::PecorinoBlockEnv;
 use crate::{
     config::{BuilderConfig, RuProvider},
-    tasks::{block::cfg::PecorinoCfg, bundler::Bundle},
+    tasks::{block::cfg::PecorinoCfg, cache::Bundle},
 };
 use alloy::{
     consensus::TxEnvelope,

src/tasks/bundler.rs renamed to src/tasks/cache/bundle.rs

@@ -22,7 +22,7 @@ pub struct Bundle {
 
 /// Response from the tx-pool containing a list of bundles.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct TxPoolBundleResponse {
+struct TxPoolBundleResponse {
     /// Bundle responses are available on the bundles property.
     pub bundles: Vec<Bundle>,
 }

src/tasks/cache/mod.rs

@@ -0,0 +1,8 @@
+mod task;
+pub use task::CacheTask;
+
+mod tx;
+pub use tx::TxPoller;
+
+mod bundle;
+pub use bundle::{Bundle, BundlePoller};

src/tasks/cache.rs renamed to src/tasks/cache/task.rs

@@ -10,7 +10,7 @@ use tokio::{sync::mpsc, task::JoinHandle, time};
 
 /// Models a response from the transaction pool.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct TxPoolResponse {
+struct TxPoolResponse {
     /// Holds the transactions property as a list on the response.
     transactions: Vec<TxEnvelope>,
 }

src/tasks/tx_poller.rs renamed to src/tasks/cache/tx.rs

@@ -4,9 +4,6 @@ pub mod block;
 /// Cache ingestion task
 pub mod cache;
 
-/// Bundle poller task
-pub mod bundler;
-
 /// Tx submission metric task
 pub mod metrics;
 
@@ -16,8 +13,5 @@ pub mod oauth;
 /// Tx submission task
 pub mod submit;
 
-/// Tx polling task
-pub mod tx_poller;
-
 /// Constructs the simualtion environment.
 pub mod env;

src/tasks/mod.rs

@@ -8,7 +8,7 @@ mod tests {
         let config = test_utils::setup_test_config().unwrap();
         let auth = Authenticator::new(&config)?;
 
-        let mut bundle_poller = builder::tasks::bundler::BundlePoller::new(&config, auth.token());
+        let mut bundle_poller = builder::tasks::cache::BundlePoller::new(&config, auth.token());
 
         let _ = bundle_poller.check_bundle_cache().await?;
 

tests/bundle_poller_test.rs

@@ -1,9 +1,11 @@
 mod tests {
-    use alloy::primitives::U256;
-    use alloy::signers::local::PrivateKeySigner;
-    use builder::config::BuilderConfig;
-    use builder::tasks::tx_poller;
-    use builder::test_utils::{new_signed_tx, setup_logging, setup_test_config}; // Import the refactored function
+    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"]
@@ -18,7 +20,7 @@ mod tests {
         post_tx(&config).await?;
 
         // Create a new poller
-        let mut poller = tx_poller::TxPoller::new(&config);
+        let mut poller = TxPoller::new(&config);
 
         // Fetch transactions the pool
         let transactions = poller.check_tx_cache().await?;