Sync with origin/keyao/test_kill_nodes and cargo fmt

EspressoSystems · Aug 7, 2023 · 3e6a19e · 3e6a19e
1 parent 987fdba
commit 3e6a19e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/testing/tests/basic.rs b/testing/tests/basic.rs
@@ -25,7 +25,9 @@ async fn test_with_failures() {
     use std::time::Duration;
 
     use hotshot_testing::{
-        completion_task::TimeBasedCompletionTaskDescription, spinning_task::SpinningTaskDescription, overall_safety_task::OverallSafetyPropertiesDescription,
+        completion_task::TimeBasedCompletionTaskDescription,
+        overall_safety_task::OverallSafetyPropertiesDescription,
+        spinning_task::SpinningTaskDescription,
     };
 
     async_compatibility_layer::logging::setup_logging();

diff --git a/testing/tests/web_server.rs b/testing/tests/web_server.rs
@@ -1,9 +1,9 @@
 use async_compatibility_layer::logging::shutdown_logging;
+use hotshot_testing::overall_safety_task::OverallSafetyPropertiesDescription;
 use hotshot_testing::{
     node_types::{SequencingTestTypes, SequencingWebImpl},
     test_builder::{TestMetadata, TimingData},
 };
-use hotshot_testing::overall_safety_task::OverallSafetyPropertiesDescription;
 use tracing::instrument;
 
 /// Web server network test

diff --git a/web_server/src/lib.rs b/web_server/src/lib.rs
@@ -669,4 +669,3 @@ pub async fn run_web_server<KEY: SignatureKey + 'static>(
 
     app_future.await
 }
-