Skip to content

chore: updating refs #1914

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

Merged
NikolaMilosa merged 4 commits into from
Mar 11, 2026
Merged

chore: updating refs #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3195a66
updating refs
NikolaMilosa Mar 2, 2026
2673e6a
locking
NikolaMilosa Mar 2, 2026
f90c0f8
resolving ic-error-types
NikolaMilosa Mar 11, 2026
a6bdfd2
Merge branch 'main' into nim-updating-refs
NikolaMilosa Mar 11, 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
9,479 changes: 5,805 additions & 3,674 deletions Cargo.Bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,290 changes: 1,316 additions & 974 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

109 changes: 56 additions & 53 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ ahash = "0.8.12"
anyhow = "1.0.99"
async-recursion = "1.1.1"
async-trait = "0.1.89"
axum-otel-metrics = "0.10.0"
axum = "0.8.4"
axum-otel-metrics = "0.11.0"
axum = "0.8.8"
backoff = { version = "0.4.0", features = ["tokio"] }
backon = "1.5.2"
candid = "0.10.18"
Expand Down Expand Up @@ -93,52 +93,52 @@ self_update = { version = "0.41.0", default-features = false, features = [
"archive-tar",
"rustls",
] }
ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-canisters = { path = "rs/ic-canisters" }
ic-http-types = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-config = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-dummy-getrandom-for-wasm = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-http-types = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-config = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-dummy-getrandom-for-wasm = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-management-backend = { path = "rs/ic-management-backend" }
ic-management-canister-types-private = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-management-canister-types-private = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-management-types = { path = "rs/ic-management-types" }
ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-canisters = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-common = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-runtime = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-types = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-nervous-system-proto = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
icp-ledger = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-canisters = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-common = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-runtime = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-types = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-nervous-system-proto = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
icp-ledger = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-metrics-encoder = "1.1.1"
ic-transport-types = "0.39.3"
ic-utils = "0.39.3"
Expand All @@ -151,20 +151,20 @@ lazy_static = "1.5.0"
log = "0.4.28"
lru = "0.12.5"
num-traits = "0.2"
opentelemetry = { version = "0.28", features = ["metrics"] }
opentelemetry_sdk = "0.28"
opentelemetry-prometheus = "0.28"
opentelemetry = { version = "0.29", features = ["metrics"] }
opentelemetry_sdk = "0.29"
opentelemetry-prometheus = "0.29.1"
pretty_assertions = "1.4.1"
pretty_env_logger = "0.5.0"
prometheus-http-query = { version = "0.8.3", default-features = false, features = [
"rustls-tls-webpki-roots",
] }
prometheus = { version = "0.13.4", features = ["process"] }
prometheus = { version = "0.14.0", features = ["process"] }
prost = "0.13"
rand = { version = "0.9.2", features = ["std_rng"] }
rand_seeder = "0.3.0"
regex = "1.11.2"
registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls-webpki-roots",
"blocking",
Expand Down Expand Up @@ -210,13 +210,16 @@ ic-cdk = { version = "^0.18.7" }
ic-cdk-timers = { version = "^0.12.2" }
ic-cdk-macros = { version = "^0.18.7" }
ic-stable-structures = "0.6.9"
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
rewards-calculation = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
ic-node-rewards-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "f34ab00f31dc3f223ef832be30303f93e59c19ec" }
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
rewards-calculation = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }
ic-node-rewards-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }

# dre-airflow deps, should be replaced with dre-airflow once
indexmap = { version = "2.11.1", features = ["serde"] }

[patch.crates-io]
ic-error-types = { git = "https://github.com/dfinity/ic.git", rev = "89cc1c20223532c900b94de5bc6bd8cbde278797" }

[profile.release]
# Add debug information to the release build (does NOT reduce the level of optimization!)
# Makes flamegraphs and backtraces more readable.
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ http_archive(
build_file = "@//3rdparty:BUILD.codeowners.bazel",
)

IC_REPO_VERSION = "f34ab00f31dc3f223ef832be30303f93e59c19ec"
IC_REPO_VERSION = "89cc1c20223532c900b94de5bc6bd8cbde278797"

http_archive(
name = "ic_repo",
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV CARGO_HOME=/cargo
COPY docker /docker

# Download ic-admin
ARG ic_git_revision=f34ab00f31dc3f223ef832be30303f93e59c19ec
ARG ic_git_revision=89cc1c20223532c900b94de5bc6bd8cbde278797
RUN curl --fail https://download.dfinity.systems/ic/${ic_git_revision}/release/ic-admin.gz -o - | gunzip -c >| /usr/bin/ic-admin && \
chmod +x /usr/bin/ic-admin

Expand Down
4 changes: 2 additions & 2 deletions ic-revisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"https://github.com/dfinity/ic.git": {
"commit": "f34ab00f31dc3f223ef832be30303f93e59c19ec",
"commit": "89cc1c20223532c900b94de5bc6bd8cbde278797",
"ref": "refs/heads/master"
},
"https://github.com/dfinity/cdk-rs.git": {
"commit": "80d82348b7de1f10117aead50ad26669da7e2b79",
"commit": "c04fa84b15f96f926fa7b5ccc9d4e2fa4f1ba7c5",
"ref": "refs/heads/main"
}
}
2 changes: 1 addition & 1 deletion pylib/ic_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def canister_version(agent: Agent, canister_principal: str) -> str:
if __name__ == "__main__":
# One can run some simple one-off tests here, e.g.:
ic_admin = IcAdmin(
"https://ic0.app", git_revision="f34ab00f31dc3f223ef832be30303f93e59c19ec"
"https://ic0.app", git_revision="89cc1c20223532c900b94de5bc6bd8cbde278797"
)

print(ic_admin.get_subnet_replica_versions())
3 changes: 3 additions & 0 deletions rs/cli/src/commands/proposals/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,9 @@ impl TryFrom<ProposalInfo> for Proposal {
Action::UpdateCanisterSettings(a) => serde_json::to_value(a)?,
Action::DeregisterKnownNeuron(a) => serde_json::to_value(a)?,
Action::FulfillSubnetRentalRequest(a) => serde_json::to_value(a)?,
Action::BlessAlternativeGuestOsVersion(a) => serde_json::to_value(a)?,
Action::TakeCanisterSnapshot(a) => serde_json::to_value(a)?,
Action::LoadCanisterSnapshot(a) => serde_json::to_value(a)?,
},
})
}
Expand Down
1 change: 1 addition & 0 deletions rs/cli/src/commands/subnet/set_authorization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ fn construct_summary(
SubnetType::Application => "Application",
SubnetType::System => "System",
SubnetType::VerifiedApplication => "Verified Application",
SubnetType::CloudEngine => "Cloud Engine",
},
match (was_default, is_default) {
// The state doesn't change
Expand Down
1 change: 1 addition & 0 deletions rs/cli/src/commands/update_default_subnets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ fn construct_summary(
SubnetType::Application => "Application",
SubnetType::System => "System",
SubnetType::VerifiedApplication => "Verified Application",
SubnetType::CloudEngine => "Cloud Engine",
},
match (was_default, excluded_desc.is_none()) {
// The state doesn't change
Expand Down
2 changes: 2 additions & 0 deletions rs/cli/src/qualification/upgrade_subnets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ impl Step for UpgradeSubnets {
SubnetType::Application => "application subnets",
SubnetType::System => "system subnets",
SubnetType::VerifiedApplication => "verified-application subnets",
SubnetType::CloudEngine => "cloud-engine subnets",
},
None => "unassigned nodes",
},
Expand All @@ -65,6 +66,7 @@ impl Step for UpgradeSubnets {
SubnetType::Application => "application_subnet",
SubnetType::System => "system_subnet",
SubnetType::VerifiedApplication => "verified-application_subnet",
SubnetType::CloudEngine => "cloud-engine_subnet",
},
None => "unassigned_nodes",
}
Expand Down
1 change: 1 addition & 0 deletions rs/cli/src/qualification/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ impl StepCtx {
SubnetType::Application => "application".to_string(),
SubnetType::System => "system".to_string(),
SubnetType::VerifiedApplication => "verified-app".to_string(),
SubnetType::CloudEngine => "cloud-engine".to_string(),
},
s.principal.to_string(),
s.replica_version.clone(),
Expand Down
1 change: 1 addition & 0 deletions rs/ic-management-backend/src/lazy_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ impl LazyRegistry for LazyRegistryImpl {
match subnet_type {
SubnetType::System => "System",
SubnetType::Application | SubnetType::VerifiedApplication => "App",
SubnetType::CloudEngine => "CloudEngine",
},
i
)
Expand Down
1 change: 1 addition & 0 deletions rs/ic-management-backend/src/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ impl RegistryState {
match subnet_type {
SubnetType::Application | SubnetType::VerifiedApplication => "App",
SubnetType::System => "System",
SubnetType::CloudEngine => "CloudEngine",
},
i
)
Expand Down
4 changes: 2 additions & 2 deletions rs/ic-observability/multiservice-discovery/src/server_handlers/dto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use base64::{Engine as _, engine::general_purpose as b64};
use ic_crypto_utils_threshold_sig_der::parse_threshold_sig_key_from_der;
use ic_crypto_utils_threshold_sig_der::{KeyConversionError, parse_threshold_sig_key_from_der};
use ic_registry_client::client::ThresholdSigPublicKey;
use service_discovery::job_types::{JobType, JobTypeParseError};
use service_discovery::registry_sync::nns_reachable;
Expand All @@ -26,7 +26,7 @@ pub struct DefinitionDto {

#[derive(Debug)]
pub(crate) enum BadDtoError {
InvalidPublicKey(String, std::io::Error),
InvalidPublicKey(String, KeyConversionError),
NNSUnreachable(String),
}

Expand Down
Loading