refactor(mediator): step1: separate concerns,explicit pathname

Signed-off-by: Naian <[email protected]>

mediator/src/agent/client.rs → mediator/src/aries_agent/client.rs

@@ -28,7 +28,7 @@ use xum_test_server::storage::MediatorPersistence;
 // use super::transports::AriesTransport;
 // use diddoc_legacy::aries::service::AriesService;
 use super::{transports::AriesTransport, Agent};
-use crate::{agent::utils::oob2did, utils::prelude::*};
+use crate::{aries_agent::utils::oob2did, utils::prelude::*};
 // client role utilities
 impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
     /// Starts a new connection object and tries to create request to the specified OOB invite

mediator/src/aries_agent/me.rs

@@ -0,0 +1,13 @@
+trait Foo {}
+trait Faa {}
+
+struct Obar {}
+
+impl Foo for Obar {}
+impl Faa for Obar {}
+
+fn trat() {
+    let a = Obar {};
+    tak(a);
+}
+fn tak(name: &(dyn Foo + Faa)) {}

mediator/src/agent/mod.rs → mediator/src/aries_agent/mod.rs

@@ -254,7 +254,7 @@ mod test {
     use serde_json::Value;
 
     use super::AgentMaker;
-    use crate::agent::utils::oob2did;
+    use crate::aries_agent::utils::oob2did;
 
     #[tokio::test]
     pub async fn test_pack_unpack() {

mediator/src/bin/client-tui.rs

@@ -1,6 +1,6 @@
 use log::info;
 /// Aries Agent TUI
-use mediator::{agent::AgentMaker, routes::tui};
+use mediator::{aries_agent::AgentMaker, http_routes::tui};
 
 #[tokio::main]
 async fn main() {

mediator/src/bin/client-web.rs

@@ -1,6 +1,6 @@
 /// Client-side focused api accessible Aries Agent
 use log::info;
-use mediator::{agent::AgentMaker, routes::client::build_client_router};
+use mediator::{aries_agent::AgentMaker, http_routes::client::build_client_router};
 
 #[tokio::main]
 async fn main() {

mediator/src/bin/mediator.rs

@@ -1,5 +1,5 @@
 use log::info;
-use mediator::agent::AgentMaker;
+use mediator::aries_agent::AgentMaker;
 
 #[tokio::main]
 async fn main() {
@@ -16,7 +16,7 @@ async fn main() {
         )
         .await
         .unwrap();
-    let app_router = mediator::routes::build_router(agent).await;
+    let app_router = mediator::http_routes::build_router(agent).await;
     axum::Server::bind(
         &endpoint_root
             .parse()

mediator/src/routes/client.rs → mediator/src/http_routes/client.rs

@@ -6,7 +6,7 @@ use serde_json::json;
 use xum_test_server::storage::MediatorPersistence;
 
 use super::*;
-use crate::agent::transports::AriesReqwest;
+use crate::aries_agent::transports::AriesReqwest;
 
 pub async fn handle_register(
     State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,

mediator/src/routes/mod.rs → mediator/src/http_routes/mod.rs

@@ -22,7 +22,7 @@ use xum_test_server::{
     storage::MediatorPersistence,
 };
 
-use crate::{agent::Agent, utils::string_from_std_error};
+use crate::{aries_agent::Agent, utils::string_from_std_error};
 type ArcAgent<T, P> = Arc<Agent<T, P>>;
 
 pub mod client;

mediator/src/routes/tui.rs → mediator/src/http_routes/tui.rs

@@ -17,7 +17,7 @@ use log::info;
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use xum_test_server::storage::MediatorPersistence;
 
-use crate::{agent::Agent, routes::client::handle_register};
+use crate::{aries_agent::Agent, http_routes::client::handle_register};
 
 pub async fn init_tui<T: BaseWallet + 'static, P: MediatorPersistence>(agent: Agent<T, P>) {
     let mut cursive = Cursive::new();

mediator/src/lib.rs

@@ -1,3 +1,3 @@
-pub mod agent;
-pub mod routes;
+pub mod aries_agent;
+pub mod http_routes;
 pub mod utils;

mediator/tests/mediator-aries.rs

@@ -2,7 +2,7 @@ mod common;
 use std::collections::VecDeque;
 
 use common::{prelude::*, test_setup::OneTimeInit};
-use mediator::agent::transports::AriesReqwest;
+use mediator::aries_agent::transports::AriesReqwest;
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use reqwest::header::ACCEPT;
 
@@ -39,7 +39,7 @@ async fn didcomm_connection_succeeds() -> Result<()> {
         .json()
         .await?;
     info!("Got invitation from register endpoint {:?}", oobi);
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await?;
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await?;
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),

mediator/tests/mediator-coord.rs

@@ -5,7 +5,7 @@ use aries_vcx::protocols::connection::invitee::{states::completed::Completed, In
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use common::{prelude::*, test_setup::OneTimeInit};
 use mediator::{
-    agent::{
+    aries_agent::{
         transports::{AriesReqwest, AriesTransport},
         Agent,
     },
@@ -65,7 +65,7 @@ async fn didcomm_connection(
 #[ignore]
 async fn test_init() {
     TestSetupAries.init();
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await.unwrap();
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await.unwrap();
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),
@@ -77,7 +77,7 @@ async fn test_init() {
 #[tokio::test]
 async fn test_mediate_grant() -> Result<()> {
     TestSetupAries.init();
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await?;
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await?;
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),
@@ -131,7 +131,7 @@ async fn test_mediate_grant() -> Result<()> {
 async fn test_mediate_keylist_update_add() -> Result<()> {
     TestSetupAries.init();
     // ready agent, http client
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await?;
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await?;
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),
@@ -187,7 +187,7 @@ async fn test_mediate_keylist_update_add() -> Result<()> {
 async fn test_mediate_keylist_query() -> Result<()> {
     TestSetupAries.init();
     // ready agent, http client
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await?;
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await?;
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),
@@ -275,7 +275,7 @@ async fn test_mediate_keylist_query() -> Result<()> {
 async fn test_mediate_keylist_update_remove() -> Result<()> {
     TestSetupAries.init();
     // ready agent, http client
-    let agent = mediator::agent::AgentMaker::new_demo_agent().await?;
+    let agent = mediator::aries_agent::AgentMaker::new_demo_agent().await?;
     let mut aries_transport = AriesReqwest {
         response_queue: VecDeque::new(),
         client: reqwest::Client::new(),