From 846a6cb179b510382828997ada0111c31167a196 Mon Sep 17 00:00:00 2001
From: f321x <f321x@tutamail.com>
Date: Tue, 25 Jun 2024 11:04:30 +0000
Subject: [PATCH] fix broken imports

---
 taptrade-cli-demo/coordinator/Cargo.lock      | 29 +++++++++++++++++++
 taptrade-cli-demo/coordinator/Cargo.toml      |  7 ++---
 .../coordinator/src/communication/mod.rs      | 19 ++++++------
 taptrade-cli-demo/coordinator/src/main.rs     | 11 ++++---
 .../trader/src/communication/mod.rs           |  6 +---
 taptrade-cli-demo/trader/src/main.rs          |  3 +-
 6 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/taptrade-cli-demo/coordinator/Cargo.lock b/taptrade-cli-demo/coordinator/Cargo.lock
index 4a94dab..5104a54 100644
--- a/taptrade-cli-demo/coordinator/Cargo.lock
+++ b/taptrade-cli-demo/coordinator/Cargo.lock
@@ -309,6 +309,7 @@ dependencies = [
  "serde",
  "sqlx",
  "tokio",
+ "tower",
 ]
 
 [[package]]
@@ -711,6 +712,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1113,6 +1120,16 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.36.0"
@@ -1697,6 +1714,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -2099,7 +2125,10 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
+ "num_cpus",
+ "parking_lot 0.12.3",
  "pin-project-lite",
+ "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys 0.48.0",
diff --git a/taptrade-cli-demo/coordinator/Cargo.toml b/taptrade-cli-demo/coordinator/Cargo.toml
index b43b8b1..278291b 100644
--- a/taptrade-cli-demo/coordinator/Cargo.toml
+++ b/taptrade-cli-demo/coordinator/Cargo.toml
@@ -5,17 +5,16 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.86"
-axum = "0.7.5"
+axum = { version = "0.7.5", features = ["tokio", "json"] }
 bdk = "0.29.0"
 dotenv = "0.15.0"
 reqwest = { version = "0.12.4", features = ["blocking", "json"] }
 serde = "1.0.203"
 sqlx = { version = "0.7.4", features = ["runtime-tokio", "sqlite"] }
-tokio = "1.38.0"
+tokio = { version = "1.38.0", features = ["full"] }
+tower = "0.4.13"
 
 [profile.release]
 lto = true
 opt-level = 3
 strip = true
-anyhow = "1.0.86"
-hex = "0.4"
diff --git a/taptrade-cli-demo/coordinator/src/communication/mod.rs b/taptrade-cli-demo/coordinator/src/communication/mod.rs
index 9526af3..5e541ff 100755
--- a/taptrade-cli-demo/coordinator/src/communication/mod.rs
+++ b/taptrade-cli-demo/coordinator/src/communication/mod.rs
@@ -1,18 +1,17 @@
 mod api;
 
-use reqwest::StatusCode;
-use axum::{routing::post, Json, Router, response::{IntoResponse, Response}, };
+use self::api::*;
+use super::*;
+use axum::{
+	http::StatusCode,
+	response::{IntoResponse, Response},
+	routing::post,
+	Extension, Json, Router,
+};
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use tokio::net::TcpListener;
-// use super::*;
-// use api::{BondRequirementResponse, BondSubmissionRequest, OrderActivatedResponse, OrderRequest};
-// use axum::{
-// 	http::StatusCode, response::IntoResponse, response::Response, routing::post, Extension, Json,
-// 	Router,
-// };
-// use sqlx::sqlite::SqliteLockingMode;
-use crate::verify_bond::verify_psbt;
+// use crate::coordinator::verify_psbt;
 
 // Handler function to process the received data
 async fn receive_order(
diff --git a/taptrade-cli-demo/coordinator/src/main.rs b/taptrade-cli-demo/coordinator/src/main.rs
index bbb64f7..22d9ea2 100755
--- a/taptrade-cli-demo/coordinator/src/main.rs
+++ b/taptrade-cli-demo/coordinator/src/main.rs
@@ -6,7 +6,6 @@ use bdk::database::MemoryDatabase;
 use bdk::Wallet;
 use communication::api_server;
 use dotenv::dotenv;
-use serde::{Deserialize, Serialize};
 use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite};
 use std::env;
 use std::sync::Arc;
@@ -28,11 +27,11 @@ async fn main() -> Result<()> {
 		.unwrap();
 	let shared_db_pool: Arc<sqlx::Pool<sqlx::Sqlite>> = Arc::new(db_pool);
 
-	let coordinator = Coordinator {
-		db_pool: shared_db_pool,
-		wallet: // impl wallet
-	};
+	// let coordinator = Coordinator {
+	// 	db_pool: shared_db_pool,
+	// 	wallet: // impl wallet
+	// };
 
-	api_server(coordinator).await?;
+	// api_server(coordinator).await?;
 	Ok(())
 }
diff --git a/taptrade-cli-demo/trader/src/communication/mod.rs b/taptrade-cli-demo/trader/src/communication/mod.rs
index f464f99..1f92842 100644
--- a/taptrade-cli-demo/trader/src/communication/mod.rs
+++ b/taptrade-cli-demo/trader/src/communication/mod.rs
@@ -7,11 +7,7 @@ use crate::{
 	wallet::{bond::Bond, musig2::MuSigData},
 };
 use anyhow::{anyhow, Result};
-use api::{
-	BondRequirementResponse, BondSubmissionRequest, IsOfferReadyRequest, OfferTakenRequest,
-	OfferTakenResponse, OrderActivatedResponse, OrderRequest, PayoutPsbtResponse,
-	PsbtSubmissionRequest, TradeObligationsSatisfied,
-};
+use api::*;
 use bdk::bitcoin::consensus::encode::serialize_hex;
 use bdk::{
 	bitcoin::{consensus::Encodable, psbt::PartiallySignedTransaction},
diff --git a/taptrade-cli-demo/trader/src/main.rs b/taptrade-cli-demo/trader/src/main.rs
index 102110d..b74a085 100644
--- a/taptrade-cli-demo/trader/src/main.rs
+++ b/taptrade-cli-demo/trader/src/main.rs
@@ -4,10 +4,9 @@ mod communication;
 mod trading;
 mod wallet;
 
-use core::panic;
-
 use anyhow::{anyhow, Result};
 use cli::CliSettings;
+use core::panic;
 
 fn start_trade_pipeline(cli_input: &CliSettings) -> Result<()> {
 	match cli_input {