chore: bump candid to 0.10

dfinity · Nov 17, 2023 · f72c6ec · f72c6ec
1 parent ed0862a
commit f72c6ec
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,8 @@ ic-utils = { path = "ic-utils", version = "0.30.2" }
 ic-transport-types = { path = "ic-transport-types", version = "0.30.2" }
 
 ic-certification = "1.2.0"
-candid = "0.9.5"
+candid = "0.10.0"
+candid_parser = "0.1.0"
 clap = "4.4.3"
 hex = "0.4.3"
 leb128 = "0.2.5"

diff --git a/icx/Cargo.toml b/icx/Cargo.toml
@@ -20,7 +20,8 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = { version = "1.0", features = ["backtrace"] }
-candid = { workspace = true, features = ["parser"] }
+candid = { workspace = true, features = ["value"] }
+candid_parser = { workspace = true }
 clap = { workspace = true, features = ["derive", "cargo", "color"] }
 hex = { workspace = true }
 humantime = "2.0.1"

diff --git a/icx/src/main.rs b/icx/src/main.rs
@@ -1,10 +1,10 @@
 use anyhow::{bail, Context, Result};
 use candid::{
-    check_prog,
     types::value::IDLValue,
     types::{Function, Type, TypeInner},
-    CandidType, Decode, Deserialize, IDLArgs, IDLProg, TypeEnv,
+    CandidType, Decode, Deserialize, IDLArgs, TypeEnv,
 };
+use candid_parser::{check_prog, parse_idl_args, parse_idl_value, IDLProg};
 use clap::{crate_authors, crate_version, Parser, ValueEnum};
 use ic_agent::{
     agent::{self, signed::SignedUpdate},
@@ -194,7 +194,7 @@ fn blob_from_arguments(
         }
         ArgType::Idl => {
             let arguments = arguments.unwrap_or("()");
-            let args = arguments.parse::<IDLArgs>();
+            let args = parse_idl_args(arguments);
             let typed_args = match method_type {
                 None => args
                     .context("Failed to parse arguments with no method type info")?
@@ -210,7 +210,7 @@ fn blob_from_arguments(
                             if &TypeInner::Text == func.args[0].as_ref() && !is_quote {
                                 Ok(IDLValue::Text(arguments.to_string()))
                             } else {
-                                arguments.parse::<IDLValue>()
+                                parse_idl_value(arguments)
                             }
                             .map(|v| IDLArgs::new(&[v]))
                         } else {