chore: bump candid (#72)

* chore: bump candid to 0.7.1

* remove `ic-types` direct dependency since `candid` exports it (#111)

Co-authored-by: Daniel-Bloom-dfinity <[email protected]>

Author: AsixDev-Eugene0082

Cargo.toml

@@ -5,3 +5,4 @@ members = [
     "src/ic-cdk-optimizer",
     "src/ic-certified-map",
 ]
+

docs/modules/rust-guide/examples/counter-tutorial/counter_Cargo.toml

@@ -11,5 +11,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = { version = "0.2.4" }
 ic-cdk-macros = { version = "0.2.4" }
-ic-types = "0.1.1"
 lazy_static = "1.4.0"

docs/modules/rust-guide/examples/mul-deps/Cargo.toml

@@ -11,5 +11,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = { version="0.2.4" }
 ic-cdk-macros = { version="0.2.4" }
-ic-types = "0.1.1"
 

docs/modules/rust-guide/examples/profile-tutorial/profile-Cargo.toml

@@ -12,5 +12,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = "0.2.4"
 ic-cdk-macros = "0.2.4"
-ic-types = "0.1.1"
 serde = "1.0.111"

docs/modules/rust-guide/pages/rust-profile.adoc

@@ -182,7 +182,6 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = "0.3"
 ic-cdk-macros = "0.3"
-ic-types = "0.1.1"
 serde = "1.0.111"
 ----
 +

examples/asset_storage/src/asset_storage_rs/Cargo.toml

@@ -13,5 +13,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = { path = "../../../../src/ic-cdk", version = "0.3" }
 ic-cdk-macros = { path = "../../../../src/ic-cdk-macros", version = "0.3" }
-ic-types = "0.1.1"
 serde = "1.0.111"

examples/asset_storage/src/asset_storage_rs/lib.rs

@@ -1,6 +1,5 @@
-use ic_cdk::storage;
+use ic_cdk::{storage, export::Principal};
 use ic_cdk_macros::*;
-use ic_types::Principal;
 use std::collections::{BTreeMap, BTreeSet};
 
 type Users = BTreeSet<Principal>;

examples/counter/src/counter_rs/Cargo.toml

@@ -13,5 +13,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = { path = "../../../../src/ic-cdk", version = "0.3" }
 ic-cdk-macros = { path = "../../../../src/ic-cdk-macros", version = "0.3" }
-ic-types = "0.1.1"
 lazy_static = "1.4.0"

examples/profile/src/profile_rs/Cargo.toml

@@ -13,5 +13,4 @@ crate-type = ["cdylib"]
 [dependencies]
 ic-cdk = { path = "../../../../src/ic-cdk", version = "0.3" }
 ic-cdk-macros = { path = "../../../../src/ic-cdk-macros", version = "0.3" }
-ic-types = "0.1.1"
 serde = "1.0.111"

src/ic-cdk-macros/Cargo.toml

@@ -16,7 +16,7 @@ include = ["src", "Cargo.toml", "LICENSE", "README.md"]
 proc-macro = true
 
 [dependencies]
-candid = "0.6.19"
+candid = "0.7.1"
 ic-cdk = { path = "../ic-cdk", version = "0.3" }
 syn = { version = "1.0.58", features = ["fold", "full"] }
 quote = "1.0"

src/ic-cdk/Cargo.toml

@@ -13,9 +13,8 @@ keywords = ["internet-computer", "types", "dfinity", "canister", "cdk"]
 include = ["src", "Cargo.toml", "LICENSE", "README.md"]
 
 [dependencies]
-candid = "0.6.19"
+candid = "0.7.1"
 cfg-if = "0.1.10"
-ic-types = "0.1.1"
 serde = "1.0.110"
 
 [features]

src/ic-cdk/src/api.rs

@@ -1,5 +1,5 @@
 //! System API and low level functions for it.
-use ic_types::Principal;
+use crate::export::Principal;
 use std::convert::TryFrom;
 
 pub mod call;

src/ic-cdk/src/api/call.rs

@@ -1,10 +1,8 @@
 //! APIs to make and manage calls in the canister.
 use crate::api::{ic0, trap};
-use crate::export::candid::ser::write_args;
 use crate::export::Principal;
-use candid::de::ArgumentDecoder;
-use candid::ser::ArgumentEncoder;
-use candid::{decode_args, encode_args};
+use candid::utils::{ArgumentDecoder, ArgumentEncoder};
+use candid::{decode_args, encode_args, write_args};
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll, Waker};

src/ic-cdk/src/futures.rs

@@ -1,6 +1,6 @@
 use std::future::Future;
 use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::task::Context;
 
 /// Must be called on every top-level future corresponding to a method call of a
 /// canister by the IC.

src/ic-cdk/src/lib.rs

@@ -10,7 +10,7 @@ static mut DONE: bool = false;
 
 pub mod export {
     pub use candid;
-    pub use ic_types::Principal;
+    pub use candid::types::ic_types::Principal;
 }
 
 /// Setup the stdlib hooks.

src/ic-cdk/src/storage.rs

@@ -43,22 +43,22 @@ pub fn get<T: Sized + Default + 'static>() -> &'static T {
 /// This will override any value previously stored to stable memory.
 pub fn stable_save<T>(t: T) -> Result<(), candid::Error>
 where
-    T: candid::ser::ArgumentEncoder,
+    T: candid::utils::ArgumentEncoder,
 {
-    candid::ser::write_args(&mut stable::StableWriter::default(), t)
+    candid::write_args(&mut stable::StableWriter::default(), t)
 }
 
 /// Restore a value to the storage, from the stable memory.
 /// There can only be one value in stable memory, currently.
 pub fn stable_restore<T>() -> Result<T, String>
 where
-    T: for<'de> candid::de::ArgumentDecoder<'de>,
+    T: for<'de> candid::utils::ArgumentDecoder<'de>,
 {
     let bytes = stable::stable_bytes();
 
     let mut de =
         candid::de::IDLDeserialize::new(bytes.as_slice()).map_err(|e| format!("{:?}", e))?;
-    let res = candid::de::ArgumentDecoder::decode(&mut de).map_err(|e| format!("{:?}", e))?;
+    let res = candid::utils::ArgumentDecoder::decode(&mut de).map_err(|e| format!("{:?}", e))?;
     // The idea here is to ignore an error that comes from Candid, because we have trailing
     // bytes.
     let _ = de.done();

src/ic-certified-map/src/rbtree.rs

@@ -637,7 +637,6 @@ impl<K: 'static + AsRef<[u8]>, V: AsHashTree + 'static> RbTree<K, V> {
                     h = move_red_left(h);
                 }
                 (*h).left = go((*h).left, key);
-                (*h).subtree_hash = Node::subtree_hash(h);
             } else {
                 if is_red((*h).left) {
                     h = rotate_right(h);
@@ -657,12 +656,11 @@ impl<K: 'static + AsRef<[u8]>, V: AsHashTree + 'static> RbTree<K, V> {
                     std::mem::swap(&mut (*h).key, &mut (*m).key);
                     std::mem::swap(&mut (*h).value, &mut (*m).value);
                     (*h).right = delete_min((*h).right);
-                    (*h).subtree_hash = Node::subtree_hash(h);
                 } else {
                     (*h).right = go((*h).right, key);
-                    (*h).subtree_hash = Node::subtree_hash(h);
                 }
             }
+            (*h).subtree_hash = Node::subtree_hash(h);
             balance(h)
         }