From ab59cd9db20200200419b058bca886c917216962 Mon Sep 17 00:00:00 2001
From: f321x <f321x@tutamail.com>
Date: Thu, 27 Jun 2024 13:46:17 +0000
Subject: [PATCH] commit remaining changes

---
 .../coordinator/src/communication/mod.rs       | 18 +++---------------
 .../coordinator/src/communication/utils.rs     | 12 ++++++++++++
 .../coordinator/src/wallet/mod.rs              |  2 +-
 .../trader/src/communication/api.rs            |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/taptrade-cli-demo/coordinator/src/communication/mod.rs b/taptrade-cli-demo/coordinator/src/communication/mod.rs
index ab03882..5d15dba 100755
--- a/taptrade-cli-demo/coordinator/src/communication/mod.rs
+++ b/taptrade-cli-demo/coordinator/src/communication/mod.rs
@@ -10,24 +10,12 @@ use axum::{
 	routing::post,
 	Extension, Json, Router,
 };
-use rand::{distributions::Alphanumeric, Rng};
+use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use tokio::net::TcpListener;
 // use crate::coordinator::verify_psbt;
 
-fn generate_random_order_id(len: usize) -> String {
-	// Generate `len` random bytes
-	let bytes: Vec<u8> = rand::thread_rng()
-		.sample_iter(&rand::distributions::Standard)
-		.take(len)
-		.collect();
-
-	// Convert bytes to hex string
-	let hex_string = hex::encode(bytes);
-	hex_string
-}
-
 //
 // Axum handler functions
 //
@@ -65,13 +53,13 @@ async fn submit_maker_bond(
 		.validate_bond_tx_hex(&payload.signed_bond_hex, &bond_requirements)
 		.await?;
 
-	// insert bond into sql database
+	// insert bond into sql database and move offer to different table
 	let bond_locked_until_timestamp = database
 		.move_offer_to_active(&payload, &offer_id_hex)
 		.await?;
 
 	// begin monitoring bond -> async loop monitoring bonds in sql table "active_maker_offers" -> see ../coordinator/monitoring.rs
-	// show trade to orderbook -> orderbook endpoint will scan sql table "active_maker_offers"
+	// show trade to orderbook -> orderbook endpoint will scan sql table "active_maker_offers" and return fitting results
 
 	// Create the JSON response
 	Ok(Json(OrderActivatedResponse {
diff --git a/taptrade-cli-demo/coordinator/src/communication/utils.rs b/taptrade-cli-demo/coordinator/src/communication/utils.rs
index cf7eff9..d91d2b9 100644
--- a/taptrade-cli-demo/coordinator/src/communication/utils.rs
+++ b/taptrade-cli-demo/coordinator/src/communication/utils.rs
@@ -29,3 +29,15 @@ impl OrderRequest {
 		Ok(())
 	}
 }
+
+pub fn generate_random_order_id(len: usize) -> String {
+	// Generate `len` random bytes
+	let bytes: Vec<u8> = rand::thread_rng()
+		.sample_iter(&rand::distributions::Standard)
+		.take(len)
+		.collect();
+
+	// Convert bytes to hex string
+	let hex_string = hex::encode(bytes);
+	hex_string
+}
diff --git a/taptrade-cli-demo/coordinator/src/wallet/mod.rs b/taptrade-cli-demo/coordinator/src/wallet/mod.rs
index 9cfa047..31092f3 100644
--- a/taptrade-cli-demo/coordinator/src/wallet/mod.rs
+++ b/taptrade-cli-demo/coordinator/src/wallet/mod.rs
@@ -63,7 +63,7 @@ impl CoordinatorWallet {
 		// let result = verify_tx(&tx, wallet.database(), blockchain);
 
 		// let valid = tx.verify_tx();
-		panic!("Not implemented");
+		panic!("Bond verification not implemented!");
 		Ok(true)
 	}
 }
diff --git a/taptrade-cli-demo/trader/src/communication/api.rs b/taptrade-cli-demo/trader/src/communication/api.rs
index ee31cce..3078a31 100644
--- a/taptrade-cli-demo/trader/src/communication/api.rs
+++ b/taptrade-cli-demo/trader/src/communication/api.rs
@@ -34,7 +34,7 @@ pub struct BondSubmissionRequest {
 #[derive(Debug, Deserialize)]
 pub struct OrderActivatedResponse {
 	pub order_id_hex: String,
-	pub bond_locked_until_timestamp: u128, // unix timestamp. Do not touch bond till then unless offer gets taken.
+	pub bond_locked_until_timestamp: u64, // unix timestamp. Do not touch bond till then unless offer gets taken.
 }
 
 #[derive(Debug, Serialize)]