From dd73c1d793e54c6460bf0b6c58371f3685e5064e Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Wed, 3 May 2023 19:42:11 +0200
Subject: [PATCH] revert some intermediate changes to
 failpoint_sleep_millis_async

---
 libs/utils/src/lib.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libs/utils/src/lib.rs b/libs/utils/src/lib.rs
index a946962342..82701ed4b0 100644
--- a/libs/utils/src/lib.rs
+++ b/libs/utils/src/lib.rs
@@ -61,20 +61,16 @@ pub mod tracing_span_assert;
 /// use with fail::cfg("$name", "return(2000)")
 #[macro_export]
 macro_rules! failpoint_sleep_millis_async {
-    ($name:literal) => {
-        $crate::failpoint_sleep_millis_async!($name, async {})
-    };
-    ($name:literal, $pre_sleep:expr) => {{
+    ($name:literal) => {{
         let should_sleep: Option<std::time::Duration> = (|| {
             fail::fail_point!($name, |v: Option<_>| {
                 let millis = v.unwrap().parse::<u64>().unwrap();
-                Some(::std::time::Duration::from_millis(millis))
+                Some(Duration::from_millis(millis))
             });
             None
         })();
         if let Some(d) = should_sleep {
             tracing::info!("failpoint {:?}: sleeping for {:?}", $name, d);
-            $pre_sleep.await;
             tokio::time::sleep(d).await;
             tracing::info!("failpoint {:?}: sleep done", $name);
         }