Merge pull request #2999 from ProvableHQ/fix_restquery_response

Improve RESTQuery error

Author: kaimast

.circleci/config.yml

@@ -1063,7 +1063,10 @@ jobs:
           name: Check for unused dependencies
           no_output_timeout: 10m
           command: |
-            cargo install [email protected]
+            set -euo pipefail
+            if ! command -v cargo-machete >/dev/null 2>&1; then
+              cargo install [email protected] --locked
+            fi
             cargo machete
       - clear_environment:
           cache_key: v4.2.0-rust-1.88.0-machete-cache
@@ -1088,7 +1091,8 @@ jobs:
     executor: rust-docker
     resource_class: << pipeline.parameters.twoxlarge >>
     steps:
-      - checkout
+      - checkout:
+          method: full
       - setup_environment:
           cache_key: v4.2.0-rust-1.88.0-cargo-semver-checks-cache
       - run:

ledger/query/src/query/rest.rs

@@ -224,7 +224,7 @@ impl<N: Network> RestQuery<N> {
             .with_context(|| format!("Failed to fetch from {endpoint}"))?;
 
         if response.status().is_success() {
-            response.body_mut().read_json().with_context(|| "Failed to parse JSON response")
+            response.body_mut().read_json().with_context(|| format!("Failed to parse JSON response from {endpoint}"))
         } else {
             let content_type = response
                 .headers()
@@ -236,11 +236,16 @@ impl<N: Network> RestQuery<N> {
             // Convert returned error into an `anyhow::Error`.
             // Depending on the API version, the error is either encoded as a string or as a JSON.
             if content_type.contains("json") {
-                let error: RestError =
-                    response.body_mut().read_json().with_context(|| "Failed to parse JSON error response")?;
+                let error: RestError = response
+                    .body_mut()
+                    .read_json()
+                    .with_context(|| format!("Failed to parse JSON error response from {endpoint}"))?;
                 Err(error.parse().context(format!("Failed to fetch from {endpoint}")))
             } else {
-                let error = response.body_mut().read_to_string().with_context(|| "Failed to read error message")?;
+                let error = response
+                    .body_mut()
+                    .read_to_string()
+                    .with_context(|| format!("Failed to read error message {endpoint}"))?;
                 Err(anyhow!(error).context(format!("Failed to fetch from {endpoint}")))
             }
         }
@@ -256,10 +261,13 @@ impl<N: Network> RestQuery<N> {
         let response = reqwest::get(&endpoint).await.with_context(|| format!("Failed to fetch from {endpoint}"))?;
 
         if response.status().is_success() {
-            response.json().await.with_context(|| "Failed to parse JSON response")
+            response.json().await.with_context(|| format!("Failed to parse JSON response from {endpoint}"))
         } else {
             // Convert returned error into an `anyhow::Error`.
-            let error: RestError = response.json().await.with_context(|| "Failed to parse JSON error response")?;
+            let error: RestError = response
+                .json()
+                .await
+                .with_context(|| format!("Failed to parse JSON error response from {endpoint}"))?;
             Err(error.parse().context(format!("Failed to fetch from {endpoint}")))
         }
     }