nits + cleanup

Author: dylanlott

bin/builder.rs

@@ -22,7 +22,7 @@ async fn main() -> eyre::Result<()> {
     let constants = SignetSystemConstants::pecorino();
 
     // Spawn the EnvTask
-    let env_task = config.env_task().await;
+    let env_task = config.env_task();
     let (block_env, env_jh) = env_task.spawn();
 
     // Spawn the cache system

src/config.rs

@@ -245,7 +245,7 @@ impl BuilderConfig {
     }
 
     /// Create an [`EnvTask`] using this config.
-    pub async fn env_task(&self) -> EnvTask {
+    pub fn env_task(&self) -> EnvTask {
         let ru_provider = self.connect_ru_provider();
         EnvTask::new(self.clone(), ru_provider)
     }

src/tasks/cache/task.rs

@@ -6,7 +6,6 @@ use tokio::{
     sync::{mpsc, watch},
     task::JoinHandle,
 };
-
 use crate::tasks::env::SimEnv;
 
 /// Cache task for the block builder.

tests/block_builder_test.rs

@@ -42,7 +42,7 @@ async fn test_handle_build() {
     // Create a rollup provider
     let ru_provider = RootProvider::<Ethereum>::new_http(anvil_instance.endpoint_url());
 
-    let block_env = config.env_task().await.spawn().0;
+    let block_env = config.env_task().spawn().0;
 
     let block_builder = Simulator::new(&config, ru_provider.clone(), block_env);
 

tests/cache.rs

@@ -9,7 +9,7 @@ async fn test_bundle_poller_roundtrip() -> eyre::Result<()> {
 
     let config = setup_test_config().unwrap();
 
-    let (block_env, _jh) = config.env_task().await.spawn();
+    let (block_env, _jh) = config.env_task().spawn();
     let cache = config.spawn_cache_system(block_env);
 
     tokio::time::sleep(Duration::from_secs(12)).await;

tests/env.rs

@@ -7,7 +7,7 @@ async fn test_bundle_poller_roundtrip() {
 
     let config = setup_test_config().unwrap();
     let env_task = config.env_task();
-    let (mut env_watcher, _jh) = env_task.await.spawn();
+    let (mut env_watcher, _jh) = env_task.spawn();
 
     env_watcher.changed().await.unwrap();
     let env = env_watcher.borrow_and_update();