From 65e129654d6b2e44425de8ee6a67ed40e9f07d62 Mon Sep 17 00:00:00 2001
From: Omar Abdulla <OmarAbdulla7@hotmail.com>
Date: Sun, 26 Oct 2025 04:00:00 +0300
Subject: [PATCH] Increase tx timeout and channel limits

---
 crates/core/src/differential_tests/entry_point.rs | 15 +++++++++------
 crates/node/src/provider_utils/provider.rs        |  2 +-
 crates/report/src/aggregator.rs                   |  4 ++--
 crates/report/src/runner_event.rs                 | 10 ++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/crates/core/src/differential_tests/entry_point.rs b/crates/core/src/differential_tests/entry_point.rs
index 27a6656..69a09a3 100644
--- a/crates/core/src/differential_tests/entry_point.rs
+++ b/crates/core/src/differential_tests/entry_point.rs
@@ -330,15 +330,18 @@ async fn start_cli_reporting_task(output_format: OutputFormat, reporter: Reporte
                 .unwrap();
                 writeln!(buf).unwrap();
 
-                buf = tokio::task::spawn_blocking(move || {
-                    buf.flush().unwrap();
-                    buf
-                })
-                .await
-                .unwrap();
+                if aggregator_events_rx.is_empty() {
+                    buf = tokio::task::spawn_blocking(move || {
+                        buf.flush().unwrap();
+                        buf
+                    })
+                    .await
+                    .unwrap();
+                }
             }
         }
     }
+    info!("Aggregator Broadcast Channel Closed");
 
     // Summary at the end.
     match output_format {
diff --git a/crates/node/src/provider_utils/provider.rs b/crates/node/src/provider_utils/provider.rs
index f10b3b6..c8f5655 100644
--- a/crates/node/src/provider_utils/provider.rs
+++ b/crates/node/src/provider_utils/provider.rs
@@ -104,7 +104,7 @@ where
     };
     debug!(%tx_hash, "Submitted Transaction");
 
-    pending_transaction.set_timeout(Some(Duration::from_secs(120)));
+    pending_transaction.set_timeout(Some(Duration::from_secs(240)));
     let tx_hash = pending_transaction.watch().await.context(format!(
         "Transaction inclusion watching timeout for {tx_hash}"
     ))?;
diff --git a/crates/report/src/aggregator.rs b/crates/report/src/aggregator.rs
index 87cc379..1feda38 100644
--- a/crates/report/src/aggregator.rs
+++ b/crates/report/src/aggregator.rs
@@ -41,7 +41,7 @@ pub struct ReportAggregator {
 impl ReportAggregator {
     pub fn new(context: Context) -> Self {
         let (runner_tx, runner_rx) = unbounded_channel::<RunnerEvent>();
-        let (listener_tx, _) = channel::<ReporterEvent>(1024);
+        let (listener_tx, _) = channel::<ReporterEvent>(0xFFFF);
         Self {
             report: Report::new(context),
             remaining_cases: Default::default(),
@@ -64,7 +64,7 @@ impl ReportAggregator {
         debug!("Starting to aggregate report");
 
         while let Some(event) = self.runner_rx.recv().await {
-            debug!(?event, "Received Event");
+            debug!(event = event.variant_name(), "Received Event");
             match event {
                 RunnerEvent::SubscribeToEvents(event) => {
                     self.handle_subscribe_to_events_event(*event);
diff --git a/crates/report/src/runner_event.rs b/crates/report/src/runner_event.rs
index 0a142b9..fe4155a 100644
--- a/crates/report/src/runner_event.rs
+++ b/crates/report/src/runner_event.rs
@@ -347,6 +347,16 @@ macro_rules! define_event {
                 ),*
             }
 
+            impl $ident {
+                pub fn variant_name(&self) -> &'static str {
+                    match self {
+                        $(
+                            Self::$variant_ident { .. } => stringify!($variant_ident)
+                        ),*
+                    }
+                }
+            }
+
             $(
                 #[derive(Debug)]
                 $(#[$variant_meta])*