cleanup and logging

Author: dylanlott

src/tasks/env.rs

@@ -66,7 +66,6 @@ impl EnvTask {
             let Some(block) = blocks.last() else {
                 // This case occurs when there are no changes to the block,
                 // so we do nothing.
-                debug!("empty filter changes");
                 continue;
             };
             let span = info_span!("EnvTask::task_fut::loop", hash = %block, number = tracing::field::Empty);
@@ -96,10 +95,10 @@ impl EnvTask {
                 }
             };
             span.record("number", previous.number);
-            debug!("retrieved latest block");
 
             let env = self.construct_block_env(&previous);
-            debug!(?env, "constructed block env");
+            debug!(block_number = ?env.number, env.basefee, "constructed latest block env");
+
             if sender.send(Some(env)).is_err() {
                 // The receiver has been dropped, so we can stop the task.
                 debug!("receiver dropped, stopping task");

src/tasks/submit.rs

@@ -395,6 +395,7 @@ impl SubmitTask {
         debug!(
             host_block_number = %sig_request.host_block_number,
             ru_chain_id = %sig_request.ru_chain_id,
+            tx_count = block.tx_count(),
             "constructed signature request for host block"
         );
 
@@ -430,7 +431,7 @@ impl SubmitTask {
                             debug!(slot_number, "403 detected - skipping slot");
                             return Ok(ControlFlow::Skip);
                         } else {
-                            // Otherwise, log error and retry 
+                            // Otherwise, log error and retry
                             error!(error = %err, "error handling inbound block");
                         }
 
@@ -515,7 +516,10 @@ impl SubmitTask {
 
             // Only attempt each block number once
             if result.block.block_number() == last_block_attempted {
-                debug!(block_number = result.block.block_number(), "block number is unchanged from last attempt - skipping");
+                debug!(
+                    block_number = result.block.block_number(),
+                    "block number is unchanged from last attempt - skipping"
+                );
                 continue;
             }
 
@@ -586,5 +590,5 @@ pub fn bump_gas_from_retries(
         max_fee_per_gas, priority_fee, max_fee_per_blob_gas, "calculated bumped gas parameters"
     );
 
-    (max_fee_per_gas as u128, priority_fee as u128, max_fee_per_blob_gas)
+    (max_fee_per_gas, priority_fee as u128, max_fee_per_blob_gas)
 }

tests/block_builder_test.rs

@@ -8,13 +8,12 @@ use alloy::{
     signers::local::PrivateKeySigner,
 };
 use builder::{
-    tasks::{block::sim::Simulator, cache::CacheTask},
+    tasks::block::sim::Simulator,
     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`.
 ///