Zaino-Serve 2.0

Cargo.toml

@@ -57,7 +57,7 @@ tracing-futures = "0.2"
 # Network / RPC
 http = "1.1"
 url = "2.5"
-reqwest = "0.12"
+reqwest = { version = "0.12", features = ["cookies"] }
 tower = { version = "0.4", features = ["buffer", "util"] }
 tonic = "0.12"
 tonic-build = "0.12"

integration-tests/tests/wallet_to_validator.rs

@@ -8,6 +8,8 @@ use zingo_infra_testutils::services::validator::Validator;
 use zingolib::testutils::lightclient::from_inputs;
 
 mod wallet_basic {
+    use zaino_fetch::jsonrpc::connector::test_node_and_return_url;
+
     use super::*;
 
     #[tokio::test]
@@ -188,19 +190,19 @@ mod wallet_basic {
 
         test_manager.local_net.generate_blocks(1).await.unwrap();
 
-        let fetch_service = zaino_fetch::jsonrpc::connector::JsonRpcConnector::new(
-            url::Url::parse(&format!(
-                "http://127.0.0.1:{}",
-                test_manager.zebrad_rpc_listen_port
-            ))
-            .expect("Failed to construct URL")
-            .as_str()
-            .try_into()
-            .expect("Failed to convert URL to URI"),
-            Some("xxxxxx".to_string()),
-            Some("xxxxxx".to_string()),
+        let fetch_service = zaino_fetch::jsonrpc::connector::JsonRpcConnector::new_with_basic_auth(
+            test_node_and_return_url(
+                test_manager.zebrad_rpc_listen_address,
+                false,
+                None,
+                Some("xxxxxx".to_string()),
+                Some("xxxxxx".to_string()),
+            )
+            .await
+            .unwrap(),
+            "xxxxxx".to_string(),
+            "xxxxxx".to_string(),
         )
-        .await
         .unwrap();
 
         println!("\n\nFetching Chain Height!\n");
@@ -490,19 +492,19 @@ mod wallet_basic {
 
         // test_manager.local_net.print_stdout();
 
-        let fetch_service = zaino_fetch::jsonrpc::connector::JsonRpcConnector::new(
-            url::Url::parse(&format!(
-                "http://127.0.0.1:{}",
-                test_manager.zebrad_rpc_listen_port
-            ))
-            .expect("Failed to construct URL")
-            .as_str()
-            .try_into()
-            .expect("Failed to convert URL to URI"),
-            Some("xxxxxx".to_string()),
-            Some("xxxxxx".to_string()),
+        let fetch_service = zaino_fetch::jsonrpc::connector::JsonRpcConnector::new_with_basic_auth(
+            test_node_and_return_url(
+                test_manager.zebrad_rpc_listen_address,
+                false,
+                None,
+                Some("xxxxxx".to_string()),
+                Some("xxxxxx".to_string()),
+            )
+            .await
+            .unwrap(),
+            "xxxxxx".to_string(),
+            "xxxxxx".to_string(),
         )
-        .await
         .unwrap();
 
         println!("\n\nFetching Raw Mempool!\n");