From 162acb656817df223e54bc7ee9caee09b31867b2 Mon Sep 17 00:00:00 2001 From: Bogdan Mircea Date: Wed, 22 Mar 2023 17:57:54 +0200 Subject: [PATCH] Rebased from main Signed-off-by: Bogdan Mircea --- Cargo.lock | 10 +++++----- agents/rust/aries-vcx-agent/src/services/verifier.rs | 5 ----- aries_vcx/src/handlers/proof_presentation/verifier.rs | 3 --- libvcx/src/api_c/cutils/return_types_u32.rs | 2 -- libvcx/src/api_c/protocols/mediated_connection.rs | 1 - libvcx/src/api_c/utils.rs | 4 ---- libvcx/src/api_c/vcx.rs | 3 --- libvcx/src/api_c/wallet.rs | 3 --- wrappers/vcx-napi-rs/src/api/agent.rs | 2 -- wrappers/vcx-napi-rs/src/api/credential_definition.rs | 1 - wrappers/vcx-napi-rs/src/api/ledger.rs | 1 - wrappers/vcx-napi-rs/src/api/schema.rs | 1 - 12 files changed, 5 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c4b5ce74a..a94622227a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2612,7 +2612,7 @@ dependencies = [ [[package]] name = "messages2" -version = "0.51.1" +version = "0.53.0" dependencies = [ "chrono", "derive_more", @@ -3149,9 +3149,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -3164,9 +3164,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] diff --git a/agents/rust/aries-vcx-agent/src/services/verifier.rs b/agents/rust/aries-vcx-agent/src/services/verifier.rs index 416237dc80..3b55bd9d7a 100644 --- a/agents/rust/aries-vcx-agent/src/services/verifier.rs +++ b/agents/rust/aries-vcx-agent/src/services/verifier.rs @@ -16,11 +16,6 @@ use aries_vcx::protocols::proof_presentation::verifier::verification_status::Pre use aries_vcx::protocols::SendClosure; use super::connection::ServiceConnections; -use crate::{ - error::*, - http_client::HttpClient, - storage::{object_cache::ObjectCache, Storage}, -}; #[derive(Clone)] struct VerifierWrapper { diff --git a/aries_vcx/src/handlers/proof_presentation/verifier.rs b/aries_vcx/src/handlers/proof_presentation/verifier.rs index bc0344c10f..7405c587ca 100644 --- a/aries_vcx/src/handlers/proof_presentation/verifier.rs +++ b/aries_vcx/src/handlers/proof_presentation/verifier.rs @@ -18,9 +18,6 @@ use crate::protocols::proof_presentation::verifier::messages::VerifierMessages; use crate::protocols::proof_presentation::verifier::state_machine::{VerifierSM, VerifierState}; use crate::protocols::proof_presentation::verifier::verification_status::PresentationVerificationStatus; use crate::protocols::SendClosure; -use messages::a2a::A2AMessage; -use messages::protocols::proof_presentation::presentation_proposal::PresentationProposal; -use messages::protocols::proof_presentation::presentation_request::PresentationRequest; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)] pub struct Verifier { diff --git a/libvcx/src/api_c/cutils/return_types_u32.rs b/libvcx/src/api_c/cutils/return_types_u32.rs index b9946bb84c..79f1f73801 100644 --- a/libvcx/src/api_c/cutils/return_types_u32.rs +++ b/libvcx/src/api_c/cutils/return_types_u32.rs @@ -12,8 +12,6 @@ use std::{ use aries_vcx::{indy::utils::next_command_handle, vdrtools::CommandHandle}; use libc::c_char; -use aries_vcx::indy::utils::next_command_handle; -use aries_vcx::vdrtools::CommandHandle; use libvcx_core::errors; use libvcx_core::errors::error::TIMEOUT_LIBINDY_ERROR; use libvcx_core::errors::mapping_ffi_tests::map_indy_error; diff --git a/libvcx/src/api_c/protocols/mediated_connection.rs b/libvcx/src/api_c/protocols/mediated_connection.rs index 695745b5dd..6ad8209782 100644 --- a/libvcx/src/api_c/protocols/mediated_connection.rs +++ b/libvcx/src/api_c/protocols/mediated_connection.rs @@ -4,7 +4,6 @@ use aries_vcx::protocols::mediated_connection::pairwise_info::PairwiseInfo; use futures::future::BoxFuture; use libc::c_char; -use aries_vcx::protocols::mediated_connection::pairwise_info::PairwiseInfo; use libvcx_core::api_vcx::api_handle::mediated_connection; use libvcx_core::api_vcx::api_handle::mediated_connection::*; use libvcx_core::errors; diff --git a/libvcx/src/api_c/utils.rs b/libvcx/src/api_c/utils.rs index b1bda72d75..8dd9b1b912 100644 --- a/libvcx/src/api_c/utils.rs +++ b/libvcx/src/api_c/utils.rs @@ -11,10 +11,6 @@ use futures::future::{BoxFuture, FutureExt}; use libc::c_char; use serde_json; -use aries_vcx::agency_client::configuration::AgentProvisionConfig; -use aries_vcx::agency_client::messages::update_message::UIDsByConn; -use aries_vcx::agency_client::testing::mocking::AgencyMock; -use aries_vcx::agency_client::MessageStatusCode; use aries_vcx::utils::constants::*; use libvcx_core::api_vcx::api_global::agency_client::agency_update_messages; use libvcx_core::api_vcx::api_global::agency_client::provision_cloud_agent; diff --git a/libvcx/src/api_c/vcx.rs b/libvcx/src/api_c/vcx.rs index 6615ff7dca..24fab6d3f1 100644 --- a/libvcx/src/api_c/vcx.rs +++ b/libvcx/src/api_c/vcx.rs @@ -7,9 +7,6 @@ use aries_vcx::{ use futures::future::{BoxFuture, FutureExt}; use libc::c_char; -use aries_vcx::agency_client::configuration::AgencyClientConfig; -use aries_vcx::indy::ledger::pool::PoolConfig; -use aries_vcx::indy::wallet::IssuerConfig; use libvcx_core::api_vcx::api_global::agency_client::create_agency_client_for_main_wallet; use libvcx_core::api_vcx::api_global::agency_client::update_webhook_url; use libvcx_core::api_vcx::api_global::ledger::{ledger_get_txn_author_agreement, ledger_set_txn_author_agreement}; diff --git a/libvcx/src/api_c/wallet.rs b/libvcx/src/api_c/wallet.rs index 97e161a4c5..2feb1f87fc 100644 --- a/libvcx/src/api_c/wallet.rs +++ b/libvcx/src/api_c/wallet.rs @@ -7,9 +7,6 @@ use aries_vcx::{ use futures::future::BoxFuture; use libc::c_char; -use aries_vcx::indy::wallet::{RestoreWalletConfigs, WalletConfig}; -use aries_vcx::vdrtools::{CommandHandle, SearchHandle, WalletHandle}; - use libvcx_core; use libvcx_core::errors; use libvcx_core::errors::error::{LibvcxError, LibvcxErrorKind}; diff --git a/wrappers/vcx-napi-rs/src/api/agent.rs b/wrappers/vcx-napi-rs/src/api/agent.rs index e383c7c357..13c2aed522 100644 --- a/wrappers/vcx-napi-rs/src/api/agent.rs +++ b/wrappers/vcx-napi-rs/src/api/agent.rs @@ -2,8 +2,6 @@ use crate::error::to_napi_err; use libvcx_core::api_vcx::api_handle::mediated_connection; use napi_derive::napi; -use crate::error::to_napi_err; - #[napi] pub fn generate_public_invitation(public_did: String, label: String) -> napi::Result { mediated_connection::generate_public_invitation(&public_did, &label).map_err(to_napi_err) diff --git a/wrappers/vcx-napi-rs/src/api/credential_definition.rs b/wrappers/vcx-napi-rs/src/api/credential_definition.rs index 75d886f6cd..59fc8e803a 100644 --- a/wrappers/vcx-napi-rs/src/api/credential_definition.rs +++ b/wrappers/vcx-napi-rs/src/api/credential_definition.rs @@ -1,5 +1,4 @@ use napi_derive::napi; -use vcx::api_vcx::api_handle::credential_def; use crate::error::to_napi_err; use libvcx_core::api_vcx::api_handle::credential_def; diff --git a/wrappers/vcx-napi-rs/src/api/ledger.rs b/wrappers/vcx-napi-rs/src/api/ledger.rs index 59b1576479..a7857330f2 100644 --- a/wrappers/vcx-napi-rs/src/api/ledger.rs +++ b/wrappers/vcx-napi-rs/src/api/ledger.rs @@ -1,5 +1,4 @@ use napi_derive::napi; -use vcx::{api_vcx::api_global::ledger, serde_json::json}; use libvcx_core::api_vcx::api_global::ledger; use libvcx_core::serde_json::json; diff --git a/wrappers/vcx-napi-rs/src/api/schema.rs b/wrappers/vcx-napi-rs/src/api/schema.rs index a3d8b9990b..28a0f2aca4 100644 --- a/wrappers/vcx-napi-rs/src/api/schema.rs +++ b/wrappers/vcx-napi-rs/src/api/schema.rs @@ -1,5 +1,4 @@ use napi_derive::napi; -use vcx::api_vcx::api_handle::schema; use crate::error::to_napi_err; use libvcx_core::api_vcx::api_handle::schema;