refactor: allow any display error on verify signer

Signed-off-by: Gustavo Inacio <[email protected]>
semiotic-ai · Mar 8, 2024 · e1b7824 · e1b7824
1 parent 3d14126
commit e1b7824
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/tap_core/src/error.rs b/tap_core/src/error.rs
@@ -58,6 +58,9 @@ pub enum Error {
 
     #[error("Receipt error: {0}")]
     ReceiptError(#[from] ReceiptError),
+
+    #[error("Failed to check the signer: {0}")]
+    FailedToVerifySigner(String),
 }
 
 pub type Result<T> = StdResult<T, Error>;
diff --git a/tap_core/src/tap_manager/manager.rs b/tap_core/src/tap_manager/manager.rs
@@ -67,15 +67,16 @@ where
     ///
     /// Returns [`Error::AdapterError`] if there are any errors while storing RAV
     ///
-    pub async fn verify_and_store_rav<F, Fut>(
+    pub async fn verify_and_store_rav<F, Fut, Err>(
         &self,
         expected_rav: ReceiptAggregateVoucher,
         signed_rav: SignedRAV,
         verify_signer: F,
     ) -> std::result::Result<(), Error>
     where
         F: FnOnce(Address) -> Fut,
-        Fut: Future<Output = Result<bool, Error>>,
+        Fut: Future<Output = Result<bool, Err>>,
+        Err: std::fmt::Display,
     {
         self.receipt_auditor
             .check_rav_signature(&signed_rav, verify_signer)

diff --git a/tap_core/src/tap_manager/test/manager_test.rs b/tap_core/src/tap_manager/test/manager_test.rs
@@ -192,7 +192,7 @@ async fn manager_create_rav_request_all_valid_receipts(
         .verify_and_store_rav(
             rav_request.expected_rav,
             signed_rav,
-            |address: Address| async move { Ok(keys.1 == address) }
+            |address: Address| async move { Ok::<bool, String>(keys.1 == address) }
         )
         .await
         .is_ok());
@@ -263,7 +263,7 @@ async fn manager_create_multiple_rav_requests_all_valid_receipts(
         .verify_and_store_rav(
             rav_request.expected_rav,
             signed_rav,
-            |address: Address| async move { Ok(keys.1 == address) }
+            |address: Address| async move { Ok::<bool, String>(keys.1 == address) }
         )
         .await
         .is_ok());
@@ -313,7 +313,7 @@ async fn manager_create_multiple_rav_requests_all_valid_receipts(
         .verify_and_store_rav(
             rav_request.expected_rav,
             signed_rav,
-            |address: Address| async move { Ok(keys.1 == address) }
+            |address: Address| async move { Ok::<bool, String>(keys.1 == address) }
         )
         .await
         .is_ok());
@@ -394,7 +394,7 @@ async fn manager_create_multiple_rav_requests_all_valid_receipts_consecutive_tim
         .verify_and_store_rav(
             rav_request_1.expected_rav,
             signed_rav_1,
-            |address: Address| async move { Ok(keys.1 == address) }
+            |address: Address| async move { Ok::<bool, String>(keys.1 == address) }
         )
         .await
         .is_ok());
@@ -459,7 +459,7 @@ async fn manager_create_multiple_rav_requests_all_valid_receipts_consecutive_tim
         .verify_and_store_rav(
             rav_request_2.expected_rav,
             signed_rav_2,
-            |address: Address| async move { Ok(keys.1 == address) }
+            |address: Address| async move { Ok::<bool, String>(keys.1 == address) }
         )
         .await
         .is_ok());

diff --git a/tap_core/src/tap_receipt/receipt_auditor.rs b/tap_core/src/tap_receipt/receipt_auditor.rs
@@ -27,17 +27,21 @@ impl<E> ReceiptAuditor<E> {
         }
     }
 
-    pub async fn check_rav_signature<F, Fut>(
+    pub async fn check_rav_signature<F, Fut, Err>(
         &self,
         signed_rav: &SignedRAV,
         verify_signer: F,
     ) -> Result<(), Error>
     where
         F: FnOnce(Address) -> Fut,
-        Fut: Future<Output = Result<bool, Error>>,
+        Fut: Future<Output = Result<bool, Err>>,
+        Err: std::fmt::Display,
     {
         let recovered_address = signed_rav.recover_signer(&self.domain_separator)?;
-        if verify_signer(recovered_address).await? {
+        if verify_signer(recovered_address)
+            .await
+            .map_err(|e| Error::FailedToVerifySigner(e.to_string()))?
+        {
             Ok(())
         } else {
             Err(Error::InvalidRecoveredSigner {
@@ -61,6 +65,7 @@ where
             .map_err(|err| ReceiptError::InvalidSignature {
                 source_error_message: err.to_string(),
             })?;
+
         if self
             .executor
             .subtract_escrow(receipt_signer_address, signed_receipt.message.value)

diff --git a/tap_integration_tests/tests/indexer_mock/mod.rs b/tap_integration_tests/tests/indexer_mock/mod.rs
@@ -211,7 +211,7 @@ where
         .verify_and_store_rav(
             rav_request.expected_rav,
             remote_rav_result.data,
-            |address| async move { Ok(address == expected_sender_id) },
+            |address| async move { Ok::<bool, String>(address == expected_sender_id) },
         )
         .await?;