add thiserror crate to derive fmt::Display

Author: cosmicexplorer

Cargo.lock

@@ -63,7 +63,7 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "get_identity_key_pair",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -85,7 +85,7 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "get_local_registration_id",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -106,7 +106,9 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
             1 => Ok(true),
             r => Err(SignalProtocolError::ApplicationCallbackError(
                 "save_identity",
-                Box::new(CallbackError::check(r).expect("verified non-zero")),
+                CallbackErrorWrapper(Box::new(
+                    CallbackError::check(r).expect("verified non-zero"),
+                )),
             )),
         }
     }
@@ -136,7 +138,9 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
             1 => Ok(true),
             r => Err(SignalProtocolError::ApplicationCallbackError(
                 "is_trusted_identity",
-                Box::new(CallbackError::check(r).expect("verified non-zero")),
+                CallbackErrorWrapper(Box::new(
+                    CallbackError::check(r).expect("verified non-zero"),
+                )),
             )),
         }
     }
@@ -153,7 +157,7 @@ impl IdentityKeyStore for &FfiIdentityKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "get_identity",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -204,7 +208,7 @@ impl PreKeyStore for &FfiPreKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "load_pre_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -228,7 +232,7 @@ impl PreKeyStore for &FfiPreKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "store_pre_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -246,7 +250,7 @@ impl PreKeyStore for &FfiPreKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "remove_pre_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -289,7 +293,7 @@ impl SignedPreKeyStore for &FfiSignedPreKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "load_signed_pre_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -314,7 +318,7 @@ impl SignedPreKeyStore for &FfiSignedPreKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "store_signed_pre_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -357,7 +361,7 @@ impl SessionStore for &FfiSessionStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "load_session",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -382,7 +386,7 @@ impl SessionStore for &FfiSessionStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "store_session",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -434,7 +438,7 @@ impl SenderKeyStore for &FfiSenderKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "store_sender_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 
@@ -460,7 +464,7 @@ impl SenderKeyStore for &FfiSenderKeyStoreStruct {
         if let Some(error) = CallbackError::check(result) {
             return Err(SignalProtocolError::ApplicationCallbackError(
                 "load_sender_key",
-                Box::new(error),
+                CallbackErrorWrapper(Box::new(error)),
             ));
         }
 

rust/bridge/shared/src/ffi/storage.rs

@@ -83,7 +83,7 @@ fn throw_error(env: &JNIEnv, error: SignalJniError) {
     let error = match error {
         SignalJniError::Signal(SignalProtocolError::ApplicationCallbackError(
             callback,
-            exception,
+            CallbackErrorWrapper(exception),
         )) => {
             // The usual way to write this code would be to match on the result of Error::downcast.
             // However, the "failure" result, which is intended to return the original type back,
@@ -99,7 +99,8 @@ fn throw_error(env: &JNIEnv, error: SignalJniError) {
 
             // Fall through to generic handling below.
             SignalJniError::Signal(SignalProtocolError::ApplicationCallbackError(
-                callback, exception,
+                callback,
+                CallbackErrorWrapper(exception),
             ))
         }
 
@@ -366,7 +367,7 @@ pub fn call_method_checked<'a, O: Into<JObject<'a>>, R: TryFrom<JValue<'a>>>(
 
         Err(SignalProtocolError::ApplicationCallbackError(
             fn_name,
-            Box::new(ThrownException::new(env, throwable)?),
+            CallbackErrorWrapper(Box::new(ThrownException::new(env, throwable)?)),
         )
         .into())
     }

rust/bridge/shared/src/jni/mod.rs

@@ -174,5 +174,8 @@ impl std::error::Error for CallbackError {}
 
 /// Converts a JavaScript error message to a [`SignalProtocolError::ApplicationCallbackError`].
 pub fn js_error_to_rust(func: &'static str, err: String) -> SignalProtocolError {
-    SignalProtocolError::ApplicationCallbackError(func, Box::new(CallbackError::new(err)))
+    SignalProtocolError::ApplicationCallbackError(
+        func,
+        CallbackErrorWrapper(Box::new(CallbackError::new(err))),
+    )
 }

rust/bridge/shared/src/node/error.rs

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Signal Messenger, LLC.
+# Copyright (C) 2020-2021 Signal Messenger, LLC.
 # SPDX-License-Identifier: AGPL-3.0-only
 #
 
@@ -28,6 +28,7 @@ hex = "0.4"
 log = "0.4"
 num_enum = "0.5.1"
 uuid = "0.8"
+thiserror = "1.0.24"
 
 [dependencies.curve25519-dalek]
 features = ["serde", "alloc"]