Move Drop from mempool::ActiveState to mempool::Downloads, to avoid bugs

ZcashFoundation · Dec 11, 2022 · a7f820d · a7f820d
1 parent aa430e9
commit a7f820d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/zebrad/src/components/mempool.rs b/zebrad/src/components/mempool.rs
@@ -107,14 +107,6 @@ impl Default for ActiveState {
     }
 }
 
-impl Drop for ActiveState {
-    fn drop(&mut self) {
-        if let ActiveState::Enabled { tx_downloads, .. } = self {
-            tx_downloads.cancel_all();
-        }
-    }
-}
-
 impl ActiveState {
     /// Returns the current state, leaving [`Self::Disabled`] in its place.
     fn take(&mut self) -> Self {

diff --git a/zebrad/src/components/mempool/downloads.rs b/zebrad/src/components/mempool/downloads.rs
@@ -122,7 +122,7 @@ pub enum TransactionDownloadVerifyError {
 #[derive(Debug)]
 pub struct Downloads<ZN, ZV, ZS>
 where
-    ZN: Service<zn::Request, Response = zn::Response, Error = BoxError> + Send + 'static,
+    ZN: Service<zn::Request, Response = zn::Response, Error = BoxError> + Send + Clone + 'static,
     ZN::Future: Send,
     ZV: Service<tx::Request, Response = tx::Response, Error = BoxError> + Send + Clone + 'static,
     ZV::Future: Send,
@@ -467,14 +467,16 @@ where
 #[pinned_drop]
 impl<ZN, ZV, ZS> PinnedDrop for Downloads<ZN, ZV, ZS>
 where
-    ZN: Service<zn::Request, Response = zn::Response, Error = BoxError> + Send + 'static,
+    ZN: Service<zn::Request, Response = zn::Response, Error = BoxError> + Send + Clone + 'static,
     ZN::Future: Send,
     ZV: Service<tx::Request, Response = tx::Response, Error = BoxError> + Send + Clone + 'static,
     ZV::Future: Send,
     ZS: Service<zs::Request, Response = zs::Response, Error = BoxError> + Send + Clone + 'static,
     ZS::Future: Send,
 {
-    fn drop(self: Pin<&mut Self>) {
+    fn drop(mut self: Pin<&mut Self>) {
+        self.cancel_all();
+
         metrics::gauge!("mempool.currently.queued.transactions", 0 as f64);
     }
 }