refactor: update subgraph client results

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/monitor/src/client/subgraph_client.rs

@@ -26,24 +26,26 @@ impl DeploymentDetails {
         graph_node_base_url: &str,
         deployment: DeploymentId,
     ) -> Result<Self, anyhow::Error> {
-        Self::for_graph_node_url(
+        Ok(Self::for_graph_node_url(
             Url::parse(graph_node_status_url)?,
             Url::parse(graph_node_base_url)?,
             deployment,
-        )
+        ))
     }
 
     pub fn for_graph_node_url(
         graph_node_status_url: Url,
         graph_node_base_url: Url,
         deployment: DeploymentId,
-    ) -> Result<Self, anyhow::Error> {
-        Ok(Self {
+    ) -> Self {
+        Self {
             deployment: Some(deployment),
             status_url: Some(graph_node_status_url),
-            query_url: graph_node_base_url.join(&format!("subgraphs/id/{deployment}"))?,
+            query_url: graph_node_base_url
+                .join(&format!("subgraphs/id/{deployment}"))
+                .expect("Must be correct"),
             query_auth_token: None,
-        })
+        }
     }
 
     pub fn for_query_url(query_url: &str) -> Result<Self, anyhow::Error> {
@@ -55,14 +57,8 @@ impl DeploymentDetails {
         })
     }
 
-    pub fn for_query_url_with_token(
-        query_url: &str,
-        query_auth_token: Option<String>,
-    ) -> Result<Self, anyhow::Error> {
-        Ok(Self::for_query_url_with_token_url(
-            Url::parse(query_url)?,
-            query_auth_token,
-        ))
+    pub fn for_query_url_with_token(query_url: Url, query_auth_token: Option<String>) -> Self {
+        Self::for_query_url_with_token_url(query_url, query_auth_token)
     }
 
     pub fn for_query_url_with_token_url(query_url: Url, query_auth_token: Option<String>) -> Self {

crates/tap-agent/src/agent.rs

@@ -71,18 +71,13 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     let network_subgraph = Box::leak(Box::new(
         SubgraphClient::new(
             http_client.clone(),
-            network_deployment_id
-                .map(|deployment| {
-                    DeploymentDetails::for_graph_node_url(
-                        graph_node_status_endpoint.clone(),
-                        graph_node_query_endpoint.clone(),
-                        deployment,
-                    )
-                })
-                .transpose()
-                .expect(
-                    "Failed to parse graph node query endpoint and network subgraph deployment",
-                ),
+            network_deployment_id.map(|deployment| {
+                DeploymentDetails::for_graph_node_url(
+                    graph_node_status_endpoint.clone(),
+                    graph_node_query_endpoint.clone(),
+                    deployment,
+                )
+            }),
             DeploymentDetails::for_query_url_with_token_url(
                 network_query_url.clone(),
                 network_query_auth_token.clone(),
@@ -103,16 +98,13 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     let escrow_subgraph = Box::leak(Box::new(
         SubgraphClient::new(
             http_client.clone(),
-            escrow_deployment_id
-                .map(|deployment| {
-                    DeploymentDetails::for_graph_node_url(
-                        graph_node_status_endpoint.clone(),
-                        graph_node_query_endpoint.clone(),
-                        deployment,
-                    )
-                })
-                .transpose()
-                .expect("Failed to parse graph node query endpoint and escrow subgraph deployment"),
+            escrow_deployment_id.map(|deployment| {
+                DeploymentDetails::for_graph_node_url(
+                    graph_node_status_endpoint.clone(),
+                    graph_node_query_endpoint.clone(),
+                    deployment,
+                )
+            }),
             DeploymentDetails::for_query_url_with_token_url(
                 escrow_query_url.clone(),
                 escrow_query_auth_token.clone(),