refactor(error): return ribosome errors to caller

Author: jost-s

src/error.rs

@@ -4,6 +4,8 @@ use crate::app_selection::AppSelectionError;
 use axum::http::StatusCode;
 use axum::response::IntoResponse;
 use axum::Json;
+use holochain_client::ConductorApiError;
+use holochain_conductor_api::ExternalApiWireError;
 use serde::{Deserialize, Serialize};
 
 /// Core HTTP Gateway error type
@@ -72,6 +74,9 @@ impl HcHttpGatewayError {
             HcHttpGatewayError::AppSelectionError(AppSelectionError::MultipleMatching) => {
                 (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
             }
+            HcHttpGatewayError::HolochainError(ConductorApiError::ExternalApiWireError(
+                ExternalApiWireError::RibosomeError(e),
+            )) => (StatusCode::INTERNAL_SERVER_ERROR, e),
             _ => (
                 StatusCode::INTERNAL_SERVER_ERROR,
                 "Something went wrong".to_string(),

src/routes/zome_call/tests/responses.rs

@@ -3,6 +3,7 @@ use crate::config::{AllowedFns, Configuration};
 use crate::test::data::new_test_app_info;
 use crate::test::router::TestRouter;
 use crate::{MockAdminCall, MockAppCall};
+use holochain::holochain_wasmer_host::prelude::WasmErrorInner;
 use holochain_client::{ConductorApiError, ExternIO};
 use holochain_conductor_api::ExternalApiWireError;
 use holochain_types::prelude::DnaHash;
@@ -54,6 +55,32 @@ async fn happy_zome_call() {
     assert_eq!(body, r#""return_value""#);
 }
 
+#[tokio::test]
+async fn ribosome_errors_are_returned() {
+    let mut app_call = MockAppCall::new();
+    app_call
+        .expect_handle_zome_call()
+        .returning(|_, _, _, _, _| {
+            Box::pin(async move {
+                // A bit contrived this error, but close enough to reality.
+                Err(crate::HcHttpGatewayError::HolochainError(
+                    ConductorApiError::ExternalApiWireError(ExternalApiWireError::RibosomeError(
+                        format!(
+                            "{:?}",
+                            WasmErrorInner::Guest("could not find record xyz".to_string())
+                        ),
+                    )),
+                ))
+            })
+        });
+    let router = create_test_router(app_call);
+    let (status_code, body) = router
+        .request(&format!("/{DNA_HASH}/{APP_ID}/coordinator/fn_name"))
+        .await;
+    assert_eq!(status_code, StatusCode::INTERNAL_SERVER_ERROR);
+    assert_eq!(body, r#"{"error":"Guest(\"could not find record xyz\")"}"#);
+}
+
 #[tokio::test]
 async fn app_not_found() {
     let mut app_call = MockAppCall::new();
@@ -97,7 +124,7 @@ async fn cell_not_found() {
 }
 
 #[tokio::test]
-async fn external_api_wire_error() {
+async fn other_external_api_wire_error() {
     let mut app_call = MockAppCall::new();
     app_call
         .expect_handle_zome_call()