From 52af1ef34fa765977f3ce3f6543cb31476646cd1 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 17 May 2024 17:07:20 -0400 Subject: [PATCH] change round start delay --- crates/hotshot/src/traits/networking/combined_network.rs | 1 - crates/testing/tests/tests_5/combined_network.rs | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/hotshot/src/traits/networking/combined_network.rs b/crates/hotshot/src/traits/networking/combined_network.rs index d36e41b139..884886cfed 100644 --- a/crates/hotshot/src/traits/networking/combined_network.rs +++ b/crates/hotshot/src/traits/networking/combined_network.rs @@ -254,7 +254,6 @@ impl TestableNetworkingImplementation for CombinedNetwor // Create the quorum and da networks let quorum_net = Self { networks: Arc::new(quorum_networks), - primary_fail_counter: Arc::new(AtomicU64::new(0)), primary_down: Arc::new(AtomicBool::new(false)), message_cache: Arc::clone(&message_cache), diff --git a/crates/testing/tests/tests_5/combined_network.rs b/crates/testing/tests/tests_5/combined_network.rs index 5be931e554..424239cbba 100644 --- a/crates/testing/tests/tests_5/combined_network.rs +++ b/crates/testing/tests/tests_5/combined_network.rs @@ -158,7 +158,10 @@ async fn test_combined_network_half_dc() { async_compatibility_layer::logging::setup_backtrace(); let mut metadata: TestDescription = TestDescription { timing_data: TimingData { - round_start_delay: 25, + // We need a longer round start delay since half of the nodes will move on to the next + // view before some nodes finish processing the previous view. This causes issues before + // the first decide event. + round_start_delay: 100, next_view_timeout: 10_000, start_delay: 120_000,