remove APIError::CannotOpenChannel

RGB-Tools · Nov 5, 2024 · 13f36bd · 13f36bd
1 parent ed92339
commit 13f36bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -35,9 +35,6 @@ pub enum APIError {
     #[error("Batch transfer cannot be set to failed status")]
     CannotFailBatchTransfer,
 
-    #[error("Cannot open channel: {0}")]
-    CannotOpenChannel(String),
-
     #[error("Cannot call other APIs while node is changing state")]
     ChangingState,
 
@@ -315,7 +312,6 @@ impl IntoResponse for APIError {
             | APIError::BatchTransferNotFound
             | APIError::CannotEstimateFees
             | APIError::CannotFailBatchTransfer
-            | APIError::CannotOpenChannel(_)
             | APIError::ChangingState
             | APIError::FailedBroadcast(_)
             | APIError::FailedBitcoindConnection(_)

diff --git a/src/routes.rs b/src/routes.rs
@@ -2745,8 +2745,7 @@ pub(crate) async fn open_channel(
                 )
             })
             .await
-            .unwrap()
-            .map_err(|e| APIError::CannotOpenChannel(format!("{:?}", e)))?;
+            .unwrap()?;
         }
 
         *unlocked_state.rgb_send_lock.lock().unwrap() = true;

diff --git a/src/test/openchannel_fail.rs b/src/test/openchannel_fail.rs
@@ -297,8 +297,8 @@ async fn open_fail() {
     check_response_is_nok(
         res,
         reqwest::StatusCode::FORBIDDEN,
-        "Cannot open channel: InsufficientAllocationSlots",
-        "CannotOpenChannel",
+        "No uncolored UTXOs are available (hint: call createutxos)",
+        "NoAvailableUtxos",
     )
     .await;