From 0e7e341bfbab4f901875f87759cbfe6ab75c56fd Mon Sep 17 00:00:00 2001
From: mjovanc <mjovanc@icloud.com>
Date: Sun, 21 May 2023 01:37:17 +0200
Subject: [PATCH] Fixing shit

---
 src/main.rs          | 14 +-------
 src/syncers/hugin.rs | 81 ++++++++++++++++++++++----------------------
 src/types.rs         |  2 +-
 3 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index bf760bc..0a3bac4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,6 @@ mod syncers;
 mod types;
 
 use env_logger::Env;
-use rocket::tokio::runtime::Builder;
 
 #[macro_use]
 extern crate rocket;
@@ -22,18 +21,7 @@ fn internal_error() -> &'static str {
 #[launch]
 fn rocket() -> _ {
     // initialize logger
-    env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
-
-    // initialize tokio runtime
-    let tokio_runtime = Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .expect("Failed to build Tokio runtime");
-
-    // spawn the syncers
-    tokio_runtime.spawn(async {
-        syncers::hugin::hugin_syncer().await;
-    });
+    // env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
 
     // launch the rocket server
     rocket::build()
diff --git a/src/syncers/hugin.rs b/src/syncers/hugin.rs
index 4726819..0d3fc56 100644
--- a/src/syncers/hugin.rs
+++ b/src/syncers/hugin.rs
@@ -1,53 +1,60 @@
 use crate::types::PoolChangesLiteRequest;
 use log::{info, warn};
 use reqwest::header::HeaderMap;
-use reqwest::header::CONTENT_TYPE;
-use rocket::http::hyper::HeaderValue;
-use std::{thread, time};
+use rocket::tokio::task::{self, spawn};
+use serde_json::json;
+use std::{sync::Arc, thread, time};
 
-//async fn get_pool_changes_lite() -> String {}
+async fn get_info() -> Result<(), reqwest::Error> {
+    let client = reqwest::Client::new();
+    let response = client
+        .get("http://privacymine.net:11898/info")
+        .send()
+        .await?;
+
+    println!("response status: {:?}", response.status());
 
-async fn get_pool_changes_lite(body: &str) -> String {
+    Ok(())
+}
+
+async fn get_pool_changes_lite() {
+    let known = vec![""];
+    let body = serde_json::to_string(&json!({ "knownTxsIds": known })).unwrap();
     let body = body.to_string();
 
     // set headers
     let mut headers = HeaderMap::new();
-    headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
+    headers.insert("Content-Type", "application/json".parse().unwrap());
 
     // set node and request endpoint
-    let ip = String::from("privacymine.net");
+    let ip = String::from("blocksum.org");
     let port = String::from("11898");
-    let url = format!("http://{}:{}/{}", ip, port, "get_pool_changes_lite");
+    let endpoint = String::from("get_pool_changes_lite");
+    let url = format!("http://{}:{}/{}", ip, port, endpoint);
 
     // make the post request
     let client = reqwest::Client::new();
-    let request = client
-        .post(&url)
-        .headers(headers.clone())
-        .body(body.clone());
-
-    let response = request.send().await;
-    let response_text = response.unwrap().text().await;
-
-    match response_text {
-        Ok(text) => {
-            info!("Response text: {}", text);
-            text
-        }
-        Err(e) => {
-            warn!("Error: {}", e);
-            String::from("")
-        }
-    }
+    let response = client
+        .post(url)
+        .headers(headers)
+        .body(body)
+        .send()
+        .await
+        .expect("Failed to get response")
+        .text()
+        .await
+        .expect("Failed to get payload");
+
+    println!("response: {:?}", response);
 }
 
 pub async fn hugin_syncer() {
     info!(target: "sync_events", "Starting Hugin syncer...");
 
-    let delay = time::Duration::from_secs(2);
+    let delay = time::Duration::from_secs(5);
     let known = vec!["37669a52df20daf42e74757d05547f9b151ec0383819b377be1c7df59d43e2f8"];
     let pool_changes_lite_req = PoolChangesLiteRequest {
-        known_txs_ids: &known,
+        knownTxsIds: &known,
     };
 
     // run the hugin syncer loop
@@ -55,22 +62,16 @@ pub async fn hugin_syncer() {
         info!("Hugin syncer loop...");
 
         // convert the PoolChangesLiteRequest struct to a json string
-        let json_body = serde_json::to_string(&pool_changes_lite_req);
+        // let json_body = serde_json::to_string(&pool_changes_lite_req);
 
-        println!("json_body: {:?}", json_body);
+        // println!("json_body: {:?}", body);
 
-        match json_body {
-            Ok(body) => {
-                let response = get_pool_changes_lite(&body).await;
-                info!("Response: {}", response);
-
-                // parse the deserialize the response into a PoolChangesLiteResponse
-            }
-            Err(e) => {
-                warn!("Error: {}", e);
-            }
+        if let Err(e) = get_info().await {
+            warn!("Error: {:?}", e);
         }
 
         thread::sleep(delay);
     }
+
+    // get_info().await;
 }
diff --git a/src/types.rs b/src/types.rs
index 660297e..16b43a9 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize)]
 #[serde(crate = "rocket::serde")]
 pub struct PoolChangesLiteRequest<'r> {
-    pub known_txs_ids: &'r Vec<&'r str>,
+    pub knownTxsIds: &'r Vec<&'r str>,
 }
 
 #[derive(Deserialize)]