fix(httpd): move the httpd test macro to the httpd crate

Signed-off-by: Tarek <tareknaser360@gmail.com>

coffee_httpd/src/httpd.rs

@@ -1,2 +1,3 @@
 pub mod server;
 pub use server::*;
+pub mod macros;

coffee_httpd/src/httpd/macros.rs

@@ -0,0 +1,15 @@
+/// handle_httpd_response macro is the macro that handles HTTPD responses
+#[macro_export]
+macro_rules! handle_httpd_response {
+ ($result:expr, $msg:expr) => {
+ match $result {
+ Ok(_) => Ok(HttpResponse::Ok().body(format!($msg))),
+ Err(err) => Err(actix_web::error::ErrorInternalServerError(format!(
+ "Error: {}",
+ err
+ ))),
+ }
+ };
+}
+
+pub use handle_httpd_response;

coffee_httpd/src/httpd/server.rs

@@ -13,8 +13,8 @@ use std::sync::Arc;
 use serde_json::Value;
 use tokio::sync::Mutex;
 
+use super::macros::handle_httpd_response;
 use coffee_core::coffee::CoffeeManager;
-use coffee_lib::macros::handle_httpd_response;
 use coffee_lib::plugin_manager::PluginManager;
 use coffee_lib::types::request::*;
 

coffee_httpd/src/main.rs

@@ -15,7 +15,9 @@ async fn main() {
  println!("{err}");
  }
  let mut coffee = coffee.unwrap();
- coffee.setup(&cmd.cln_path).await.unwrap();
+ if let Err(err) = coffee.setup(&cmd.cln_path).await {
+ println!("{err}");
+ }
 
  let port = cmd.port.unwrap_or(8080) as u16;
  log::info!("Running on port 127.0.0.1:{port}");

coffee_lib/Cargo.toml

@@ -12,3 +12,6 @@ log = "0.4.17"
 env_logger = "0.9.3"
 tokio = { version = "1.22.0", features = ["process"] }
 paperclip = { version = "0.8.0", features = ["actix4"] }
+
+[features]
+httpd = ["paperclip/actix4"]

coffee_lib/src/macros.rs

@@ -48,18 +48,4 @@ macro_rules! sh {
  };
 }
 
-/// handle_httpd_response macro is the macro that handles HTTPD responses
-#[macro_export]
-macro_rules! handle_httpd_response {
- ($result:expr, $msg:expr) => {
- match $result {
- Ok(_) => Ok(HttpResponse::Ok().body(format!($msg))),
- Err(err) => Err(actix_web::error::ErrorInternalServerError(format!(
- "Error: {}",
- err
- ))),
- }
- };
-}
-
-pub use {error, handle_httpd_response, sh};
+pub use {error, sh};

coffee_lib/src/types/mod.rs

@@ -5,11 +5,6 @@ pub mod request {
  use paperclip::actix::Apiv2Schema;
  use serde::{Deserialize, Serialize};
 
- #[derive(Debug, Deserialize, Apiv2Schema, Serialize)]
- pub struct Setup {
- pub cln_dir: String,
- }
-
  #[derive(Debug, Deserialize, Apiv2Schema, Serialize)]
  pub struct Install {
  pub plugin: String,

coffee_testing/src/lib.rs

@@ -42,7 +42,7 @@ pub mod macros {
 
  #[macro_export]
  macro_rules! httpd {
- ($dir:expr, $port:expr, $cln_path:expr, $($opt_args:tt)*) => {
+ ($dir:expr, $port:expr, $($opt_args:tt)*) => {
  async {
  use tokio::process::Command;
 
@@ -57,7 +57,6 @@ pub mod macros {
  .args(&args_tok)
  .arg("--host=127.0.0.1")
  .arg(format!("--port={}", $port))
- .arg(format!("--cln-path={}", $cln_path))
  .arg(format!("--data-dir={}", $dir.path().to_str().unwrap()))
  .spawn()
  }.await
@@ -177,7 +176,12 @@ impl CoffeeHTTPDTesting {
  pub async fn tmp(cln_path: String) -> anyhow::Result<Self> {
  let dir = tempfile::tempdir()?;
  let port = port::random_free_port().unwrap();
- let child = httpd!(dir, port, cln_path, "{}", format!("--network=regtest"))?;
+ let child = httpd!(
+ dir,
+ port,
+ "{}",
+ format!("--network=regtest --cln-path={cln_path}")
+ )?;
  wait_for!(async { reqwest::get(format!("http://127.0.0.1:{}/list", port)).await });
  Ok(Self {
  root_path: Arc::new(dir),

tests/src/coffee_httpd_integration_tests.rs

@@ -7,7 +7,7 @@ use coffee_testing::CoffeeHTTPDTesting;
 use crate::init;
 
 #[tokio::test(flavor = "multi_thread")]
-// #[ntest::timeout(560000)]
+#[ntest::timeout(560000)]
 pub async fn httpd_init_add_remote() {
  init();