chore: use new ic-cdk naming (dfinity#10886)

This starts the migration to ic-cdk 0.20, which removes some APIs marked
as deprecated in 0.18 (version currently in use: 0.19).

The first step is to use the new module naming. The changes here only
change the naming used in imports.

https://github.com/dfinity/cdk-rs/blob/main/ic-cdk/CHANGELOG.md

Author: nmattia

packages/pocket-ic/test_canister/src/canister.rs

@@ -1,7 +1,6 @@
 #![allow(deprecated)]
 use candid::{CandidType, Nat, Principal, define_function};
 use ic_cdk::api::call::{RejectionCode, accept_message, arg_data_raw, reject};
-use ic_cdk::api::instruction_counter;
 use ic_cdk::api::management_canister::ecdsa::{
     EcdsaCurve, EcdsaKeyId, EcdsaPublicKeyArgument, EcdsaPublicKeyResponse, SignWithEcdsaArgument,
     SignWithEcdsaResponse, ecdsa_public_key as ic_cdk_ecdsa_public_key,
@@ -11,6 +10,7 @@ use ic_cdk::api::management_canister::http_request::{
     TransformFunc, http_request as canister_http_outcall,
 };
 use ic_cdk::api::stable::{stable_grow, stable_size as raw_stable_size, stable_write};
+use ic_cdk::api::{canister_self, debug_print, instruction_counter};
 use ic_cdk::{inspect_message, query, trap, update};
 use icrc_ledger_types::icrc1::account::Account;
 use icrc_ledger_types::icrc1::transfer::Memo;
@@ -374,7 +374,7 @@ async fn canister_http_with_transform(http_server_addr: String) -> HttpResponse
         transform: Some(TransformContext {
             function: TransformFunc(candid::Func {
                 method: "transform".to_string(),
-                principal: ic_cdk::id(),
+                principal: canister_self(),
             }),
             context,
         }),
@@ -387,7 +387,7 @@ async fn canister_http_with_transform(http_server_addr: String) -> HttpResponse
 
 #[update]
 async fn whoami() -> String {
-    ic_cdk::id().to_string()
+    canister_self().to_string()
 }
 
 #[update]
@@ -464,7 +464,7 @@ async fn execute_many_instructions(n: u64) {
 
 #[update]
 async fn canister_log(msg: String) {
-    ic_cdk::print(msg);
+    debug_print(msg);
 }
 
 // time

rs/boundary_node/rate_limits/canister/canister.rs

@@ -16,7 +16,7 @@ use crate::state::{CanisterApi, init_version_and_config, with_canister_state};
 use candid::Principal;
 use ic_canister_log::{export as export_logs, log};
 use ic_cdk::api::call::call;
-use ic_cdk::{init, inspect_message, post_upgrade, query, update};
+use ic_cdk::{api::msg_caller, init, inspect_message, post_upgrade, query, update};
 use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
 use ic_nns_constants::REGISTRY_CANISTER_ID;
 use rate_limits_api::{
@@ -34,7 +34,7 @@ const REPLICATED_QUERY_METHOD: &str = "get_config";
 #[inspect_message]
 fn inspect_message() {
     // In order for this hook to succeed, accept_message() must be invoked.
-    let caller_id: Principal = ic_cdk::api::caller();
+    let caller_id: Principal = msg_caller();
     let called_method = ic_cdk::api::call::method_name();
 
     let (has_full_access, has_full_read_access) = with_canister_state(|state| {
@@ -109,7 +109,7 @@ fn post_upgrade(init_arg: InitArg) {
 /// The response includes the config containing all rate-limit rules and the JSON schema version needed for decoding the rules.
 #[query]
 fn get_config(version: Option<Version>) -> GetConfigResponse {
-    let caller_id = ic_cdk::api::caller();
+    let caller_id = msg_caller();
     let response = with_canister_state(|state| {
         let access_resolver = AccessLevelResolver::new(caller_id, state.clone());
         let formatter = ConfigConfidentialityFormatter;
@@ -122,7 +122,7 @@ fn get_config(version: Option<Version>) -> GetConfigResponse {
 /// Retrieves a specific rate-limit rule by its ID, applying confidentiality formatting, based on caller's access level and rule's confidentiality status
 #[query]
 fn get_rule_by_id(rule_id: RuleId) -> GetRuleByIdResponse {
-    let caller_id = ic_cdk::api::caller();
+    let caller_id = msg_caller();
     let response = with_canister_state(|state| {
         let access_resolver = AccessLevelResolver::new(caller_id, state.clone());
         let formatter = RuleConfidentialityFormatter;
@@ -135,7 +135,7 @@ fn get_rule_by_id(rule_id: RuleId) -> GetRuleByIdResponse {
 /// Retrieves all rate-limit rules associated with a specific incident ID, applying confidentiality formatting, based on caller's access level and rule's confidentiality status
 #[query]
 fn get_rules_by_incident_id(incident_id: IncidentId) -> GetRulesByIncidentIdResponse {
-    let caller_id = ic_cdk::api::caller();
+    let caller_id = msg_caller();
     let response = with_canister_state(|state| {
         let access_resolver = AccessLevelResolver::new(caller_id, state.clone());
         let formatter = RuleConfidentialityFormatter;
@@ -151,7 +151,7 @@ fn get_rules_by_incident_id(incident_id: IncidentId) -> GetRulesByIncidentIdResp
 /// This update method includes authorization check and metrics collection.
 #[update]
 fn add_config(config: InputConfig) -> AddConfigResponse {
-    let caller_id = ic_cdk::api::caller();
+    let caller_id = msg_caller();
     let current_time = ic_cdk::api::time();
     with_canister_state(|state| {
         let access_resolver = AccessLevelResolver::new(caller_id, state.clone());
@@ -169,7 +169,7 @@ fn add_config(config: InputConfig) -> AddConfigResponse {
 /// making them viewable by the public. It includes authorization check and metrics collection.
 #[update]
 fn disclose_rules(args: DiscloseRulesArg) -> DiscloseRulesResponse {
-    let caller_id = ic_cdk::api::caller();
+    let caller_id = msg_caller();
     let disclose_time = ic_cdk::api::time();
     with_canister_state(|state| {
         let access_resolver = AccessLevelResolver::new(caller_id, state.clone());

rs/boundary_node/salt_sharing/canister/canister.rs

@@ -6,8 +6,8 @@ use crate::logs::export_logs_as_http_response;
 use crate::metrics::{METRICS, export_metrics_as_http_response};
 use crate::storage::SALT;
 use ic_cdk::api::call::{accept_message, method_name};
-use ic_cdk::api::time;
-use ic_cdk::{caller, trap};
+use ic_cdk::api::{msg_caller, time};
+use ic_cdk::trap;
 use ic_cdk::{init, inspect_message, post_upgrade, query};
 use ic_cdk_timers::set_timer;
 use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
@@ -19,7 +19,7 @@ const REPLICATED_QUERY_METHOD: &str = "get_salt";
 // Inspect the ingress messages in the pre-consensus phase and reject early, if the conditions are not met
 #[inspect_message]
 fn inspect_message() {
-    let caller_id = caller();
+    let caller_id = msg_caller();
     let called_method = method_name();
 
     if called_method == REPLICATED_QUERY_METHOD && is_api_boundary_node_principal(&caller_id) {
@@ -51,7 +51,7 @@ fn post_upgrade(init_arg: InitArg) {
 
 #[query]
 fn get_salt() -> GetSaltResponse {
-    let caller_id = caller();
+    let caller_id = msg_caller();
     if is_api_boundary_node_principal(&caller_id) {
         let stored_salt = SALT
             .with(|cell| cell.borrow().get(&()))

rs/execution_environment/benches/management_canister/test_canister/src/main.rs

@@ -16,7 +16,7 @@ use ic_cdk::api::management_canister::main::{
     stop_canister as ic_cdk_stop_canister, update_settings as ic_cdk_update_settings,
 };
 use ic_cdk::call::Call;
-use ic_cdk::update;
+use ic_cdk::{api::canister_self, update};
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, CandidType, Deserialize, Serialize)]
@@ -37,7 +37,7 @@ async fn create_canisters(args: CreateCanistersArgs) -> Vec<Principal> {
                 ic_cdk_create_canister(
                     CreateCanisterArgument {
                         settings: Some(CanisterSettings {
-                            controllers: Some(vec![ic_cdk::api::id()]),
+                            controllers: Some(vec![canister_self()]),
                             ..CanisterSettings::default()
                         }),
                     },
@@ -159,7 +159,7 @@ pub struct UpdateSettingsArgs {
 
 #[update]
 async fn update_settings(args: UpdateSettingsArgs) {
-    let controllers = vec![ic_cdk::api::id(); args.controllers_number as usize];
+    let controllers = vec![canister_self(); args.controllers_number as usize];
     let futures: Vec<_> = args
         .canister_ids
         .into_iter()

rs/nervous_system/long_message/src/lib.rs

@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 #[cfg(target_arch = "wasm32")]
-use ic_cdk::api::{call_context_instruction_counter, instruction_counter};
+use ic_cdk::api::{call_context_instruction_counter, canister_self, instruction_counter};
 use ic_cdk::query;
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -51,7 +51,7 @@ async fn make_noop_call() {}
 /// Makes a call to a no-op function defined in this library.
 #[cfg(target_arch = "wasm32")]
 async fn make_noop_call() {
-    () = ic_cdk::call(ic_cdk::id(), "__long_message_noop", ())
+    () = ic_cdk::call(canister_self(), "__long_message_noop", ())
         .await
         .unwrap();
 }

rs/nervous_system/timer_task/tests/test_canisters/timer_task_canister.rs

@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 use async_trait::async_trait;
-use ic_cdk::{init, query};
+use ic_cdk::{api::canister_self, init, query};
 use ic_metrics_encoder::MetricsEncoder;
 use ic_nervous_system_timer_task::{
     PeriodicAsyncTask, PeriodicSyncTask, RecurringAsyncTask, RecurringSyncTask,
@@ -86,7 +86,7 @@ fn get_metrics() -> String {
 fn __self_call() {}
 
 async fn invoke_self_call() {
-    let () = ic_cdk::call(ic_cdk::api::id(), "__self_call", ())
+    let () = ic_cdk::call(canister_self(), "__self_call", ())
         .await
         .unwrap();
 }

rs/nns/cmc/src/lib.rs

@@ -2,7 +2,10 @@
 pub use ic_management_canister_types::CanisterSettings;
 
 use candid::{CandidType, Nat};
-use ic_cdk::api::call::{CallResult, RejectionCode};
+use ic_cdk::api::{
+    call::{CallResult, RejectionCode},
+    msg_caller,
+};
 use std::time::{Duration, SystemTime};
 
 use dfn_protobuf::{ProtoBuf, ToProto};
@@ -60,7 +63,7 @@ pub fn ic0_mint_cycles128(amount: Cycles) -> Cycles {
 
 /// caller that returns principalId instead of Principal
 pub fn caller() -> PrincipalId {
-    PrincipalId::from(ic_cdk::caller())
+    PrincipalId::from(msg_caller())
 }
 
 // Duplicating some functionality that is no longer available

rs/nns/cmc/src/main.rs

@@ -5,7 +5,10 @@ use cycles_minting_canister::*;
 use environment::Environment;
 use exchange_rate_canister::{UpdateExchangeRateError, UpdateExchangeRateState};
 use ic_cdk::{
-    api::call::{CallResult, ManualReply},
+    api::{
+        call::{CallResult, ManualReply},
+        canister_cycle_balance, canister_self, certified_data_set,
+    },
     heartbeat, init, post_upgrade, pre_upgrade, println, query, update,
 };
 use ic_crypto_tree_hash::{
@@ -130,7 +133,7 @@ impl Environment for CanisterEnvironment {
     }
 
     fn set_certified_data(&self, data: &[u8]) {
-        ic_cdk::api::set_certified_data(data)
+        certified_data_set(data)
     }
 }
 
@@ -425,7 +428,7 @@ where
     yansi::Paint<S>: std::string::ToString,
 {
     #[cfg(target_arch = "wasm32")]
-    ic_cdk::api::print(yansi::Paint::yellow(s).to_string());
+    ic_cdk::api::debug_print(yansi::Paint::yellow(s).to_string());
 
     #[cfg(not(target_arch = "wasm32"))]
     println!("{}", yansi::Paint::yellow(s).to_string());
@@ -1612,7 +1615,7 @@ async fn fetch_transaction(
     };
 
     let expected_to = AccountIdentifier::new(
-        PrincipalId::from(ic_cdk::api::id()),
+        PrincipalId::from(canister_self()),
         Some(expected_to_subaccount),
     );
     if to != expected_to {
@@ -1780,7 +1783,7 @@ async fn issue_automatic_refund_if_memo_not_offerred(
             spender: _,
         } => {
             let incoming_to_account_identifier = AccountIdentifier::new(
-                PrincipalId::from(ic_cdk::api::id()),
+                PrincipalId::from(canister_self()),
                 Some(incoming_to_subaccount),
             );
             if to != &incoming_to_account_identifier {
@@ -2306,7 +2309,7 @@ fn ensure_balance(
 ) -> Result<(), String> {
     let now = now_system_time();
 
-    let current_balance = Cycles::from(ic_cdk::api::canister_balance128());
+    let current_balance = Cycles::from(canister_cycle_balance());
     let cycles_to_mint = cycles - current_balance;
 
     with_state_mut(|state| {
@@ -2317,7 +2320,7 @@ fn ensure_balance(
 
     // unused because of check above
     let _minted_cycles = ic0_mint_cycles128(cycles_to_mint);
-    assert!(ic_cdk::api::canister_balance128() >= cycles.get());
+    assert!(canister_cycle_balance() >= cycles.get());
     Ok(())
 }
 

rs/nns/sns-wasm/canister/canister.rs

@@ -37,7 +37,10 @@ use ic_types::CanisterId;
 use ic_types_cycles::Cycles;
 use std::{cell::RefCell, collections::HashMap, convert::TryInto};
 
-use ic_cdk::{init, post_upgrade, pre_upgrade, println, query, update};
+use ic_cdk::{
+    api::{canister_cycle_balance, canister_self, msg_caller},
+    init, post_upgrade, pre_upgrade, println, query, update,
+};
 use ic_nervous_system_common::serve_metrics;
 
 pub const LOG_PREFIX: &str = "[SNS-WASM] ";
@@ -58,7 +61,7 @@ struct CanisterApiImpl {}
 impl CanisterApi for CanisterApiImpl {
     /// See CanisterApi::local_canister_id
     fn local_canister_id(&self) -> CanisterId {
-        CanisterId::unchecked_from_principal(PrincipalId::from(ic_cdk::api::id()))
+        CanisterId::unchecked_from_principal(PrincipalId::from(canister_self()))
     }
 
     /// See CanisterApi::create_canister
@@ -154,7 +157,7 @@ impl CanisterApi for CanisterApiImpl {
     }
 
     fn this_canister_has_enough_cycles(&self, required_cycles: u64) -> Result<u64, String> {
-        let available = ic_cdk::api::canister_balance();
+        let available = canister_cycle_balance() as u64;
 
         if available < required_cycles {
             return Err(format!(
@@ -253,7 +256,7 @@ impl CanisterApiImpl {
 }
 
 fn caller() -> PrincipalId {
-    PrincipalId::from(ic_cdk::caller())
+    PrincipalId::from(msg_caller())
 }
 
 /// In contrast to canister_init(), this method does not do deserialization.

rs/rust_canisters/call_tree_test/src/main.rs

@@ -1,7 +1,7 @@
 #![allow(deprecated)]
 //! This module contains a canister used for XNet integration test.
 use candid::{CandidType, Principal};
-use ic_cdk::api::{call::call_raw, id};
+use ic_cdk::api::{call::call_raw, canister_self};
 use ic_cdk::query;
 use serde::{Deserialize, Serialize};
 use std::cell::RefCell;
@@ -82,7 +82,7 @@ async fn start(arguments: Arguments) -> Vec<Message> {
     let calltrees = arguments.calltrees;
 
     let mut messages = vec![];
-    let this_cid = id().to_string();
+    let this_cid = canister_self().to_string();
 
     touch_memory(arguments.num_pages);