From 35775273ede7947fc2cf6f37e318b2e8f2dec014 Mon Sep 17 00:00:00 2001
From: Patrik Stas <patrik.stas@absa.africa>
Date: Sun, 20 Aug 2023 14:17:09 +0200
Subject: [PATCH] post-rebase conflict resolution

Signed-off-by: Patrik Stas <patrik.stas@absa.africa>
---
 aries_vcx/src/protocols/issuance/holder/state_machine.rs     | 5 +++--
 aries_vcx/src/protocols/issuance/issuer/state_machine.rs     | 5 ++++-
 .../protocols/proof_presentation/verifier/state_machine.rs   | 2 +-
 libvcx_core/src/api_vcx/api_handle/issuer_credential.rs      | 4 +---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/aries_vcx/src/protocols/issuance/holder/state_machine.rs b/aries_vcx/src/protocols/issuance/holder/state_machine.rs
index 21e9bc8dc9..e48fd2e07c 100644
--- a/aries_vcx/src/protocols/issuance/holder/state_machine.rs
+++ b/aries_vcx/src/protocols/issuance/holder/state_machine.rs
@@ -19,12 +19,13 @@ use messages::msg_fields::protocols::notification::ack::{AckDecorators, AckStatu
 use messages::msg_fields::protocols::report_problem::ProblemReport;
 use messages::AriesMessage;
 use uuid::Uuid;
-use messages::msg_fields::protocols::cred_issuance::CredentialIssuance;
 
 use crate::common::credentials::{get_cred_rev_id, is_cred_revoked};
 use crate::errors::error::prelude::*;
 use crate::global::settings;
-use crate::handlers::util::{get_attach_as_string, make_attach_from_str, verify_thread_id, AttachmentId, Status, verify_thread_id};
+use crate::handlers::util::{
+    get_attach_as_string, make_attach_from_str, verify_thread_id, AttachmentId, Status,
+};
 use crate::protocols::common::build_problem_report_msg;
 use crate::protocols::issuance::holder::states::finished::FinishedHolderState;
 use crate::protocols::issuance::holder::states::initial::InitialHolderState;
diff --git a/aries_vcx/src/protocols/issuance/issuer/state_machine.rs b/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
index 28c155a55c..ce855a90e2 100644
--- a/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
+++ b/aries_vcx/src/protocols/issuance/issuer/state_machine.rs
@@ -1,7 +1,10 @@
 use std::fmt::Display;
 use std::sync::Arc;
 
-use crate::handlers::util::{get_attach_as_string, make_attach_from_str, matches_opt_thread_id, verify_thread_id, AttachmentId, OfferInfo, Status};
+use crate::handlers::util::{
+    get_attach_as_string, make_attach_from_str, matches_opt_thread_id, verify_thread_id, AttachmentId, OfferInfo,
+    Status,
+};
 use aries_vcx_core::anoncreds::base_anoncreds::BaseAnonCreds;
 use aries_vcx_core::ledger::base_ledger::AnoncredsLedgerRead;
 use chrono::Utc;
diff --git a/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs b/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
index 92ebbd6a82..78b0a6da5c 100644
--- a/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
+++ b/aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
@@ -25,7 +25,7 @@ use messages::AriesMessage;
 
 use crate::common::proofs::proof_request::PresentationRequestData;
 use crate::errors::error::prelude::*;
-use crate::handlers::util::{make_attach_from_str, AttachmentId, Status, verify_thread_id};
+use crate::handlers::util::{make_attach_from_str, verify_thread_id, AttachmentId, Status};
 use crate::protocols::common::build_problem_report_msg;
 use crate::protocols::proof_presentation::verifier::states::finished::FinishedState;
 use crate::protocols::proof_presentation::verifier::states::initial::InitialVerifierState;
diff --git a/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs b/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
index 79b468ef3e..6541de8433 100644
--- a/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
+++ b/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
@@ -227,9 +227,7 @@ pub async fn send_credential_nonmediated(handle: u32, connection_handle: u32) ->
     let wallet = get_main_wallet()?;
     let send_message: SendClosure =
         Box::new(|msg: AriesMessage| Box::pin(async move { con.send_message(&wallet, &msg, &HttpClient).await }));
-    credential
-        .build_credential(&get_main_anoncreds()?)
-        .await?;
+    credential.build_credential(&get_main_anoncreds()?).await?;
     credential.send_credential(send_message).await;
     let state: u32 = credential.get_state().into();
     ISSUER_CREDENTIAL_MAP.insert(handle, credential)?;