Use payjoin-io in integration tests

Author: jbesraa

Cargo.lock

@@ -46,6 +46,7 @@ tokio = { version = "1.12.0", features = ["full"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 ureq = "2.9.4"
+payjoin-io = { path = "../payjoin-io", features = ["danger-local-https"]}
 
 [package.metadata.docs.rs]
 features = ["send", "receive", "base64", "v2"]    

payjoin/Cargo.toml

@@ -70,7 +70,9 @@ mod integration {
         struct HeaderMock(HashMap<String, String>);
 
         impl Headers for HeaderMock {
-            fn get_header(&self, key: &str) -> Option<&str> { self.0.get(key).map(|e| e.as_str()) }
+            fn get_header(&self, key: &str) -> Option<&str> {
+                self.0.get(key).map(|e| e.as_str())
+            }
         }
 
         impl HeaderMock {
@@ -276,7 +278,7 @@ mod integration {
                 wait_for_service_ready(ohttp_relay.clone(), agent.clone()).await.unwrap();
                 wait_for_service_ready(directory.clone(), agent.clone()).await.unwrap();
                 let ohttp_keys =
-                    fetch_ohttp_keys(&ohttp_relay, &directory, cert_der.clone()).await?;
+                    fetch_ohttp_keys(ohttp_relay, directory.clone(), cert_der.clone()).await?;
 
                 // **********************
                 // Inside the Receiver:
@@ -388,7 +390,7 @@ mod integration {
                 wait_for_service_ready(ohttp_relay.clone(), agent.clone()).await.unwrap();
                 wait_for_service_ready(directory.clone(), agent.clone()).await.unwrap();
                 let ohttp_keys =
-                    fetch_ohttp_keys(&ohttp_relay, &directory, cert_der.clone()).await?;
+                    fetch_ohttp_keys(ohttp_relay, directory.clone(), cert_der.clone()).await?;
 
                 let mut enrolled =
                     enroll_with_directory(directory, ohttp_keys.clone(), cert_der.clone()).await?;
@@ -525,38 +527,16 @@ mod integration {
         }
 
         async fn fetch_ohttp_keys(
-            ohttp_relay: &Url,
-            directory: &Url,
+            ohttp_relay: Url,
+            directory: Url,
             cert_der: Vec<u8>,
-        ) -> Result<payjoin::OhttpKeys, BoxError> {
-            let ohttp_relay = ohttp_relay.clone();
-            let directory_ohttp_keys = directory.join("/ohttp-keys")?;
-            let res = spawn_blocking(move || {
-                http_proxy(cert_der, &ohttp_relay)
-                    .unwrap()
-                    .get(directory_ohttp_keys.as_str())
-                    .call()
+        ) -> Result<payjoin::OhttpKeys, payjoin::V2Error> {
+            let res = tokio::task::spawn_blocking(move || {
+                payjoin_io::fetch_ohttp_keys(ohttp_relay.clone(), directory.clone(), cert_der)
             })
-            .await??;
-            assert_eq!(res.status(), 200, "Failed to connect to target {}", res.status());
-            let mut body = Vec::new();
-            let _ = res.into_reader().read_to_end(&mut body)?;
-            Ok(payjoin::OhttpKeys::decode(&body)?)
-        }
-
-        /// Normalize the Url to include the port for ureq. ureq has a bug
-        /// which makes Proxy::new(...) use port 8080 for all input with scheme
-        /// http regardless of the port included in the Url. This prevents that.
-        /// https://github.com/algesten/ureq/pull/717
-        fn normalize_proxy_url(proxy: &Url) -> Result<String, BoxError> {
-            let scheme = proxy.scheme();
-            let host = proxy.host_str().ok_or("No host")?;
-
-            if scheme == "http" || scheme == "https" {
-                Ok(format!("{}:{}", host, proxy.port().unwrap_or(80)))
-            } else {
-                Ok(proxy.as_str().to_string())
-            }
+            .await
+            .map_err(|e| e.to_string())??;
+            Ok(res)
         }
 
         async fn enroll_with_directory(
@@ -692,11 +672,6 @@ mod integration {
             Ok(http_agent_builder(cert_der)?.build())
         }
 
-        fn http_proxy(cert_der: Vec<u8>, proxy: &Url) -> Result<Agent, BoxError> {
-            let proxy = ureq::Proxy::new(normalize_proxy_url(proxy)?)?;
-            Ok(http_agent_builder(cert_der)?.proxy(proxy).build())
-        }
-
         fn http_agent_builder(cert_der: Vec<u8>) -> Result<AgentBuilder, BoxError> {
             use rustls::client::ClientConfig;
             use rustls::pki_types::CertificateDer;
@@ -711,7 +686,9 @@ mod integration {
             Ok(AgentBuilder::new().tls_config(Arc::new(client_config)))
         }
 
-        fn is_success(status: u16) -> bool { status >= 200 && status < 300 }
+        fn is_success(status: u16) -> bool {
+            status >= 200 && status < 300
+        }
 
         fn find_free_port() -> u16 {
             let listener = std::net::TcpListener::bind("0.0.0.0:0").unwrap();