Skip to content

chore: DEFI-2304 remove deprecated ic-cdk imports in ic-ledger-canister-core #10317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gregorydemay wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

chore: DEFI-2304 remove deprecated ic-cdk imports in ic-ledger-canister-core #10317

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be3074c
chore: DEFI-2304 remove deprecated ic-cdk imports in ic-ledger-canist…
gregorydemay May 27, 2026
cef71c7
chore: use sentinel -1 for non-reject CallFailed mappings
gregorydemay May 27, 2026
b4e811e
Merge branch 'master' into gdemay/DEFI-2304-ledger-canister-core
gregorydemay May 29, 2026
c176579
chore: refresh icrc1 ledger canbench results
gregorydemay May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions rs/ledger_suite/common/ledger_canister_core/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![allow(deprecated)]
use async_trait::async_trait;
use candid::utils::{ArgumentDecoder, ArgumentEncoder};
use ic_base_types::{CanisterId, PrincipalId};
Expand Down Expand Up @@ -41,11 +40,11 @@ pub struct CdkRuntime;
#[async_trait]
impl Runtime for CdkRuntime {
fn id() -> CanisterId {
CanisterId::unchecked_from_principal(PrincipalId::from(ic_cdk::api::id()))
CanisterId::unchecked_from_principal(PrincipalId::from(ic_cdk::api::canister_self()))
}

fn print(msg: impl AsRef<str>) {
ic_cdk::api::print(msg)
ic_cdk::api::debug_print(msg)
}

async fn call<In, Out>(
Expand All @@ -59,8 +58,20 @@ impl Runtime for CdkRuntime {
Out: for<'a> ArgumentDecoder<'a>,
{
let principal_id = PrincipalId::from(id);
ic_cdk::api::call::call_with_payment(principal_id.into(), method, args, cycles)
let response = ic_cdk::call::Call::unbounded_wait(principal_id.into(), method)
.with_args(&args)
.with_cycles(cycles as u128)
.await
.map_err(|(code, msg)| (code as i32, msg))
.map_err(|err| match err {
ic_cdk::call::CallFailed::CallRejected(rejected) => (
rejected.raw_reject_code() as i32,
rejected.reject_message().to_string(),
),
ic_cdk::call::CallFailed::InsufficientLiquidCycleBalance(e) => (1, e.to_string()),
ic_cdk::call::CallFailed::CallPerformFailed(e) => (1, e.to_string()),
})?;
response
.candid_tuple::<Out>()
.map_err(|err| (5, err.to_string()))
}
}
Loading