refactor(mediator-client-tui): move to separate package

Signed-off-by: Naian <126972030+nain-F49FF806@users.noreply.github.com>
hyperledger · Oct 20, 2023 · e020eba · e020eba
1 parent df49c68
commit e020eba
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
     "diddoc_legacy",
     "agents/rust/mediator",
     "agents/rust/mediator/client-webapi",
+    "agents/rust/mediator/client-tui",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",
     "aries_vcx_core",

diff --git a/agents/rust/mediator/Cargo.toml b/agents/rust/mediator/Cargo.toml
@@ -7,11 +7,7 @@ edition = "2021"
 
 [features]
 default = ["client"]
-# default = ["client_http_api"]
 client = []
-client_http_api = ["client"]
-client_tui = ["client", "cursive"]
-
 
 [dependencies]
 anyhow = "1.0.75"
@@ -22,9 +18,6 @@ aries_vcx_core = { path = "../../../aries_vcx_core", features = [
 async-trait = "0.1.73"
 axum = "0.6"
 axum-macros = "0.3.8"
-cursive = { version = "0.20.0", features = [
-    "crossterm-backend",
-], optional = true }
 diddoc_legacy = { path = "../../../diddoc_legacy" }
 dotenvy = "0.15"
 env_logger = "0.10.0"

diff --git a/agents/rust/mediator/client-tui/Cargo.toml b/agents/rust/mediator/client-tui/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "client-tui"
+version = "0.1.1"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
+    "vdrtools_wallet",
+] }
+axum = "0.6.20"
+client-webapi = { path = "../client-webapi" }
+cursive = { version = "0.20.0", features = ["crossterm-backend"] }
+futures = "0.3.28"
+log = "0.4.20"
+mediation = { path = "../mediation" }
+mediator = { path = ".." }
+messages = { path = "../../../../messages" }
+serde_json = "1.0.107"
+
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
diff --git a/agents/rust/mediator/src/bin/client-tui.rs → agents/rust/mediator/client-tui/src/main.rs b/agents/rust/mediator/src/bin/client-tui.rs → agents/rust/mediator/client-tui/src/main.rs
@@ -1,10 +1,9 @@
 /// Aries Agent TUI
-#[cfg(feature = "client_tui")]
+mod tui;
 #[tokio::main]
 async fn main() {
     use mediator::{
         aries_agent::AgentBuilder,
-        tui,
         utils::binary_utils::{load_dot_env, setup_logging},
     };
 
@@ -15,10 +14,9 @@ async fn main() {
     tui::init_tui(agent).await;
 }
 
-#[cfg(not(feature = "client_tui"))]
-fn main() {
-    print!(
-        "This is a placeholder binary. Please enable \"client_tui\" feature to to build the \
-         functional client_tui binary."
-    )
-}
+// fn main() {
+//     print!(
+//         "This is a placeholder binary. Please enable \"client_tui\" feature to to build the \
+//          functional client_tui binary."
+//     )
+// }
diff --git a/agents/rust/mediator/src/tui.rs → agents/rust/mediator/client-tui/src/tui.rs b/agents/rust/mediator/src/tui.rs → agents/rust/mediator/client-tui/src/tui.rs
@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{extract::State, Json};
+use client_webapi::http_routes::handle_register;
 use cursive::{
     direction::Orientation,
     event::Key,
@@ -15,10 +16,9 @@ use cursive::{
 use futures::executor::block_on;
 use log::info;
 use mediation::storage::MediatorPersistence;
+use mediator::aries_agent::Agent;
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 
-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();
     cursive.add_global_callback(Key::Esc, |s| s.quit());

diff --git a/agents/rust/mediator/client-webapi/Cargo.toml b/agents/rust/mediator/client-webapi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "client-webapi"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/agents/rust/mediator/client-webapi/src/lib.rs b/agents/rust/mediator/client-webapi/src/lib.rs
@@ -0,0 +1 @@
+pub mod http_routes;
diff --git a/agents/rust/mediator/client-webapi/src/main.rs b/agents/rust/mediator/client-webapi/src/main.rs
@@ -1,9 +1,7 @@
 /// Client-side focused api accessible Aries Agent
-mod http_routes;
-
 #[tokio::main]
 async fn main() {
-    use http_routes::build_client_router;
+    use client_webapi::http_routes::build_client_router;
     use mediator::{
         aries_agent::AgentBuilder,
         utils::binary_utils::{load_dot_env, setup_logging},

diff --git a/agents/rust/mediator/src/lib.rs b/agents/rust/mediator/src/lib.rs
@@ -2,6 +2,3 @@ pub mod aries_agent;
 pub mod didcomm_handlers;
 pub mod http_routes;
 pub mod utils;
-
-#[cfg(feature = "client_tui")]
-pub mod tui;