From c44c8abb2c6400f3702d8f5ea7af3dac180d4516 Mon Sep 17 00:00:00 2001
From: Dakota Brink <779390+codabrink@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:45:52 -0400
Subject: [PATCH] should not be unwrapping here (#1125)

---
 xmtp_id/src/scw_verifier/mod.rs                       | 2 ++
 xmtp_id/src/scw_verifier/remote_signature_verifier.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xmtp_id/src/scw_verifier/mod.rs b/xmtp_id/src/scw_verifier/mod.rs
index 70ed30e5e..9d69eb84d 100644
--- a/xmtp_id/src/scw_verifier/mod.rs
+++ b/xmtp_id/src/scw_verifier/mod.rs
@@ -29,6 +29,8 @@ pub enum VerifierError {
     Abi(#[from] ethers::abi::Error),
     #[error(transparent)]
     Provider(#[from] ethers::providers::ProviderError),
+    #[error(transparent)]
+    Tonic(tonic::Status),
 }
 
 #[async_trait]
diff --git a/xmtp_id/src/scw_verifier/remote_signature_verifier.rs b/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
index 3200f559a..d1902222c 100644
--- a/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
+++ b/xmtp_id/src/scw_verifier/remote_signature_verifier.rs
@@ -48,7 +48,7 @@ impl SmartContractSignatureVerifier for RemoteSignatureVerifier {
                 }],
             })
             .await
-            .unwrap();
+            .map_err(VerifierError::Tonic)?;
 
         let VerifySmartContractWalletSignaturesResponse { responses } = result.into_inner();