refactor: remove option from tap receipt

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/monitor/src/deployment_to_allocation.rs

@@ -34,7 +34,9 @@ mod tests {
         let deployment = deployment_to_allocation(allocations_watcher);
 
         let deployments = deployment.borrow();
-        assert_eq!(deployments.len(), allocations.len());
+        // one of the allocation id point to the same subgraph
+        assert_eq!(deployments.len(), 3);
+        // check if all allocations point to the subgraph id
         for (key, val) in deployments.iter() {
             assert_eq!(allocations.get(val).unwrap().subgraph_deployment.id, *key);
         }

crates/service/src/middleware/inject_receipt.rs

@@ -10,10 +10,10 @@ use crate::service::TapReceipt;
 ///
 /// This is useful to not deserialize multiple times the same receipt
 pub async fn receipt_middleware(mut request: Request, next: Next) -> Response {
-    if let Ok(TypedHeader(receipt)) = request.extract_parts::<TypedHeader<TapReceipt>>().await {
-        if let Some(receipt) = receipt.into_signed_receipt() {
-            request.extensions_mut().insert(receipt);
-        }
+    if let Ok(TypedHeader(TapReceipt(receipt))) =
+        request.extract_parts::<TypedHeader<TapReceipt>>().await
+    {
+        request.extensions_mut().insert(receipt);
     }
     next.run(request).await
 }

crates/service/src/service/tap_receipt_header.rs

@@ -1,29 +1,13 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::ops::Deref;
-
 use axum_extra::headers::{self, Header, HeaderName, HeaderValue};
 use lazy_static::lazy_static;
 use prometheus::{register_counter, Counter};
 use tap_core::receipt::SignedReceipt;
 
 #[derive(Debug, PartialEq)]
-pub struct TapReceipt(Option<SignedReceipt>);
-
-impl TapReceipt {
-    pub fn into_signed_receipt(self) -> Option<SignedReceipt> {
-        self.0
-    }
-}
-
-impl Deref for TapReceipt {
-    type Target = Option<SignedReceipt>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
+pub struct TapReceipt(pub SignedReceipt);
 
 lazy_static! {
     static ref TAP_RECEIPT: HeaderName = HeaderName::from_static("tap-receipt");
@@ -42,14 +26,12 @@ impl Header for TapReceipt {
     {
         let mut execute = || {
             let value = values.next();
-            let raw_receipt = value
-                .map(|value| value.to_str())
-                .transpose()
-                .map_err(|_| headers::Error::invalid())?;
-            let parsed_receipt = raw_receipt
-                .map(serde_json::from_str)
-                .transpose()
+            let raw_receipt = value.ok_or(headers::Error::invalid())?;
+            let raw_receipt = raw_receipt
+                .to_str()
                 .map_err(|_| headers::Error::invalid())?;
+            let parsed_receipt =
+                serde_json::from_str(raw_receipt).map_err(|_| headers::Error::invalid())?;
             Ok(TapReceipt(parsed_receipt))
         };
         execute().inspect_err(|_| TAP_RECEIPT_INVALID.inc())
@@ -86,7 +68,7 @@ mod test {
         let decoded_receipt = TapReceipt::decode(&mut header_values.into_iter())
             .expect("tap receipt header value should be valid");
 
-        assert_eq!(decoded_receipt, TapReceipt(Some(original_receipt.clone())));
+        assert_eq!(decoded_receipt, TapReceipt(original_receipt));
     }
 
     #[test]