Skip to content

Commit

Permalink
Merge branch 'master' into bump-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
ericswanson-dfinity authored Jan 19, 2024
2 parents 3019ba6 + f936852 commit 0fb4900
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ Updated to candid 0.10, ic-cdk 0.12, and ic-cdk-timers 0.6
They've always been stored with nanosecond precisions on Linux and Macos.
Now they are stored with nanosecond precision on Windows too.

### fix: dfx canister delete, when using an HSM identity, no longer fails by trying to open two sessions to the HSM

Previously, this would fail with a PKCS#11: CKR_CRYPTOKI_ALREADY_INITIALIZED error.

## Dependencies

### Motoko
Expand Down
4 changes: 1 addition & 3 deletions src/dfx/src/commands/canister/delete.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use crate::lib::agent::create_agent_environment;
use crate::lib::environment::Environment;
use crate::lib::error::DfxResult;
use crate::lib::ic_attributes::CanisterSettings;
Expand Down Expand Up @@ -129,8 +128,7 @@ async fn delete_canister(
},
CallSender::SelectedId => {
let network = env.get_network_descriptor();
let agent_env = create_agent_environment(env, Some(network.name.clone()))?;
let identity_name = agent_env
let identity_name = env
.get_selected_identity()
.expect("No selected identity.")
.to_string();
Expand Down

0 comments on commit 0fb4900

Please sign in to comment.