fix: oneshot receive error

reown-com · May 7, 2024 · d80298c · d80298c
1 parent 1a2d904
commit d80298c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 45 deletions.
diff --git a/src/services/public_http_server/handlers/relay_webhook/error.rs b/src/services/public_http_server/handlers/relay_webhook/error.rs
@@ -121,9 +121,6 @@ pub enum RelayMessageServerError {
 
     #[error("Error sending sdk info via oneshot channel")]
     SdkOneshotSend,
-
-    #[error("Error receiving sdk info via oneshot channel")]
-    SdkOneshotReceive,
 }
 
 #[derive(Debug, thiserror::Error)]

diff --git a/src/services/public_http_server/handlers/relay_webhook/handlers/notify_delete.rs b/src/services/public_http_server/handlers/relay_webhook/handlers/notify_delete.rs
@@ -268,13 +268,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
         ),
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let msg = Arc::from(msg);
 

diff --git a/src/services/public_http_server/handlers/relay_webhook/handlers/notify_get_notifications.rs b/src/services/public_http_server/handlers/relay_webhook/handlers/notify_get_notifications.rs
@@ -234,13 +234,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
             .map_err(RelayMessageServerError::JsonRpcResponseErrorSerialization)?,
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let envelope = Envelope::<EnvelopeType0>::new(&sym_key, response)
         .map_err(RelayMessageServerError::EnvelopeEncryption)?;

diff --git a/...s/public_http_server/handlers/relay_webhook/handlers/notify_mark_notifications_as_read.rs b/...s/public_http_server/handlers/relay_webhook/handlers/notify_mark_notifications_as_read.rs
@@ -221,13 +221,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
             .map_err(RelayMessageServerError::JsonRpcResponseErrorSerialization)?,
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let envelope = Envelope::<EnvelopeType0>::new(&sym_key, response)
         .map_err(RelayMessageServerError::EnvelopeEncryption)?;

diff --git a/src/services/public_http_server/handlers/relay_webhook/handlers/notify_subscribe.rs b/src/services/public_http_server/handlers/relay_webhook/handlers/notify_subscribe.rs
@@ -357,13 +357,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
         ),
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let msg = Arc::new(msg);
 

diff --git a/src/services/public_http_server/handlers/relay_webhook/handlers/notify_update.rs b/src/services/public_http_server/handlers/relay_webhook/handlers/notify_update.rs
@@ -263,13 +263,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
         ),
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let msg = Arc::new(msg);
 

diff --git a/...services/public_http_server/handlers/relay_webhook/handlers/notify_watch_subscriptions.rs b/...services/public_http_server/handlers/relay_webhook/handlers/notify_watch_subscriptions.rs
@@ -225,13 +225,7 @@ pub async fn handle(msg: RelayIncomingMessage, state: &AppState) -> Result<(), R
             .map_err(RelayMessageServerError::JsonRpcResponseErrorSerialization)?,
     };
 
-    let sdk = match sdk_rx.try_recv() {
-        Ok(sdk) => sdk,
-        Err(oneshot::error::TryRecvError::Empty) => None,
-        Err(oneshot::error::TryRecvError::Closed) => {
-            Err(RelayMessageServerError::SdkOneshotReceive)?
-        }
-    };
+    let sdk = sdk_rx.try_recv().unwrap_or(None);
 
     let envelope = Envelope::<EnvelopeType0>::new(&response_sym_key, response)
         .map_err(RelayMessageServerError::EnvelopeEncryption)?;