WIP: Update vdr-tools dependency

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

Hide file tree

Showing 46 changed files with 89 additions and 89 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-sys = { 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_sys::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_sys::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_sys::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_sys::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 vdrtools_sys;
 #[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_sys::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_sys::{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
@@ -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/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/lib.rs b/aries_vcx/src/lib.rs
@@ -7,7 +7,7 @@ extern crate base64;
 extern crate chrono;
 extern crate failure;
 extern crate futures;
-pub extern crate indy_sys;
+pub extern crate vdrtools_sys;
 pub extern crate indyrs as indy;
 #[macro_use]
 extern crate lazy_static;

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;

diff --git a/aries_vcx/src/libindy/utils/error_codes.rs b/aries_vcx/src/libindy/utils/error_codes.rs
@@ -1,6 +1,6 @@
 extern crate num_traits;
 
-use indy::IndyError;
+use vdrtools::IndyError;
 
 use crate::error::prelude::{VcxError, VcxErrorKind};
 use crate::utils::error;
@@ -70,7 +70,7 @@ pub fn map_indy_error_code<C: PrimInt>(error_code: C) -> u32 {
 #[cfg(test)]
 #[cfg(feature = "general_test")]
 pub mod unit_tests {
-    use indy::ErrorCode;
+    use vdrtools::ErrorCode;
 
     use crate::utils::devsetup::SetupDefaults;
 

diff --git a/aries_vcx/src/libindy/utils/logger.rs b/aries_vcx/src/libindy/utils/logger.rs
@@ -1,6 +1,6 @@
 extern crate log;
 
-use indy::logger;
+use vdrtools::logger;
 
 use crate::error::prelude::*;
 

diff --git a/aries_vcx/src/libindy/utils/mod.rs b/aries_vcx/src/libindy/utils/mod.rs
@@ -1,7 +1,7 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Mutex;
 
-use indy_sys::CommandHandle;
+use vdrtools_sys::CommandHandle;
 
 use crate::global::settings;
 
@@ -47,7 +47,7 @@ impl LibindyMock {
 // TODO:  move to devsetup, see if we can reuse this / merge with different setup
 #[cfg(feature = "test_utils")]
 pub mod test_setup {
-    use indy;
+    use vdrtools;
 
     pub const TRUSTEE_SEED: &'static str = "000000000000000000000000Trustee1";
     pub const WALLET_CREDENTIALS: &'static str =

diff --git a/aries_vcx/src/libindy/utils/wallet.rs b/aries_vcx/src/libindy/utils/wallet.rs
@@ -1,5 +1,5 @@
-use indy::{wallet, ErrorCode};
-use indy::{SearchHandle, WalletHandle};
+use vdrtools::{wallet, ErrorCode};
+use vdrtools::{SearchHandle, WalletHandle};
 
 use crate::error::prelude::*;
 use crate::global::settings;

diff --git a/aries_vcx/src/messages/connection/response.rs b/aries_vcx/src/messages/connection/response.rs
@@ -1,5 +1,5 @@
 use base64;
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 use time;
 
 use crate::did_doc::DidDoc;

diff --git a/aries_vcx/src/protocols/connection/invitee/state_machine.rs b/aries_vcx/src/protocols/connection/invitee/state_machine.rs
@@ -430,7 +430,7 @@ pub mod unit_tests {
     }
 
     pub mod invitee {
-        use indy_sys::WalletHandle;
+        use vdrtools_sys::WalletHandle;
 
         use crate::did_doc::test_utils::_service_endpoint;
         use crate::messages::connection::response::{Response, SignedResponse};

diff --git a/aries_vcx/src/protocols/connection/inviter/state_machine.rs b/aries_vcx/src/protocols/connection/inviter/state_machine.rs
@@ -2,7 +2,7 @@ use std::clone::Clone;
 use std::collections::HashMap;
 use std::future::Future;
 
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 
 use crate::did_doc::DidDoc;
 use crate::error::prelude::*;

diff --git a/aries_vcx/src/protocols/connection/pairwise_info.rs b/aries_vcx/src/protocols/connection/pairwise_info.rs
@@ -1,4 +1,4 @@
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 
 use crate::error::VcxResult;
 use crate::libindy::utils::signus::create_and_store_my_did;

diff --git a/aries_vcx/src/utils/encryption_envelope.rs b/aries_vcx/src/utils/encryption_envelope.rs
@@ -1,5 +1,5 @@
-use indy::future::TryFutureExt;
-use indy_sys::WalletHandle;
+use vdrtools::future::TryFutureExt;
+use vdrtools_sys::WalletHandle;
 
 use agency_client::testing::mocking::AgencyMockDecrypted;
 

diff --git a/aries_vcx/src/utils/mod.rs b/aries_vcx/src/utils/mod.rs
@@ -1,4 +1,4 @@
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 use std::env;
 use std::path::PathBuf;
 

diff --git a/aries_vcx/src/utils/provision.rs b/aries_vcx/src/utils/provision.rs
@@ -1,4 +1,4 @@
-use indy_sys::WalletHandle;
+use vdrtools_sys::WalletHandle;
 
 use agency_client::agency_client::AgencyClient;
 use agency_client::configuration::{AgencyClientConfig, AgentProvisionConfig};

diff --git a/aries_vcx/src/utils/test_logger.rs b/aries_vcx/src/utils/test_logger.rs
@@ -1,7 +1,7 @@
 #[cfg(target_os = "android")]
 extern crate android_logger;
 extern crate env_logger;
-extern crate indy_sys;
+extern crate vdrtools_sys;
 extern crate log;
 
 use std::env;

diff --git a/aries_vcx/tests/test_agency.rs b/aries_vcx/tests/test_agency.rs
@@ -15,7 +15,7 @@ mod integration_tests {
     use std::thread;
     use std::time::Duration;
 
-    use indyrs::wallet::close_wallet;
+    use vdrtools::wallet::close_wallet;
 
     use agency_client::agency_client::AgencyClient;
     use agency_client::api::downloaded_message::DownloadedMessage;

diff --git a/aries_vcx/tests/test_pool.rs b/aries_vcx/tests/test_pool.rs
@@ -23,7 +23,7 @@ mod integration_tests {
     use aries_vcx::messages::connection::did::Did;
     use aries_vcx::utils::constants::{DEFAULT_SCHEMA_ATTRS, SCHEMA_DATA};
     use aries_vcx::utils::devsetup::SetupWalletPool;
-    use indyrs::ledger::append_request_endorser;
+    use vdrtools::ledger::append_request_endorser;
     use std::thread;
     use std::time::Duration;
 

diff --git a/ci/alpine_core.dockerfile b/ci/alpine_core.dockerfile
@@ -4,8 +4,8 @@ ARG UID=1000
 ARG GID=1000
 
 ARG INDYSDK_PATH=/home/indy/vdr-tools
-ARG INDYSDK_REPO=https://gitlab.com/PatrikStas/vdr-tools.git
-ARG INDYSDK_REVISION=b5fd711a
+ARG INDYSDK_REPO=https://gitlab.com/mirgee/vdr-tools.git
+ARG INDYSDK_REVISION=c1390f91
 
 ENV RUST_LOG=warning
 

diff --git a/libvcx/src/api_lib/api_c/agent.rs b/libvcx/src/api_lib/api_c/agent.rs
@@ -4,7 +4,7 @@ use futures::future::BoxFuture;
 use libc::c_char;
 
 use aries_vcx::error::{VcxError, VcxErrorKind};
-use aries_vcx::indy_sys::CommandHandle;
+use aries_vcx::vdrtools_sys::CommandHandle;
 use aries_vcx::utils::error;
 
 use crate::api_lib::api_handle::agent;

diff --git a/libvcx/src/api_lib/api_c/connection.rs b/libvcx/src/api_lib/api_c/connection.rs
@@ -4,7 +4,7 @@ use futures::future::BoxFuture;
 use libc::c_char;
 
 use aries_vcx::error::{VcxError, VcxErrorKind};
-use aries_vcx::indy_sys::CommandHandle;
+use aries_vcx::vdrtools_sys::CommandHandle;
 use aries_vcx::libindy;
 use aries_vcx::utils::error;