refactor: use arc instead of leak

gusinacio · gusinacio · commit 74eff2f1f2bb · 2024-11-25T20:25:50.000-06:00
Signed-off-by: Gustavo Inacio &lt;gustavo@semiotic.ai&gt;
diff --git a/crates/service/src/middleware/auth.rs b/crates/service/src/middleware/auth.rs
@@ -11,6 +11,7 @@ pub use tap::tap_receipt_authorize;
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
     use std::time::Duration;
 
     use alloy::primitives::{address, Address};
@@ -34,11 +35,11 @@ mod tests {
         pgpool: PgPool,
     ) -> impl Service<Request<Body>, Response = Response<Body>, Error = impl std::fmt::Debug> {
         let context = IndexerTapContext::new(pgpool.clone(), TAP_EIP712_DOMAIN.clone()).await;
-        let tap_manager = Box::leak(Box::new(Manager::new(
+        let tap_manager = Arc::new(Manager::new(
             TAP_EIP712_DOMAIN.clone(),
             context,
             CheckList::empty(),
-        )));
+        ));
 
         let registry = prometheus::Registry::new();
         let metric = Box::leak(Box::new(
diff --git a/crates/service/src/middleware/auth/tap.rs b/crates/service/src/middleware/auth/tap.rs
@@ -30,7 +30,7 @@ use crate::{error::IndexerServiceError, middleware::prometheus_metrics::MetricLa
 ///
 /// Requires SignedReceipt, MetricLabels and Arc<Context> extensions
 pub fn tap_receipt_authorize<T, B>(
-    tap_manager: &'static Manager<T>,
+    tap_manager: Arc<Manager<T>>,
     failed_receipt_metric: &'static prometheus::CounterVec,
 ) -> impl AsyncAuthorizeRequest<
     B,
@@ -40,17 +40,18 @@ pub fn tap_receipt_authorize<T, B>(
 > + Clone
        + Send
 where
-    T: ReceiptStore + Sync + Send,
+    T: ReceiptStore + Sync + Send + 'static,
     B: Send,
 {
-    |request: Request<B>| {
+    move |request: Request<B>| {
         let receipt = request.extensions().get::<SignedReceipt>().cloned();
         // load labels from previous middlewares
         let labels = request.extensions().get::<MetricLabels>().cloned();
         // load context from previous middlewares
         let ctx = request.extensions().get::<Arc<Context>>().cloned();
+        let tap_manager = tap_manager.clone();
 
-        async {
+        async move {
             let execute = || async {
                 let receipt = receipt.ok_or(IndexerServiceError::ReceiptNotFound)?;
                 // Verify the receipt and store it in the database
@@ -148,11 +149,11 @@ mod tests {
             }
         }
 
-        let manager = Box::leak(Box::new(Manager::new(
+        let manager = Arc::new(Manager::new(
             TAP_EIP712_DOMAIN.clone(),
             context,
             CheckList::new(vec![Arc::new(MyCheck)]),
-        )));
+        ));
         let tap_auth = tap_receipt_authorize(manager, metric);
         let authorization_middleware = AsyncRequireAuthorizationLayer::new(tap_auth);
 
diff --git a/crates/service/src/service/router.rs b/crates/service/src/service/router.rs
@@ -289,11 +289,11 @@ impl ServiceRouter {
                 )
                 .await;
                 // Returned static Manager
-                Box::leak(Box::new(Manager::new(
+                Arc::new(Manager::new(
                     self.domain_separator.clone(),
                     indexer_context,
                     CheckList::new(checks),
-                )))
+                ))
             };
 
             let mut handler = post(request_handler);
