From 3e6a19ee6da77143cb68d11d9eaf0684379b2ec2 Mon Sep 17 00:00:00 2001
From: elliedavidson <118024407+elliedavidson@users.noreply.github.com>
Date: Mon, 7 Aug 2023 18:42:56 -0400
Subject: [PATCH] Sync with origin/keyao/test_kill_nodes and cargo fmt

---
 testing/tests/basic.rs      | 4 +++-
 testing/tests/web_server.rs | 2 +-
 web_server/src/lib.rs       | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testing/tests/basic.rs b/testing/tests/basic.rs
index 5a078c91c3..efefe8ade3 100644
--- 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
index 1ed935233f..38fcc1986d 100644
--- 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
index 83f099efc0..dac759f9dc 100644
--- 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
 }
-