refactor: deprecate mediation crate - include logic directly inside m…

…ediator (#1067) * refactor: move message processing logic within mediator pt1 - mediate-coordination Signed-off-by: Naian <[email protected]>
hyperledger · Nov 22, 2023 · 37019db · 37019db
1 parent 2b923e3
commit 37019db
Show file tree

Hide file tree

Showing 42 changed files with 76 additions and 3,473 deletions.
diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml
@@ -51,7 +51,7 @@ jobs:
         # uses: Swatinem/rust-cache@v2
         run: cargo install sqlx-cli
       - name: Setup database
-        run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source aries/agents/rust/mediator/mediation/migrations
+        run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source aries/agents/rust/mediator/migrations
       - name: "Run mediator integration tests"
         run: cargo run --bin mediator & sleep 5 && cargo test --verbose --package mediator -- --nocapture;
       - name: "Collect docker logs on failure"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aries/agents/rust/mediator/Cargo.toml b/aries/agents/rust/mediator/Cargo.toml
@@ -34,8 +34,8 @@ tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
 tower-http = { version = "0.4.4", features = ["catch-panic"] }
 url = "2.4.1"
 uuid = "1.4.1"
-mediation = { path = "./mediation" }
 test_utils = { path = "../../../misc/test_utils" }
+base64-url = "2.0.0"
 
 [dev-dependencies]
 base64-url = "2.0.0"

diff --git a/...s/agents/rust/mediator/mediation/build.rs → aries/agents/rust/mediator/build.rs b/...s/agents/rust/mediator/mediation/build.rs → aries/agents/rust/mediator/build.rs
diff --git a/aries/agents/rust/mediator/client-tui/Cargo.toml b/aries/agents/rust/mediator/client-tui/Cargo.toml
@@ -13,7 +13,6 @@ axum = "0.6.20"
 cursive = { version = "0.20.0", features = ["crossterm-backend"] }
 futures = "0.3.28"
 log = "0.4.20"
-mediation = { path = "../mediation" }
 mediator = { path = ".." }
 messages = { path = "../../../../messages" }
 reqwest = "0.11.22"

diff --git a/aries/agents/rust/mediator/client-tui/src/lib.rs b/aries/agents/rust/mediator/client-tui/src/lib.rs
@@ -1,8 +1,10 @@
 use std::collections::VecDeque;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
-use mediation::storage::MediatorPersistence;
-use mediator::aries_agent::{client::transports::AriesReqwest, ArcAgent};
+use mediator::{
+    aries_agent::{client::transports::AriesReqwest, ArcAgent},
+    persistence::MediatorPersistence,
+};
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use serde_json::{json, Value};
 

diff --git a/aries/agents/rust/mediator/client-tui/src/tui.rs b/aries/agents/rust/mediator/client-tui/src/tui.rs
@@ -14,8 +14,7 @@ use cursive::{
 };
 use futures::executor::block_on;
 use log::info;
-use mediation::storage::MediatorPersistence;
-use mediator::aries_agent::Agent;
+use mediator::{aries_agent::Agent, persistence::MediatorPersistence};
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 
 pub async fn init_tui<T: BaseWallet + 'static, P: MediatorPersistence>(agent: Agent<T, P>) {

diff --git a/aries/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml b/aries/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
diff --git a/aries/agents/rust/mediator/mediation/.gitignore b/aries/agents/rust/mediator/mediation/.gitignore