Merge pull request #47 from internet-computer-protocol/cycles-error

Enhance `TooFewCycles` error
dfinity · Sep 25, 2023 · a272c4b · a272c4b
2 parents 45211c6 + 69932eb
commit a272c4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/candid/ic_eth.did b/candid/ic_eth.did
@@ -2,7 +2,7 @@ type Auth = variant { Rpc; RegisterProvider; FreeRpc; Admin };
 type EthRpcError = variant {
   ServiceUrlHostNotAllowed;
   HttpRequestError : record { code : nat32; message : text };
-  TooFewCycles : text;
+  TooFewCycles : record { expected : nat; received : nat };
   ServiceUrlParseError;
   ServiceUrlHostMissing;
   ProviderNotFound;

diff --git a/src/http.rs b/src/http.rs
@@ -34,9 +34,10 @@ pub async fn do_http_request(
     }
     if !is_authorized(Auth::FreeRpc) {
         if cycles_available < cost {
-            return Err(EthRpcError::TooFewCycles(format!(
-                "requires {cost} cycles, got {cycles_available} cycles",
-            )));
+            return Err(EthRpcError::TooFewCycles {
+                expected: cost,
+                received: cycles_available,
+            });
         }
         ic_cdk::api::call::msg_cycles_accept128(cost);
         if let Some(mut provider) = provider {

diff --git a/src/types.rs b/src/types.rs
@@ -205,7 +205,7 @@ impl BoundedStorable for Provider {
 #[derive(CandidType, Debug)]
 pub enum EthRpcError {
     NoPermission,
-    TooFewCycles(String),
+    TooFewCycles { expected: u128, received: u128 },
     ServiceUrlParseError,
     ServiceUrlHostMissing,
     ServiceUrlHostNotAllowed,