Update to latest candid and ic-cdk

Cargo.toml

@@ -7,6 +7,11 @@ members = [
     "src/monitor-canister",
 ]
 
+[workspace.dependencies]
+candid = "0.9.1"
+ic-cdk = "0.10.0"
+ic-cdk-macros = "0.7.0"
+
 [profile.release]
 lto = true
 opt-level = 'z'

src/ic-xrc-types/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ic-xrc-types"
 authors = ["DFINITY Stiftung <[email protected]>"]
-version = "1.0.0"
+version = "1.1.0"
 edition = "2021"
 description = "Rust support for the exchange rate canister."
 documentation = "https://docs.rs/ic-xrc-types"
@@ -13,5 +13,5 @@ keywords = ["internet-computer", "dfinity"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-candid = "0.8.0"
+candid.workspace = true
 serde = "1.0.110"

src/monitor-canister/Cargo.toml

@@ -7,9 +7,9 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1.58"
-candid = "0.8.0"
-ic-cdk = "0.6.5"
-ic-cdk-macros = "0.6.0"
+candid.workspace = true
+ic-cdk.worksapce = true
+ic-cdk-macros.workspace = true
 ic-stable-structures = "0.1.0"
 ic-xrc-types = { path = "../ic-xrc-types" }
 futures = "0.3.23"

src/monitor-canister/src/api.rs

@@ -1,5 +1,4 @@
-use candid::Nat;
-use ic_cdk::export::candid::decode_one;
+use candid::{decode_one, Nat};
 
 use crate::{
     environment::Environment,

src/monitor-canister/src/main.rs

@@ -1,4 +1,4 @@
-use ic_cdk::export::candid::candid_method;
+use candid::candid_method;
 use ic_cdk_macros::{heartbeat, init, post_upgrade, query};
 use monitor_canister::{
     types::{Config, GetEntriesRequest, GetEntriesResponse},

src/monitor-canister/src/periodic.rs

@@ -1,6 +1,5 @@
 use async_trait::async_trait;
-use candid::encode_one;
-use ic_cdk::export::Principal;
+use candid::{encode_one, Principal};
 use ic_xrc_types::{Asset, AssetClass, GetExchangeRateRequest, GetExchangeRateResult};
 use std::cell::Cell;
 use xrc::XRC_REQUEST_CYCLES_COST;
@@ -198,8 +197,9 @@ mod test {
 
     use std::sync::{Arc, RwLock};
 
+    use candid::Nat;
     use futures::FutureExt;
-    use ic_cdk::{api::call::RejectionCode, export::candid::Nat};
+    use ic_cdk::api::call::RejectionCode;
     use ic_xrc_types::{ExchangeRate, ExchangeRateError, ExchangeRateMetadata};
 
     use crate::{api, environment::test::TestEnvironment, types::GetEntriesRequest};

src/monitor-canister/src/types.rs

@@ -1,10 +1,7 @@
 use std::borrow::Cow;
 
-use candid::{decode_one, encode_one};
-use ic_cdk::{
-    api::call::RejectionCode,
-    export::candid::{CandidType, Deserialize, Nat, Principal},
-};
+use candid::{decode_one, encode_one, CandidType, Deserialize, Nat, Principal};
+use ic_cdk::api::call::RejectionCode;
 use ic_stable_structures::Storable;
 use ic_xrc_types::{ExchangeRate, ExchangeRateError, GetExchangeRateRequest};
 use num_traits::ToPrimitive;

src/xrc-tests/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.8.0"
 edition = "2021"
 
 [dependencies]
-candid = "0.8.0"
+candid.workspace = true
 hex = "0.4.3"
-ic-cdk = "0.6.5"
+ic-cdk.worksapce = true
 ic-xrc-types = { path = "../ic-xrc-types" }
 maplit = "1.0.2"
 serde = "1.0.110"

src/xrc/Cargo.toml

@@ -10,9 +10,9 @@ doctest = false
 
 [dependencies]
 async-trait = "0.1.58"
-candid = "0.8.0"
-ic-cdk = "0.6.5"
-ic-cdk-macros = "0.6.0"
+candid.workspace = true
+ic-cdk.worksapce = true
+ic-cdk-macros.workspace = true
 ic-xrc-types = { path = "../ic-xrc-types" }
 futures = "0.3.23"
 lru = "0.9.0"
@@ -21,9 +21,10 @@ serde_json = "1.0.74"
 chrono = "=0.4.19"
 serde_derive = "1.0"
 serde_bytes = "0.11"
-serde-xml-rs = "0.3.1"
+serde-xml-rs = "0.6.0"
 
 [dev-dependencies]
+candid = { workspace = true, features = ["parser"] }
 hex = "0.4"
 maplit = "1.0.2"
 rand = "0.8.5"

src/xrc/src/environment.rs

@@ -1,7 +1,7 @@
+use candid::Principal;
 use ic_cdk::{
     api::call::{msg_cycles_accept, msg_cycles_available},
     caller,
-    export::Principal,
 };
 use ic_xrc_types::ExchangeRateError;
 

src/xrc/src/exchanges.rs

@@ -1,7 +1,5 @@
-use ic_cdk::export::{
-    candid::{decode_args, encode_args, Error as CandidError},
-    serde::Deserialize,
-};
+use candid::{decode_args, encode_args, Deserialize, Error as CandidError};
+
 use ic_xrc_types::Asset;
 use serde::de::DeserializeOwned;
 

src/xrc/src/forex.rs

@@ -10,7 +10,7 @@ mod singapore;
 mod switzerland;
 mod uzbekistan;
 
-use ic_cdk::export::candid::{
+use candid::{
     decode_args, decode_one, encode_args, encode_one, CandidType, Deserialize, Error as CandidError,
 };
 use ic_xrc_types::{Asset, AssetClass, ExchangeRateError};

src/xrc/src/http.rs

@@ -1,9 +1,10 @@
+use candid::Func;
+
 use ic_cdk::{
     api::management_canister::http_request::{
         http_request, CanisterHttpRequestArgument, HttpHeader, HttpMethod, HttpResponse,
         TransformContext, TransformFunc,
     },
-    export::candid::Func,
     id,
 };
 
@@ -86,7 +87,7 @@ impl CanisterHttpRequest {
 
     /// Wraps around `http_request` to issue a request to the `http_request` endpoint.
     pub async fn send(self) -> Result<HttpResponse, String> {
-        http_request(self.args)
+        http_request(self.args, 0)
             .await
             .map(|(response,)| response)
             .map_err(|(_rejection_code, message)| message)

src/xrc/src/lib.rs

@@ -22,11 +22,8 @@ mod request_log;
 pub mod types;
 mod utils;
 
-use ::candid::{CandidType, Deserialize};
-use ic_cdk::{
-    api::management_canister::http_request::{HttpResponse, TransformArgs},
-    export::candid::Principal,
-};
+use ::candid::{CandidType, Deserialize, Principal};
+use ic_cdk::api::management_canister::http_request::{HttpResponse, TransformArgs};
 use ic_xrc_types::{Asset, ExchangeRate, ExchangeRateError, ExchangeRateMetadata, OtherError};
 use request_log::RequestLog;
 use serde_bytes::ByteBuf;

src/xrc/src/main.rs

@@ -1,5 +1,5 @@
+use candid::candid_method;
 use ic_cdk::api::management_canister::http_request::{HttpResponse, TransformArgs};
-use ic_cdk::export::candid::candid_method;
 
 #[ic_cdk_macros::update]
 #[candid_method(update)]
@@ -52,19 +52,20 @@ fn main() {}
 mod test {
     use std::path::PathBuf;
 
-    use ic_cdk::export::candid as cdk_candid;
+    use candid;
 
     #[test]
     fn check_candid_compatibility() {
-        cdk_candid::export_service!();
+        candid::export_service!();
+
         // Pull in the rust-generated interface and candid file interface.
         let new_interface = __export_service();
         let old_interface =
             PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap()).join("xrc.did");
 
-        cdk_candid::utils::service_compatible(
-            cdk_candid::utils::CandidSource::Text(&new_interface),
-            cdk_candid::utils::CandidSource::File(old_interface.as_path()),
+        candid::utils::service_compatible(
+            candid::utils::CandidSource::Text(&new_interface),
+            candid::utils::CandidSource::File(old_interface.as_path()),
         )
         .expect("Service incompatibility found");
     }

src/xrc/src/types.rs

@@ -1,4 +1,4 @@
-use ic_cdk::export::candid::{CandidType, Deserialize};
+use candid::{CandidType, Deserialize};
 use serde_bytes::ByteBuf;
 
 type HeaderField = (String, String);

src/xrc/src/utils.rs

@@ -1,7 +1,8 @@
-use crate::{environment::Environment, PRIVILEGED_CANISTER_IDS};
-use ic_cdk::export::Principal;
+use candid::Principal;
 use ic_xrc_types::{Asset, GetExchangeRateRequest};
 
+use crate::{environment::Environment, PRIVILEGED_CANISTER_IDS};
+
 const NANOS_PER_SEC: u64 = 1_000_000_000;
 
 /// Gets the current time in seconds.