Refactor did-core, update aries-agent and did-exchange implementations

Signed-off-by: Patrik Stas <[email protected]>

Author: Patrik-Stas

.gitignore

@@ -8,3 +8,4 @@
 *.code-workspace
 **/tails.txt
 .session.vim
+**/rust/aath-backchannel

Cargo.lock

@@ -21,7 +21,6 @@ members = [
     "did_core/did_doc",
     "did_core/did_methods/did_peer",
     "did_core/did_methods/did_key",
-    "did_core/did_doc_sov",
     "did_core/did_parser",
     "did_core/did_parser_nom",
     "did_core/did_resolver",

Cargo.toml

@@ -2,9 +2,10 @@ use std::sync::Arc;
 
 use aries_vcx::{
     common::ledger::{
-        service_didsov::{DidSovServiceType, EndpointDidSov},
+        service_didsov::EndpointDidSov,
         transactions::{add_new_did, write_endpoint},
     },
+    did_doc::schema::service::typed::ServiceType,
     global::settings::DEFAULT_LINK_SECRET_ALIAS,
 };
 use aries_vcx_core::{
@@ -110,7 +111,7 @@ impl Agent<IndySdkWallet> {
         .await?;
         let endpoint = EndpointDidSov::create()
             .set_service_endpoint(init_config.service_endpoint.clone())
-            .set_types(Some(vec![DidSovServiceType::DidCommunication]));
+            .set_types(Some(vec![ServiceType::DIDCommV1.to_string()]));
         write_endpoint(
             wallet.as_ref(),
             ledger_write.as_ref(),
@@ -134,7 +135,6 @@ impl Agent<IndySdkWallet> {
             init_config.service_endpoint.clone(),
         ));
         let did_exchange = Arc::new(ServiceDidExchange::new(
-            ledger_read.clone(),
             wallet.clone(),
             did_resolver_registry,
             init_config.service_endpoint.clone(),

aries/agents/aries-vcx-agent/src/agent/init.rs

@@ -2,11 +2,11 @@ use std::{convert::From, num::ParseIntError};
 
 use aries_vcx::{
     did_doc::error::DidDocumentBuilderError,
-    did_doc_sov::error::DidDocumentSovError,
     errors::error::{AriesVcxError, AriesVcxErrorKind},
     protocols::did_exchange::state_machine::generic::GenericDidExchange,
 };
 use aries_vcx_core::errors::error::AriesVcxCoreError;
+use did_resolver_sov::did_resolver::did_doc::schema::utils::error::DidDocumentLookupError;
 
 use crate::error::*;
 
@@ -30,7 +30,6 @@ impl From<serde_json::Error> for AgentError {
     }
 }
 
-// TODO
 impl From<AriesVcxCoreError> for AgentError {
     fn from(err: AriesVcxCoreError) -> Self {
         let kind = AgentErrorKind::GenericAriesVcxError;
@@ -39,14 +38,6 @@ impl From<AriesVcxCoreError> for AgentError {
     }
 }
 
-impl From<DidDocumentSovError> for AgentError {
-    fn from(err: DidDocumentSovError) -> Self {
-        let kind = AgentErrorKind::GenericAriesVcxError;
-        let message = format!("DidDocumentSovError; err: {:?}", err.to_string());
-        AgentError { message, kind }
-    }
-}
-
 impl From<DidDocumentBuilderError> for AgentError {
     fn from(err: DidDocumentBuilderError) -> Self {
         let kind = AgentErrorKind::GenericAriesVcxError;
@@ -63,6 +54,14 @@ impl From<aries_vcx::did_parser::ParseError> for AgentError {
     }
 }
 
+impl From<did_peer::error::DidPeerError> for AgentError {
+    fn from(err: did_peer::error::DidPeerError) -> Self {
+        let kind = AgentErrorKind::GenericAriesVcxError;
+        let message = format!("DidPeerError; err: {:?}", err.to_string());
+        AgentError { message, kind }
+    }
+}
+
 impl From<public_key::PublicKeyError> for AgentError {
     fn from(err: public_key::PublicKeyError) -> Self {
         let kind = AgentErrorKind::GenericAriesVcxError;
@@ -86,6 +85,13 @@ impl From<(GenericDidExchange, AriesVcxError)> for AgentError {
         AgentError { message, kind }
     }
 }
+impl From<DidDocumentLookupError> for AgentError {
+    fn from(err: DidDocumentLookupError) -> Self {
+        let kind = AgentErrorKind::GenericAriesVcxError;
+        let message = format!("DidDocumentLookupError; err: {:?}", err.to_string());
+        AgentError { message, kind }
+    }
+}
 
 impl From<anoncreds_types::Error> for AgentError {
     fn from(err: anoncreds_types::Error) -> Self {

aries/agents/aries-vcx-agent/src/error/convertors.rs

@@ -6,7 +6,7 @@ pub struct VcxHttpClient;
 
 #[async_trait]
 impl Transport for VcxHttpClient {
-    async fn send_message(&self, msg: Vec<u8>, service_endpoint: Url) -> VcxResult<()> {
+    async fn send_message(&self, msg: Vec<u8>, service_endpoint: &Url) -> VcxResult<()> {
         shared::http_client::post_message(msg, service_endpoint).await?;
         Ok(())
     }

aries/agents/aries-vcx-agent/src/helper.rs

@@ -9,7 +9,6 @@ extern crate uuid;
 
 mod agent;
 mod error;
-pub mod helper;
 mod http;
 mod services;
 mod storage;

aries/agents/aries-vcx-agent/src/http.rs

@@ -2,9 +2,12 @@ use std::sync::{Arc, Mutex};
 
 use aries_vcx::{
     handlers::util::AnyInvitation,
-    messages::msg_fields::protocols::{
-        connection::{request::Request, response::Response},
-        notification::ack::Ack,
+    messages::{
+        msg_fields::protocols::{
+            connection::{request::Request, response::Response},
+            notification::ack::Ack,
+        },
+        AriesMessage,
     },
     protocols::connection::{
         pairwise_info::PairwiseInfo, Connection, GenericConnection, State, ThinState,
@@ -44,6 +47,23 @@ impl<T: BaseWallet> ServiceConnections<T> {
         }
     }
 
+    pub async fn send_message(
+        &self,
+        connection_id: &str,
+        message: &AriesMessage,
+    ) -> AgentResult<()> {
+        let connection = self.get_by_id(connection_id)?;
+        let wallet = self.wallet.as_ref();
+        info!(
+            "Sending message to connection identified by id {}. Plaintext message payload: {}",
+            connection_id, message
+        );
+        connection
+            .send_message(wallet, message, &VcxHttpClient)
+            .await?;
+        Ok(())
+    }
+
     pub async fn create_invitation(
         &self,
         pw_info: Option<PairwiseInfo>,