From 03cd4e5b47a947003e67a9abdcfdcade9fc2bb28 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 1 Jul 2021 22:55:22 +0200 Subject: [PATCH] Fix integration tests Signed-off-by: Miroslav Kovar --- Cargo.toml | 3 +++ libvcx/src/aries/mod.rs | 12 ++++++------ libvcx/src/lib.rs | 13 ++++++++----- libvcx/src/utils/devsetup_agent.rs | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 98e001514a..4ff72db781 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,6 @@ members = [ debug = true panic = 'unwind' incremental = false + +[profile.dev] +split-debuginfo = "unpacked" diff --git a/libvcx/src/aries/mod.rs b/libvcx/src/aries/mod.rs index 1306df9420..68fc727851 100644 --- a/libvcx/src/aries/mod.rs +++ b/libvcx/src/aries/mod.rs @@ -164,7 +164,7 @@ pub mod test { alice.credential_handle = credential_handle; credential::send_credential_request(alice.credential_handle, alice_connection_by_handle).unwrap(); - assert_eq!(2, credential::get_state(alice.credential_handle).unwrap()); + assert_eq!(1, credential::get_state(alice.credential_handle).unwrap()); } faber.send_credential(); @@ -183,11 +183,11 @@ pub mod test { let credentials = alice.get_credentials_for_presentation(); disclosed_proof::generate_proof(alice.presentation_handle, credentials.to_string(), String::from("{}")).unwrap(); - assert_eq!(3, disclosed_proof::get_state(alice.presentation_handle).unwrap()); + assert_eq!(1, disclosed_proof::get_state(alice.presentation_handle).unwrap()); let alice_connection_by_handle = connection::store_connection(alice.connection.clone()).unwrap(); disclosed_proof::send_proof(alice.presentation_handle, alice_connection_by_handle).unwrap(); - assert_eq!(2, disclosed_proof::get_state(alice.presentation_handle).unwrap()); + assert_eq!(3, disclosed_proof::get_state(alice.presentation_handle).unwrap()); } faber.verify_presentation(); @@ -235,7 +235,7 @@ pub mod test { let alice_connection_by_handle = connection::store_connection(alice.connection.clone()).unwrap(); credential::send_credential_request(alice.credential_handle, alice_connection_by_handle).unwrap(); - assert_eq!(2, credential::get_state(alice.credential_handle).unwrap()); + assert_eq!(1, credential::get_state(alice.credential_handle).unwrap()); } faber.send_credential(); @@ -255,11 +255,11 @@ pub mod test { let credentials = alice.get_credentials_for_presentation(); disclosed_proof::generate_proof(alice.presentation_handle, credentials.to_string(), String::from("{}")).unwrap(); - assert_eq!(3, disclosed_proof::get_state(alice.presentation_handle).unwrap()); + assert_eq!(1, disclosed_proof::get_state(alice.presentation_handle).unwrap()); let alice_connection_by_handle = connection::store_connection(alice.connection.clone()).unwrap(); disclosed_proof::send_proof(alice.presentation_handle, alice_connection_by_handle).unwrap(); - assert_eq!(2, disclosed_proof::get_state(alice.presentation_handle).unwrap()); + assert_eq!(3, disclosed_proof::get_state(alice.presentation_handle).unwrap()); } faber.verify_presentation(); diff --git a/libvcx/src/lib.rs b/libvcx/src/lib.rs index d8cbebd279..682dbb5068 100644 --- a/libvcx/src/lib.rs +++ b/libvcx/src/lib.rs @@ -60,7 +60,6 @@ mod tests { use crate::api_lib::api_handle::issuer_credential; use crate::api_lib::api_handle::proof; use crate::api_lib::ProofStateType; - use crate::api_lib::VcxStateType; use crate::filters; use crate::settings; use crate::utils::{ @@ -69,6 +68,10 @@ mod tests { }; use crate::utils::devsetup::*; use crate::utils::devsetup_agent::test::{Alice, Faber, TestAgent}; + use crate::aries::handlers::issuance::holder::holder::HolderState; + use crate::aries::handlers::issuance::issuer::issuer::IssuerState; + use crate::aries::handlers::proof_presentation::prover::prover::ProverState; + use crate::aries::handlers::proof_presentation::verifier::verifier::VerifierState; use super::*; @@ -179,7 +182,7 @@ mod tests { let offers = serde_json::to_string(&offers[0]).unwrap(); info!("send_cred_req :: creating credential from offer"); let credential = credential::credential_create_with_offer("TEST_CREDENTIAL", &offers).unwrap(); - assert_eq!(VcxStateType::VcxStateRequestReceived as u32, credential::get_state(credential).unwrap()); + assert_eq!(HolderState::OfferReceived as u32, credential::get_state(credential).unwrap()); info!("send_cred_req :: sending credential request"); credential::send_credential_request(credential, connection).unwrap(); thread::sleep(Duration::from_millis(2000)); @@ -191,7 +194,7 @@ mod tests { info!("send_credential >>> getting offers"); assert_eq!(issuer_credential::is_revokable(handle_issuer_credential).unwrap(), revokable); issuer_credential::update_state(handle_issuer_credential, None, issuer_to_consumer).unwrap(); - assert_eq!(VcxStateType::VcxStateRequestReceived as u32, issuer_credential::get_state(handle_issuer_credential).unwrap()); + assert_eq!(IssuerState::RequestReceived as u32, issuer_credential::get_state(handle_issuer_credential).unwrap()); assert_eq!(issuer_credential::is_revokable(handle_issuer_credential).unwrap(), revokable); info!("send_credential >>> sending credential"); @@ -202,7 +205,7 @@ mod tests { info!("send_credential >>> storing credential"); assert_eq!(credential::is_revokable(handle_holder_credential).unwrap(), revokable); credential::update_state(handle_holder_credential, None, consumer_to_issuer).unwrap(); - assert_eq!(VcxStateType::VcxStateAccepted as u32, credential::get_state(handle_holder_credential).unwrap()); + assert_eq!(HolderState::Finished as u32, credential::get_state(handle_holder_credential).unwrap()); assert_eq!(credential::is_revokable(handle_holder_credential).unwrap(), revokable); if revokable { @@ -254,7 +257,7 @@ mod tests { disclosed_proof::send_proof(proof_handle, connection_handle).unwrap(); info!("generate_and_send_proof :: proof sent"); - assert_eq!(VcxStateType::VcxStateOfferSent as u32, disclosed_proof::get_state(proof_handle).unwrap()); + assert_eq!(ProverState::PresentationSent as u32, disclosed_proof::get_state(proof_handle).unwrap()); thread::sleep(Duration::from_millis(5000)); } diff --git a/libvcx/src/utils/devsetup_agent.rs b/libvcx/src/utils/devsetup_agent.rs index 36dd99a512..499af906ef 100644 --- a/libvcx/src/utils/devsetup_agent.rs +++ b/libvcx/src/utils/devsetup_agent.rs @@ -240,14 +240,14 @@ pub mod test { let connection_by_handle = connection::store_connection(self.connection.clone()).unwrap(); issuer_credential::send_credential_offer(self.credential_handle, connection_by_handle, None).unwrap(); issuer_credential::update_state(self.credential_handle, None, connection_by_handle).unwrap(); - assert_eq!(2, issuer_credential::get_state(self.credential_handle).unwrap()); + assert_eq!(1, issuer_credential::get_state(self.credential_handle).unwrap()); } pub fn send_credential(&mut self) { self.activate().unwrap(); let connection_by_handle = connection::store_connection(self.connection.clone()).unwrap(); issuer_credential::update_state(self.credential_handle, None, connection_by_handle).unwrap(); - assert_eq!(3, issuer_credential::get_state(self.credential_handle).unwrap()); + assert_eq!(2, issuer_credential::get_state(self.credential_handle).unwrap()); issuer_credential::send_credential(self.credential_handle, connection_by_handle).unwrap(); issuer_credential::update_state(self.credential_handle, None, connection_by_handle).unwrap(); @@ -258,18 +258,18 @@ pub mod test { pub fn request_presentation(&mut self) { self.activate().unwrap(); self.presentation_handle = self.create_presentation_request(); - assert_eq!(1, proof::get_state(self.presentation_handle).unwrap()); + assert_eq!(0, proof::get_state(self.presentation_handle).unwrap()); let connection_by_handle = connection::store_connection(self.connection.clone()).unwrap(); proof::send_proof_request(self.presentation_handle, connection_by_handle, None).unwrap(); proof::update_state(self.presentation_handle, None, connection_by_handle).unwrap(); - assert_eq!(2, proof::get_state(self.presentation_handle).unwrap()); + assert_eq!(1, proof::get_state(self.presentation_handle).unwrap()); } pub fn verify_presentation(&mut self) { self.activate().unwrap(); - self.update_proof_state(4, aries::messages::status::Status::Success.code()) + self.update_proof_state(2, aries::messages::status::Status::Success.code()) } pub fn update_proof_state(&mut self, expected_state: u32, expected_status: u32) { @@ -363,17 +363,17 @@ pub mod test { let offer_json = serde_json::to_string(&offer).unwrap(); self.credential_handle = credential::credential_create_with_offer("degree", &offer_json).unwrap(); - assert_eq!(3, credential::get_state(self.credential_handle).unwrap()); + assert_eq!(0, credential::get_state(self.credential_handle).unwrap()); credential::send_credential_request(self.credential_handle, connection_by_handle).unwrap(); - assert_eq!(2, credential::get_state(self.credential_handle).unwrap()); + assert_eq!(1, credential::get_state(self.credential_handle).unwrap()); } pub fn accept_credential(&mut self) { self.activate().unwrap(); let connection_by_handle = connection::store_connection(self.connection.clone()).unwrap(); credential::update_state(self.credential_handle, None, connection_by_handle).unwrap(); - assert_eq!(4, credential::get_state(self.credential_handle).unwrap()); + assert_eq!(2, credential::get_state(self.credential_handle).unwrap()); assert_eq!(aries::messages::status::Status::Success.code(), credential::get_credential_status(self.credential_handle).unwrap()); } @@ -410,11 +410,11 @@ pub mod test { let credentials = self.get_credentials_for_presentation(); disclosed_proof::generate_proof(self.presentation_handle, credentials.to_string(), String::from("{}")).unwrap(); - assert_eq!(3, disclosed_proof::get_state(self.presentation_handle).unwrap()); + assert_eq!(1, disclosed_proof::get_state(self.presentation_handle).unwrap()); let connection_by_handle = connection::store_connection(self.connection.clone()).unwrap(); disclosed_proof::send_proof(self.presentation_handle, connection_by_handle).unwrap(); - assert_eq!(2, disclosed_proof::get_state(self.presentation_handle).unwrap()); + assert_eq!(3, disclosed_proof::get_state(self.presentation_handle).unwrap()); } pub fn decline_presentation_request(&mut self) {