[DRAFT] Complete e2e integration test

Cargo.toml

@@ -34,8 +34,4 @@ bitcoincore-rpc = "0.15.0"
 tempfile = "3"
 tonic = "0.6.2"
 hyper = { version = "0.14.9", features = ["full"] }
-
-# [test]
-# name = "test"
-# path = "tests/integration.rs"
-# required-features = ["test_paths"]
+hyper-tls = { version = "0.5.0" }

src/http.rs

@@ -13,9 +13,12 @@ const STATIC_DIR: &str = "static";
 
 /// Serve requests to Schedule and execute PayJoins with given options.
 pub async fn serve(sched: Scheduler, bind_addr: SocketAddr) -> Result<(), hyper::Error> {
+    println!("starting server on: http://{}", bind_addr);
     let new_service = make_service_fn(move |_| {
         let sched = sched.clone();
         async move {
+            println!("req on: http://");
+
             let handler = move |req| handle_web_req(sched.clone(), req);
             Ok::<_, hyper::Error>(service_fn(handler))
         }
@@ -48,8 +51,10 @@ async fn handle_web_req(
         }
 
         (&Method::POST, "/pj") => {
-            dbg!(req.uri().query());
+            println!("post on: http://");
 
+            dbg!(req.uri().query());
+            println!("{:?}", req.uri().query());
             let headers = Headers(req.headers().to_owned());
             let query = {
                 let uri = req.uri();

src/lib.rs

@@ -0,0 +1,9 @@
+#[macro_use]
+extern crate serde_derive;
+extern crate configure_me;
+
+pub mod scheduler;
+pub mod http;
+mod args;
+pub mod lnd;
+configure_me::include_config!();

src/main.rs

@@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let scheduled_pj = parse_args(args).expect("failed to parse remaining arguments");
 
-    let scheduler = Scheduler::from_config(&config);
+    let scheduler = Scheduler::from_config(&config).await?;
 
     if let Some(payjoin) = scheduled_pj {
         let address = scheduler.schedule_payjoin(&payjoin).await?;

src/scheduler.rs

@@ -24,6 +24,10 @@ pub struct ScheduledChannel {
 }
 
 impl ScheduledChannel {
+    pub fn new(node: P2PAddress, amount: bitcoin::Amount) -> Self {
+        Self { node, amount }
+    } 
+
     pub(crate) fn from_args(addr: &str, amount: &str) -> Result<Self, ArgError> {
         let node = addr.parse::<P2PAddress>().map_err(ArgError::InvalidNodeAddress)?;
 

tests/compose/docker-compose.yml

@@ -6,10 +6,8 @@ services:
     volumes:
       - "./nginx/reverse-https-proxy.conf:/etc/nginx/nginx.conf"
       - "./nginx/ssl:/etc/ssl"
-    expose:
-      - "3010"
-      - "3000"
-
+    ports:
+      - "3010:3010"
   bitcoind:
     restart: unless-stopped
     image: btcpayserver/bitcoin:22.0