WIP: Update vdr-tools dependency

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa>
hyperledger · Sep 16, 2022 · 7a9a5eb · 7a9a5eb
1 parent d16c703
commit 7a9a5eb
Show file tree

Hide file tree

Showing 86 changed files with 170 additions and 168 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agency_client/Cargo.toml b/agency_client/Cargo.toml
@@ -20,7 +20,7 @@ reqwest = "0.11.10"
 regex = "1.1.0"
 rmp-serde = "0.13.7"
 rust-base58 = "0.0.4"
-indy = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "cdb8d56ec5d77abc6b6dce9ca31cbd3fb469037d" }
+vdrtools = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "c1390f91bc152ef31a7ead73c1c3fe286cc9cc0c" }
 futures = "0.3.21"
 url = "1.5.1"
 failure = "0.1.6"

diff --git a/agency_client/src/agency_client.rs b/agency_client/src/agency_client.rs
@@ -1,4 +1,4 @@
-use indy::WalletHandle;
+use vdrtools::WalletHandle;
 use url::Url;
 
 use crate::configuration::AgencyClientConfig;

diff --git a/agency_client/src/api/downloaded_message.rs b/agency_client/src/api/downloaded_message.rs
@@ -1,7 +1,7 @@
 use crate::error::{AgencyClientError, AgencyClientErrorKind, AgencyClientResult};
 use crate::utils::encryption_envelope::EncryptionEnvelope;
 use crate::MessageStatusCode;
-use indy::WalletHandle;
+use vdrtools::WalletHandle;
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 #[serde(untagged)]

diff --git a/agency_client/src/api/onboarding.rs b/agency_client/src/api/onboarding.rs
@@ -7,7 +7,7 @@ use crate::messages::create_agent::{CreateAgent, CreateAgentResponse};
 use crate::messages::sign_up::{SignUp, SignUpResponse};
 use crate::testing::mocking::AgencyMockDecrypted;
 use crate::testing::test_constants;
-use indy::WalletHandle;
+use vdrtools::WalletHandle;
 
 impl AgencyClient {
     async fn _connect(

diff --git a/agency_client/src/error.rs b/agency_client/src/error.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
 use failure::{Backtrace, Context, Fail};
-use indy::IndyError;
+use vdrtools::IndyError;
 
 use crate::utils::error_utils::kind_to_error_message;
 

diff --git a/agency_client/src/lib.rs b/agency_client/src/lib.rs
@@ -2,7 +2,7 @@
 extern crate async_std;
 extern crate failure;
 extern crate futures;
-extern crate indyrs as indy;
+extern crate vdrtoolsrs as vdrtools;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]

diff --git a/agency_client/src/utils/encryption_envelope.rs b/agency_client/src/utils/encryption_envelope.rs
@@ -1,7 +1,7 @@
 use crate::error::{AgencyClientError, AgencyClientErrorKind, AgencyClientResult};
 use crate::testing::mocking::AgencyMockDecrypted;
 use crate::utils::libindy::crypto;
-use indy::WalletHandle;
+use vdrtools::WalletHandle;
 
 #[derive(Debug)]
 pub struct EncryptionEnvelope(pub Vec<u8>);

diff --git a/agency_client/src/utils/libindy/crypto.rs b/agency_client/src/utils/libindy/crypto.rs
@@ -1,4 +1,4 @@
-use indy::{crypto, WalletHandle};
+use vdrtools::{crypto, WalletHandle};
 
 use crate::error::AgencyClientResult;
 use crate::testing::mocking::agency_mocks_enabled;

diff --git a/aries_vcx/Cargo.toml b/aries_vcx/Cargo.toml
@@ -39,8 +39,8 @@ rmp-serde = "0.13.7"
 base64 = "0.8.0"
 openssl = { version = "0.10.35", features = ["vendored"] }
 num-traits = "0.2.0"
-indy = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "cdb8d56ec5d77abc6b6dce9ca31cbd3fb469037d" }
-indy-sys = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "cdb8d56ec5d77abc6b6dce9ca31cbd3fb469037d" }
+vdrtools = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "c1390f91bc152ef31a7ead73c1c3fe286cc9cc0c" }
+vdrtools-sys = { git = "https://gitlab.com/mirgee/vdr-tools.git", rev = "c1390f91bc152ef31a7ead73c1c3fe286cc9cc0c" }
 futures = "0.3.15"
 libloading = "0.5.0"
 uuid = {version = "0.8", default-features = false, features = ["v4"]}

diff --git a/aries_vcx/src/handlers/connection/cloud_agent.rs b/aries_vcx/src/handlers/connection/cloud_agent.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 
 use agency_client::agency_client::AgencyClient;
 use agency_client::api::downloaded_message::DownloadedMessageEncrypted;

diff --git a/aries_vcx/src/handlers/connection/connection.rs b/aries_vcx/src/handlers/connection/connection.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use futures::future::BoxFuture;
 use futures::stream::StreamExt;
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 use serde::de::{Error, MapAccess, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
@@ -997,7 +997,7 @@ impl From<(SmConnectionState, PairwiseInfo, CloudAgentInfo, String, String)> for
 #[cfg(test)]
 #[cfg(feature = "general_test")]
 mod tests {
-    use indy_sys::WalletHandle;
+    use vdrtools_sys::WalletHandle;
 
     use agency_client::testing::mocking::enable_agency_mocks;
 

diff --git a/aries_vcx/src/handlers/connection/public_agent.rs b/aries_vcx/src/handlers/connection/public_agent.rs
@@ -1,6 +1,6 @@
 use futures::stream::iter;
 use futures::StreamExt;
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use agency_client::agency_client::AgencyClient;
 

diff --git a/aries_vcx/src/handlers/discovery/mod.rs b/aries_vcx/src/handlers/discovery/mod.rs
@@ -1,4 +1,4 @@
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 
 use crate::did_doc::DidDoc;
 use crate::error::VcxResult;

diff --git a/aries_vcx/src/handlers/issuance/holder.rs b/aries_vcx/src/handlers/issuance/holder.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use agency_client::agency_client::AgencyClient;
 
@@ -182,7 +182,7 @@ impl Holder {
 
 #[cfg(feature = "test_utils")]
 pub mod test_utils {
-    use indy_sys::PoolHandle;
+    use vdrtools_sys::PoolHandle;
 
     use agency_client::agency_client::AgencyClient;
 

diff --git a/aries_vcx/src/handlers/issuance/issuer.rs b/aries_vcx/src/handlers/issuance/issuer.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use agency_client::agency_client::AgencyClient;
 
@@ -225,7 +225,7 @@ impl Issuer {
 #[cfg(feature = "test_utils")]
 pub mod test_utils {
     use agency_client::agency_client::AgencyClient;
-    use indy_sys::PoolHandle;
+    use vdrtools_sys::PoolHandle;
 
     use crate::error::prelude::*;
     use crate::handlers::connection::connection::Connection;

diff --git a/aries_vcx/src/handlers/out_of_band/receiver.rs b/aries_vcx/src/handlers/out_of_band/receiver.rs
@@ -1,5 +1,5 @@
 use std::clone::Clone;
-use indy_sys::PoolHandle;
+use vdrtools_sys::PoolHandle;
 
 use agency_client::agency_client::AgencyClient;
 

diff --git a/aries_vcx/src/handlers/proof_presentation/prover.rs b/aries_vcx/src/handlers/proof_presentation/prover.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use agency_client::agency_client::AgencyClient;
 
@@ -248,7 +248,7 @@ impl Prover {
 
 #[cfg(feature = "test_utils")]
 pub mod test_utils {
-    use indy_sys::PoolHandle;
+    use vdrtools_sys::PoolHandle;
 
     use agency_client::agency_client::AgencyClient;
 

diff --git a/aries_vcx/src/handlers/proof_presentation/verifier.rs b/aries_vcx/src/handlers/proof_presentation/verifier.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use agency_client::agency_client::AgencyClient;
 

diff --git a/aries_vcx/src/lib.rs b/aries_vcx/src/lib.rs
@@ -7,8 +7,8 @@ extern crate base64;
 extern crate chrono;
 extern crate failure;
 extern crate futures;
-pub extern crate indy_sys;
-pub extern crate indyrs as indy;
+pub extern crate vdrtools_sys;
+pub extern crate vdrtoolsrs as vdrtools;
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;

diff --git a/aries_vcx/src/libindy/credential_def/mod.rs b/aries_vcx/src/libindy/credential_def/mod.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 use std::fmt;
 
 use crate::error::prelude::*;

diff --git a/aries_vcx/src/libindy/credential_def/revocation_registry.rs b/aries_vcx/src/libindy/credential_def/revocation_registry.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use crate::error::{VcxError, VcxErrorKind, VcxResult};
 use crate::libindy::credential_def::PublicEntityStateType;

diff --git a/aries_vcx/src/libindy/proofs/prover/prover.rs b/aries_vcx/src/libindy/proofs/prover/prover.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use crate::error::prelude::*;
 use crate::global::settings;

diff --git a/aries_vcx/src/libindy/proofs/prover/prover_internal.rs b/aries_vcx/src/libindy/proofs/prover/prover_internal.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 use serde_json::Value;
 
 use crate::error::prelude::*;
@@ -266,7 +266,7 @@ pub fn build_requested_credentials_json(
 #[cfg(feature = "pool_tests")]
 #[cfg(test)]
 pub mod pool_tests {
-    use indy_sys::PoolHandle;
+    use vdrtools_sys::PoolHandle;
 
     use crate::libindy::proofs::prover::prover_internal::{build_rev_states_json, CredInfoProver};
     use crate::utils::constants::{CRED_DEF_ID, CRED_REV_ID, LICENCE_CRED_ID, SCHEMA_ID, TAILS_DIR};

diff --git a/aries_vcx/src/libindy/proofs/verifier/verifier.rs b/aries_vcx/src/libindy/proofs/verifier/verifier.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use crate::error::prelude::*;
 use crate::libindy::proofs::verifier::verifier_internal::{

diff --git a/aries_vcx/src/libindy/proofs/verifier/verifier_internal.rs b/aries_vcx/src/libindy/proofs/verifier/verifier_internal.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 use serde_json;
 use serde_json::Value;
 

diff --git a/aries_vcx/src/libindy/schema/mod.rs b/aries_vcx/src/libindy/schema/mod.rs
@@ -1,4 +1,4 @@
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 
 use crate::error::prelude::*;
 use crate::libindy::credential_def::PublicEntityStateType;

diff --git a/aries_vcx/src/libindy/utils/anoncreds.rs b/aries_vcx/src/libindy/utils/anoncreds.rs
@@ -1,6 +1,6 @@
-use indy::future::TryFutureExt;
-use indy::{anoncreds, blob_storage, ledger};
-use indy_sys::{WalletHandle, PoolHandle};
+use vdrtools::future::TryFutureExt;
+use vdrtools::{anoncreds, blob_storage, ledger};
+use vdrtools_sys::{WalletHandle, PoolHandle};
 use serde_json;
 use serde_json::{map::Map, Value};
 use time;
@@ -1354,7 +1354,7 @@ pub mod test_utils {
 #[cfg(test)]
 #[cfg(feature = "general_test")]
 mod unit_tests {
-    use indy_sys::{WalletHandle, PoolHandle};
+    use vdrtools_sys::{WalletHandle, PoolHandle};
 
     use crate::libindy::utils::anoncreds::get_schema_json;
     use crate::utils::constants::{SCHEMA_ID, SCHEMA_JSON};

diff --git a/aries_vcx/src/libindy/utils/cache.rs b/aries_vcx/src/libindy/utils/cache.rs
@@ -1,4 +1,4 @@
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 use serde_json;
 
 use crate::error::{VcxError, VcxErrorKind, VcxResult};

diff --git a/aries_vcx/src/libindy/utils/crypto.rs b/aries_vcx/src/libindy/utils/crypto.rs
@@ -1,6 +1,6 @@
 /* test isn't ready until > libindy 1.0.1 */
-use indy::crypto;
-use indy_sys::WalletHandle;
+use vdrtools::crypto;
+use vdrtools_sys::WalletHandle;
 
 use crate::error::prelude::*;
 use crate::global::settings;