Remove failure crate from libvcx

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa>
hyperledger · Dec 5, 2022 · 32956f7 · 32956f7
1 parent f1b5bb7
commit 32956f7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agency_client/src/error.rs b/agency_client/src/error.rs
@@ -106,10 +106,20 @@ impl AgencyClientError {
     {
         AgencyClientError {
             msg: msg.to_string(),
-            kind
+            kind,
+        }
+    }
+
+    pub fn find_root_cause(&self) -> String {
+        let mut current = self.source();
+        while let Some(cause) = current {
+            if cause.source().is_none() { return cause.to_string() }
+            current = cause.source();
         }
+        self.to_string()
     }
 
+
     pub fn kind(&self) -> AgencyClientErrorKind {
         self.kind
     }

diff --git a/aries_vcx/src/error.rs b/aries_vcx/src/error.rs
@@ -275,6 +275,15 @@ impl VcxError {
         }
     }
 
+    pub fn find_root_cause(&self) -> String {
+        let mut current = self.source();
+        while let Some(cause) = current {
+            if cause.source().is_none() { return cause.to_string() }
+            current = cause.source();
+        }
+        self.to_string()
+    }
+
     pub fn kind(&self) -> VcxErrorKind {
         self.kind
     }

diff --git a/aries_vcx/src/indy/signing.rs b/aries_vcx/src/indy/signing.rs
@@ -1,4 +1,4 @@
-use vdrtools::{Locator, KeyInfo};
+use vdrtools::Locator;
 
 use vdrtools::WalletHandle;
 
@@ -94,7 +94,10 @@ pub async fn unpack_message(wallet_handle: WalletHandle, msg: &[u8]) -> VcxResul
     Ok(res)
 }
 
+#[cfg(feature = "test_utils")]
 pub async fn create_key(wallet_handle: WalletHandle, seed: Option<&str>) -> VcxResult<String> {
+    use vdrtools::KeyInfo;
+
     let res = Locator::instance()
         .crypto_controller
         .create_key(
@@ -106,4 +109,4 @@ pub async fn create_key(wallet_handle: WalletHandle, seed: Option<&str>) -> VcxR
         ).await?;
 
     Ok(res)
-}
+}
diff --git a/libvcx/Cargo.toml b/libvcx/Cargo.toml
@@ -36,7 +36,6 @@ base64 = "0.10"
 futures = { version = "0.3", default-features = false }
 tokio = { version = "1.15.0", features = ["rt-multi-thread"] }
 uuid = {version = "0.7.1", default-features = false, features = ["v4"]}
-failure = "0.1.8"
 aries-vcx = { path = "../aries_vcx" }
 
 [target.'cfg(target_os = "android")'.dependencies]

diff --git a/libvcx/src/api_lib/utils/error.rs b/libvcx/src/api_lib/utils/error.rs
@@ -4,7 +4,6 @@ use std::ffi::CString;
 use std::ptr;
 
 use aries_vcx::agency_client::error::AgencyClientError;
-use failure::Fail;
 use libc::c_char;
 
 use crate::api_lib::utils::cstring::CStringUtils;
@@ -26,8 +25,9 @@ pub fn set_current_error_agency(err: &AgencyClientError) {
             let error_json = json!({
                 "error": err.kind().to_string(),
                 "message": err.to_string(),
-                "cause": <dyn Fail>::find_root_cause(err).to_string(),
-                "backtrace": err.backtrace().map(|bt| bt.to_string())
+                "cause": err.find_root_cause(),
+             // TODO: Put back once https://github.com/rust-lang/rust/issues/99301 is stabilized
+                // "backtrace": err.backtrace()
             })
             .to_string();
             error.replace(Some(CStringUtils::string_to_cstring(error_json)));
@@ -42,8 +42,9 @@ pub fn set_current_error_vcx(err: &VcxError) {
             let error_json = json!({
                 "error": err.kind().to_string(),
                 "message": err.to_string(),
-                "cause": <dyn Fail>::find_root_cause(err).to_string(),
-                "backtrace": err.backtrace().map(|bt| bt.to_string())
+                "cause": err.find_root_cause(),
+                // TODO: Put back once https://github.com/rust-lang/rust/issues/99301 is stabilized
+                // "backtrace": err.backtrace()
             })
             .to_string();
             error.replace(Some(CStringUtils::string_to_cstring(error_json)));