Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openwallet-foundation/vcx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b8242f002f54210d8ec0a978ff8b1f1c728198a6
Choose a base ref
..
head repository: openwallet-foundation/vcx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1ff537b572f6ac70d7eed3d481dcc5ad7fd277c
Choose a head ref
4 changes: 2 additions & 2 deletions aries_vcx/src/protocols/issuance/holder/state_machine.rs
View file
Original file line number Diff line number Diff line change
@@ -14,16 +14,16 @@ use messages::msg_fields::protocols::cred_issuance::propose_credential::ProposeC
use messages::msg_fields::protocols::cred_issuance::request_credential::{
RequestCredential, RequestCredentialContent, RequestCredentialDecorators,
};
use messages::msg_fields::protocols::cred_issuance::CredentialIssuance;
use messages::msg_fields::protocols::notification::ack::{AckDecorators, AckStatus};
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, 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;
12 changes: 6 additions & 6 deletions aries_vcx/src/protocols/issuance/issuer/state_machine.rs
View file
Original file line number Diff line number Diff line change
@@ -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, AttachmentId, OfferInfo, Status, verify_thread_id};
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;
@@ -19,8 +22,8 @@ use messages::msg_fields::protocols::cred_issuance::propose_credential::ProposeC
use messages::msg_fields::protocols::cred_issuance::request_credential::RequestCredential;
use messages::msg_fields::protocols::cred_issuance::{CredentialIssuance, CredentialPreview};
use messages::msg_fields::protocols::report_problem::ProblemReport;
use uuid::Uuid;
use messages::AriesMessage;
use uuid::Uuid;

use crate::common::credentials::encoding::encode_attributes;
use crate::common::credentials::is_cred_revoked;
@@ -458,10 +461,7 @@ impl IssuerSM {
}

pub fn receive_problem_report(self, problem_report: ProblemReport) -> VcxResult<Self> {
verify_thread_id(
&self.thread_id,
&AriesMessage::ReportProblem(problem_report.clone()),
)?;
verify_thread_id(&self.thread_id, &AriesMessage::ReportProblem(problem_report.clone()))?;
let state = match self.state {
IssuerFullState::OfferSent(state_data) => IssuerFullState::Finished((state_data, problem_report).into()),
IssuerFullState::CredentialSent(state_data) => IssuerFullState::Finished((state_data).into()),
11 changes: 5 additions & 6 deletions aries_vcx/src/protocols/proof_presentation/verifier/state_machine.rs
View file
Original file line number Diff line number Diff line change
@@ -16,14 +16,16 @@ use messages::msg_fields::protocols::present_proof::problem_report::{
use messages::msg_fields::protocols::present_proof::request::{
RequestPresentation, RequestPresentationContent, RequestPresentationDecorators,
};
use messages::msg_fields::protocols::present_proof::{present::Presentation, PresentProof, propose::ProposePresentation};
use messages::msg_fields::protocols::present_proof::{
present::Presentation, propose::ProposePresentation, PresentProof,
};
use messages::msg_fields::protocols::report_problem::ProblemReport;
use messages::msg_parts::MsgParts;
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;
@@ -170,10 +172,7 @@ impl VerifierSM {
}

pub fn receive_presentation_request_reject(self, problem_report: ProblemReport) -> VcxResult<Self> {
verify_thread_id(
&self.thread_id,
&AriesMessage::ReportProblem(problem_report.clone()),
)?;
verify_thread_id(&self.thread_id, &AriesMessage::ReportProblem(problem_report.clone()))?;
let state = match self.state {
VerifierFullState::PresentationRequestSent(state) => {
VerifierFullState::Finished((state, problem_report).into())