Move alice & faber "agents" to aries-vcx crate (#333)

* Remove cred_def_handle from faber
* Remove credential_handle from faber
* Remove presentation_handle from faber
* Move schema to aries-vcx crate
* Remove credential_handle from alice
* Remove presentation_handle from alice
* Remove schema_handle from faber
* Remove schema and credential imports from devsetup_agent
* Remove connection and disclosed_proof imports from devsetup_agent
* Remove dependence on credential and connection from integration tests
* Move test_download_messages_from_multiple_connections
* Remove cred_def_handle from src/lib.rs
* Remove connection_handle from src/lib.rs
* Remove disclosed_proof from src/lib.rs
* Remove proof from src/lib.rs
* Remove issuer_credential from src/lib.rs
* Remove credential from src/lib.rs
* Move integration tests to aries-vcx crate

Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com>

Author: mirgee

.github/actions/codecov-integration-tests/action.yml

@@ -34,8 +34,8 @@ runs:
           -e RUSTFLAGS='-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' \
           -e RUSTDOCFLAGS='-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' \
           ${{ inputs.codecov-img-name }} \
-          bash -c '(cd $HOME/aries-vcx/libvcx && \
-              cargo test --features "pool_tests agency_v2" && \
+          bash -c '(cd $HOME/aries-vcx/aries_vcx && \
+              cargo test --features "pool_tests agency_pool_tests agency_v2" && \
               grcov ../target/debug/ -s . -t lcov --llvm --branch --ignore-not-existing -o ../target/debug/coverage.lcov)'
         docker_id=$(docker ps -a | grep libvcx-codecov-integration | grep Exited | tail -n 1 | cut -d ' ' -f 1)
         docker_image_id=$(docker images | grep codecov | perl -pe 's/\s+/ /g' | cut -d ' ' -f 3)

.github/workflows/main.yml

@@ -522,9 +522,9 @@ jobs:
           set -x
           docker run --rm -i --name libvcx --network host -e X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
                               bash -c '(cd $HOME/libvcx && \
-                              RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests agency_v2" && \
+                              RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests" && \
                               cd $HOME/aries_vcx && \
-                              RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests" )'
+                              RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests agency_v2" )'
 
   test-libvcx-pgsql-integration:
     runs-on: ubuntu-latest
@@ -641,7 +641,7 @@ jobs:
         run: |
           set -x
           docker run --rm -i --name libvcx --network host -e X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
-                              bash -c '(cd $HOME/libvcx && \
+                              bash -c '(cd $HOME/aries_vcx && \
                               cargo --version && \
                               rustc --version && \
                               RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "agency_pool_tests")'

aries_vcx/Cargo.toml

@@ -13,6 +13,8 @@ path = "src/lib.rs"
 
 [features]
 pool_tests = []
+agency_pool_tests = []
+agency_v2 = []
 general_test = []
 fatal_warnings = []
 warnlog_fetched_messages = []

aries_vcx/src/handlers/issuance/credential_def/mod.rs

@@ -20,7 +20,7 @@ pub struct RevocationRegistry {
     rev_reg_delta_payment_txn: Option<PaymentTxn>,
 }
 
-#[derive(Clone, Deserialize, Debug, Serialize, PartialEq)]
+#[derive(Clone, Deserialize, Debug, Serialize, PartialEq, Default)]
 pub struct CredentialDef {
     pub id: String,
     tag: String,

aries_vcx/src/handlers/issuance/holder/holder.rs

@@ -7,7 +7,7 @@ use crate::handlers::connection::connection::Connection;
 use crate::messages::issuance::credential_offer::CredentialOffer;
 use crate::error::prelude::*;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Holder {
     holder_sm: HolderSM
 }

aries_vcx/src/handlers/issuance/holder/mod.rs

@@ -1,3 +1,21 @@
 pub mod holder;
 mod state_machine;
-mod states;
+mod states;
+
+use crate::messages::a2a::A2AMessage;
+use crate::handlers::connection::connection::Connection;
+use crate::error::prelude::*;
+
+pub fn get_credential_offer_messages(connection: &Connection) -> VcxResult<String> {
+    let credential_offers: Vec<A2AMessage> = connection.get_messages()?
+        .into_iter()
+        .filter_map(|(_, a2a_message)| {
+            match a2a_message {
+                A2AMessage::CredentialOffer(_) => Some(a2a_message),
+                _ => None
+            }
+        })
+        .collect();
+
+    Ok(json!(credential_offers).to_string())
+}

aries_vcx/src/handlers/issuance/holder/state_machine.rs

@@ -22,13 +22,19 @@ pub enum HolderFullState {
     Finished(FinishedHolderState),
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct HolderSM {
     state: HolderFullState,
     source_id: String,
     thread_id: String,
 }
 
+impl Default for HolderFullState {
+    fn default() -> Self {
+        Self::OfferReceived(OfferReceivedState::default())
+    }
+}
+
 impl HolderSM {
     pub fn new(offer: CredentialOffer, source_id: String) -> Self {
         HolderSM {

aries_vcx/src/handlers/issuance/holder/states/offer_received.rs

@@ -7,7 +7,7 @@ use crate::messages::status::Status;
 use crate::handlers::issuance::holder::state_machine::parse_cred_def_id_from_cred_offer;
 use crate::libindy::utils::anoncreds::get_cred_def_json;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct OfferReceivedState {
     pub offer: CredentialOffer
 }

aries_vcx/src/handlers/issuance/issuer/issuer.rs

@@ -6,7 +6,7 @@ use crate::messages::a2a::A2AMessage;
 use crate::handlers::connection::connection::Connection;
 use crate::error::prelude::*;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Issuer {
     issuer_sm: IssuerSM
 }

aries_vcx/src/handlers/issuance/issuer/state_machine.rs

@@ -47,7 +47,13 @@ impl IssuerFullState {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+impl Default for IssuerFullState {
+    fn default() -> Self {
+        Self::Initial(InitialState::default())
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct IssuerSM {
     state: IssuerFullState,
     source_id: String,

aries_vcx/src/handlers/issuance/issuer/states/initial.rs

@@ -3,7 +3,7 @@ use crate::handlers::issuance::issuer::states::offer_sent::OfferSentState;
 use crate::messages::a2a::MessageId;
 use crate::messages::status::Status;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct InitialState {
     pub cred_def_id: String,
     pub credential_json: String,

aries_vcx/src/handlers/issuance/mod.rs

@@ -2,3 +2,4 @@ pub mod issuer;
 pub mod holder;
 pub mod messages;
 pub mod credential_def;
+pub mod schema;

aries_vcx/src/handlers/issuance/schema/mod.rs

@@ -0,0 +1 @@
+pub mod schema;

aries_vcx/src/handlers/issuance/schema/schema.rs

@@ -0,0 +1,61 @@
+use crate::handlers::issuance::credential_def::PublicEntityStateType;
+use crate::error::prelude::*;
+use crate::libindy::utils::anoncreds;
+use crate::libindy::utils::payments::PaymentTxn;
+use crate::utils::constants::DEFAULT_SERIALIZE_VERSION;
+use crate::utils::serialization::ObjectWithVersion;
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub struct SchemaData {
+    pub name: String,
+    pub version: String,
+    #[serde(rename = "attrNames")]
+    pub attr_names: Vec<String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Default)]
+pub struct Schema {
+    pub data: Vec<String>,
+    pub version: String,
+    pub schema_id: String,
+    pub name: String,
+    pub source_id: String,
+    pub payment_txn: Option<PaymentTxn>,
+    #[serde(default)]
+    pub state: PublicEntityStateType,
+}
+
+impl Schema {
+    pub fn get_source_id(&self) -> &String { &self.source_id }
+
+    pub fn get_schema_id(&self) -> &String { &self.schema_id }
+
+    pub fn get_payment_txn(&self) -> VcxResult<PaymentTxn> {
+        trace!("Schema::get_payment_txn >>>");
+        self.payment_txn.clone()
+            .ok_or(VcxError::from(VcxErrorKind::NoPaymentInformation))
+    }
+
+    pub fn to_string(&self) -> VcxResult<String> {
+        ObjectWithVersion::new(DEFAULT_SERIALIZE_VERSION, self.to_owned())
+            .serialize()
+            .map_err(|err| err.into())
+            .map_err(|err: VcxError| err.extend("Cannot serialize Schema"))
+    }
+
+    pub fn from_str(data: &str) -> VcxResult<Schema> {
+        ObjectWithVersion::deserialize(data)
+            .map(|obj: ObjectWithVersion<Schema>| obj.data)
+            .map_err(|err| err.into())
+            .map_err(|err: VcxError| err.extend("Cannot deserialize Schema"))
+    }
+
+    pub fn update_state(&mut self) -> VcxResult<u32> {
+        if anoncreds::get_schema_json(&self.schema_id).is_ok() {
+            self.state = PublicEntityStateType::Published
+        }
+        Ok(self.state as u32)
+    }
+
+    pub fn get_state(&self) -> u32 { self.state as u32 }
+}

aries_vcx/src/handlers/proof_presentation/prover/mod.rs

@@ -2,3 +2,21 @@ pub mod prover;
 mod state_machine;
 mod messages;
 mod states;
+
+use crate::messages::a2a::A2AMessage;
+use crate::handlers::connection::connection::Connection;
+use crate::error::prelude::*;
+
+pub fn get_proof_request_messages(connection: &Connection) -> VcxResult<String> {
+    let presentation_requests: Vec<A2AMessage> = connection.get_messages()?
+            .into_iter()
+            .filter_map(|(_, message)| {
+                match message {
+                    A2AMessage::PresentationRequest(_) => Some(message),
+                    _ => None
+                }
+            })
+            .collect();
+
+    Ok(json!(presentation_requests).to_string())
+}

aries_vcx/src/handlers/proof_presentation/prover/prover.rs

@@ -10,7 +10,7 @@ use crate::messages::proof_presentation::presentation_request::PresentationReque
 use crate::error::prelude::*;
 use crate::libindy::utils::anoncreds;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Prover {
     prover_sm: ProverSM,
 }

aries_vcx/src/handlers/proof_presentation/prover/state_machine.rs

@@ -17,7 +17,7 @@ use crate::error::prelude::*;
 
 /// A state machine that tracks the evolution of states for a Prover during
 /// the Present Proof protocol.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 pub struct ProverSM {
     source_id: String,
     thread_id: String,
@@ -45,6 +45,12 @@ pub enum ProverFullState {
     Finished(FinishedState),
 }
 
+impl Default for ProverFullState {
+    fn default() -> Self {
+        Self::Initiated(InitialState::default())
+    }
+}
+
 impl ProverSM {
     pub fn find_message_to_handle(&self, messages: HashMap<String, A2AMessage>) -> Option<(String, A2AMessage)> {
         trace!("Prover::find_message_to_handle >>> messages: {:?}", messages);

aries_vcx/src/handlers/proof_presentation/prover/states/initial.rs

@@ -6,7 +6,7 @@ use crate::messages::proof_presentation::presentation::Presentation;
 use crate::messages::proof_presentation::presentation_request::PresentationRequest;
 use crate::libindy::proofs::prover::prover::generate_indy_proof;
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 pub struct InitialState {
     pub presentation_request: PresentationRequest,
 }

aries_vcx/src/handlers/proof_presentation/verifier/state_machine.rs

@@ -12,7 +12,7 @@ use crate::handlers::proof_presentation::verifier::states::initial::InitialState
 use crate::handlers::proof_presentation::verifier::states::presentation_request_sent::PresentationRequestSentState;
 use crate::handlers::proof_presentation::verifier::states::finished::FinishedState;
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 pub struct VerifierSM {
     source_id: String,
     state: VerifierFullState,
@@ -31,6 +31,12 @@ pub enum VerifierFullState {
     Finished(FinishedState),
 }
 
+impl Default for VerifierFullState {
+    fn default() -> Self {
+        Self::Initiated(InitialState::default())
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum RevocationStatus {
     Revoked,

aries_vcx/src/handlers/proof_presentation/verifier/states/initial.rs

@@ -1,7 +1,7 @@
 use crate::handlers::proof_presentation::verifier::states::presentation_request_sent::PresentationRequestSentState;
 use crate::messages::proof_presentation::presentation_request::{PresentationRequest, PresentationRequestData};
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 pub struct InitialState {
     pub presentation_request_data: PresentationRequestData
 }

aries_vcx/src/handlers/proof_presentation/verifier/verifier.rs

@@ -6,7 +6,7 @@ use crate::messages::a2a::A2AMessage;
 use crate::messages::proof_presentation::presentation_request::*;
 use std::collections::HashMap;
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)]
 pub struct Verifier {
     verifier_sm: VerifierSM
 }

aries_vcx/tests/pgwallet/mod.rs

@@ -1,2 +1,2 @@
 pub(crate) mod constants;
-pub(crate) mod wallet_plugin_loader;
+pub(crate) mod wallet_plugin_loader;