chore!: bump candid (#494)

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

Hide file tree

Showing 8 changed files with 76 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+* Breaking change: Bump candid to 0.10. Downstream libraries need to bump Candid to 0.10 as well.
+
 ## [0.30.2] = 20223-11-16
 
 * Fixed a spurious certificate validation error in the five minutes after a node is added to a subnet

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/ic-agent/src/agent/agent_test.rs b/ic-agent/src/agent/agent_test.rs
@@ -422,7 +422,7 @@ async fn wrong_subnet_query_certificate() {
         Some("application/cbor"),
     )
     .await;
-    let blob = Encode!(&Nat::from(12)).unwrap();
+    let blob = Encode!(&Nat::from(12u8)).unwrap();
     let response = QueryResponse::Replied {
         reply: ReplyResponse { arg: blob.clone() },
         signatures: vec![NodeSignature {
@@ -468,7 +468,7 @@ async fn no_cert() {
         Some("application/cbor"),
     )
     .await;
-    let blob = Encode!(&Nat::from(12)).unwrap();
+    let blob = Encode!(&Nat::from(12u8)).unwrap();
     let response = QueryResponse::Replied {
         reply: ReplyResponse { arg: blob.clone() },
         signatures: vec![],

diff --git a/ic-utils/Cargo.toml b/ic-utils/Cargo.toml
@@ -18,7 +18,7 @@ include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
 
 [dependencies]
 async-trait = "0.1.68"
-candid = { workspace = true }
+candid = { workspace = true, features = ["value"] }
 ic-agent = { workspace = true, default-features = false }
 serde = { workspace = true }
 serde_bytes = { workspace = true }

diff --git a/ic-utils/src/interfaces/http_request.rs b/ic-utils/src/interfaces/http_request.rs
@@ -594,7 +594,7 @@ mod test {
             }));
             assert!(fields.contains(&IDLField {
                 id: Label::Named("index".into()),
-                val: IDLValue::Nat(42.into())
+                val: IDLValue::Nat(42u8.into())
             }));
             assert!(fields.contains(&IDLField {
                 id: Label::Named("sha256".into()),
@@ -615,7 +615,7 @@ mod test {
                 token: pre_update_legacy::Token {
                     key: "foo".into(),
                     content_encoding: "bar".into(),
-                    index: 42.into(),
+                    index: 42u8.into(),
                     sha256: None,
                 },
             })),
@@ -641,7 +641,7 @@ mod test {
                 token: pre_update_legacy::Token {
                     key: "foo".into(),
                     content_encoding: "bar".into(),
-                    index: 42.into(),
+                    index: 42u8.into(),
                     sha256: None,
                 },
             })),
@@ -661,7 +661,7 @@ mod test {
             token: Some(pre_update_legacy::Token {
                 key: "foo".into(),
                 content_encoding: "bar".into(),
-                index: 42.into(),
+                index: 42u8.into(),
                 sha256: None,
             }),
         })
@@ -683,7 +683,7 @@ mod test {
         }));
         assert!(fields.contains(&IDLField {
             id: Label::Named("index".into()),
-            val: IDLValue::Nat(42.into())
+            val: IDLValue::Nat(42u8.into())
         }));
         assert!(fields.contains(&IDLField {
             id: Label::Named("sha256".into()),

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 {