chore: [EXC-1835] Make ic-management-canister-types private (#3814)

## This PR has no functional changes.

The types in `rs/types/management_canister_types` are private to the
implementation, i.e., the execution environment, message routing and
some testing crates.

Every other user of these types should use [the public
crate](https://crates.io/crates/ic-management-canister-types) available
via crates.io.

Before we can start transitioning existing users to the public crate, we
need to solve the naming clash.
In the meantime, existing users are in a [temporary Bazel
whitelist](https://sourcegraph.com/github.com/dfinity/ic@master/-/blob/rs/types/management_canister_types/BUILD.bazel?L16).
When they change their dependency to the public one, we can remove them
from the whitelist.

Reviewers: Please note that once the public crate is made available to
the repository (in a follow-up PR), we will ask your team to use the
public crate - eventually.

rs/artifact_pool/Cargo.toml

@@ -37,7 +37,7 @@ rocksdb = { version = "0.22.0", default-features = false }
 criterion = { workspace = true }
 ic-limits = { path = "../limits" }
 ic-crypto-test-utils-canister-threshold-sigs = { path = "../crypto/test_utils/canister_threshold_sigs" }
-ic-management-canister-types = { path = "../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-test-artifact-pool = { path = "../test_utilities/artifact_pool" }
 ic-test-utilities = { path = "../test_utilities" }
 ic-test-utilities-consensus = { path = "../test_utilities/consensus" }

rs/bitcoin/ckbtc/kyt/Cargo.toml

@@ -24,7 +24,7 @@ time = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 candid_parser = { workspace = true }
-ic-management-canister-types = { path = "../../../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../../../types/management_canister_types" }
 ic-state-machine-tests = { path = "../../../state_machine_tests" }
 ic-test-utilities-load-wasm = { path = "../../../test_utilities/load_wasm" }
 ic-types = { path = "../../../types/types" }

rs/bitcoin/ckbtc/kyt/tests/tests.rs

@@ -4,7 +4,7 @@ use ic_ckbtc_kyt::{
     Alert, AlertLevel, DepositRequest, Error as KytError, ExposureType, FetchAlertsResponse,
     InitArg, KytMode, LifecycleArg, SetApiKeyArg,
 };
-use ic_management_canister_types::CanisterHttpResponsePayload;
+use ic_management_canister_types_private::CanisterHttpResponsePayload;
 use ic_state_machine_tests::{StateMachine, WasmResult};
 use ic_test_utilities_load_wasm::load_wasm;
 use ic_types::canister_http::CanisterHttpRequestContext;

rs/bitcoin/ckbtc/minter/Cargo.toml

@@ -28,7 +28,7 @@ ic-crypto-getrandom-for-wasm = { path = "../../../crypto/getrandom_for_wasm" }
 ic-crypto-sha2 = { path = "../../../crypto/sha2" }
 ic-icrc1 = { path = "../../../ledger_suite/icrc1" }
 ic-ledger-core = { path = "../../../ledger_suite/common/ledger_core" }
-ic-management-canister-types = { path = "../../../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../../../types/management_canister_types" }
 ic-metrics-encoder = "1"
 ic-secp256k1 = { path = "../../../../packages/ic-secp256k1" }
 ic-stable-structures = { workspace = true }

rs/bitcoin/ckbtc/minter/src/lib.rs

@@ -10,7 +10,7 @@ use ic_btc_interface::{
     GetUtxosRequest, GetUtxosResponse, MillisatoshiPerByte, Network, OutPoint, Satoshi, Txid, Utxo,
 };
 use ic_canister_log::log;
-use ic_management_canister_types::DerivationPath;
+use ic_management_canister_types_private::DerivationPath;
 use icrc_ledger_types::icrc1::account::Account;
 use icrc_ledger_types::icrc1::transfer::Memo;
 use scopeguard::{guard, ScopeGuard};

rs/bitcoin/ckbtc/minter/src/management.rs

@@ -15,7 +15,7 @@ use ic_cdk::api::{
     call::RejectionCode,
     management_canister::bitcoin::{BitcoinNetwork, UtxoFilter},
 };
-use ic_management_canister_types::{
+use ic_management_canister_types_private::{
     DerivationPath, ECDSAPublicKeyArgs, ECDSAPublicKeyResponse, EcdsaCurve, EcdsaKeyId,
 };
 use serde::de::DeserializeOwned;

rs/bitcoin/ckbtc/minter/src/updates/get_btc_address.rs

@@ -5,7 +5,7 @@ use crate::{
 };
 use candid::{CandidType, Deserialize, Principal};
 use ic_canister_log::log;
-use ic_management_canister_types::DerivationPath;
+use ic_management_canister_types_private::DerivationPath;
 use icrc_ledger_types::icrc1::account::{Account, Subaccount};
 use serde::Serialize;
 

rs/bitcoin/ckbtc/minter/src/updates/update_balance.rs

@@ -243,7 +243,7 @@ pub async fn update_balance<R: CanisterRuntime>(
     }
 
     let token_name = match btc_network {
-        ic_management_canister_types::BitcoinNetwork::Mainnet => "ckBTC",
+        ic_management_canister_types_private::BitcoinNetwork::Mainnet => "ckBTC",
         _ => "ckTESTBTC",
     };
 

rs/canister_client/Cargo.toml

@@ -17,7 +17,7 @@ ic-canister-client-sender = { path = "./sender" }
 ic-canonical-state = { path = "../canonical_state" }
 ic-certification = { path = "../certification" }
 ic-crypto-tree-hash = { path = "../crypto/tree_hash" }
-ic-management-canister-types = { path = "../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-protobuf = { path = "../protobuf" }
 ic-read-state-response-parser = { path = "./read_state_response_parser" }
 ic-secp256k1 = { path = "../../packages/ic-secp256k1" }

rs/canister_client/src/agent.rs

@@ -6,7 +6,7 @@ use crate::{
 use backoff::backoff::Backoff;
 use ic_canister_client_sender::Sender;
 use ic_crypto_tree_hash::Path;
-use ic_management_canister_types::{InstallCodeArgs, Method, Payload, IC_00};
+use ic_management_canister_types_private::{InstallCodeArgs, Method, Payload, IC_00};
 use ic_protobuf::types::v1 as pb;
 use ic_read_state_response_parser::{parse_read_state_response, RequestStatus};
 use ic_types::{

rs/canister_sandbox/Cargo.toml

@@ -46,7 +46,7 @@ threadpool = { workspace = true }
 which = "4.2.2"
 
 [dev-dependencies]
-ic-management-canister-types = { path = "../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-registry-routing-table = { path = "../registry/routing_table" }
 ic-test-utilities = { path = "../test_utilities" }
 # This makes the dependencies of the binary more consistent

rs/canonical_state/Cargo.toml

@@ -30,7 +30,7 @@ assert_matches = { workspace = true }
 hex = { workspace = true }
 ic-canonical-state-tree-hash-test-utils = { path = "tree_hash/test_utils" }
 ic-crypto-sha2 = { path = "../crypto/sha2/" }
-ic-management-canister-types = { path = "../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-registry-subnet-features = { path = "../registry/subnet_features" }
 ic-sys = { path = "../sys" }
 ic-test-utilities-state = { path = "../test_utilities/state" }

rs/canonical_state/src/encoding/tests/compatibility.rs

@@ -11,7 +11,7 @@
 use crate::{all_supported_versions, encoding::*, CertificationVersion};
 use assert_matches::assert_matches;
 use ic_error_types::RejectCode;
-use ic_management_canister_types::{
+use ic_management_canister_types_private::{
     EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId,
 };
 use ic_registry_subnet_type::SubnetType;

rs/consensus/Cargo.toml

@@ -21,7 +21,7 @@ ic-interfaces-registry = { path = "../interfaces/registry" }
 ic-interfaces-state-manager = { path = "../interfaces/state_manager" }
 ic-limits = { path = "../limits" }
 ic-logger = { path = "../monitoring/logger" }
-ic-management-canister-types = { path = "../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-metrics = { path = "../monitoring/metrics" }
 ic-protobuf = { path = "../protobuf" }
 ic-registry-client-helpers = { path = "../registry/helpers" }

rs/consensus/benches/validate_payload.rs

@@ -32,7 +32,7 @@ use ic_interfaces_state_manager::{CertificationScope, StateManager};
 use ic_interfaces_state_manager_mocks::MockStateManager;
 use ic_limits::MAX_INGRESS_TTL;
 use ic_logger::replica_logger::no_op_logger;
-use ic_management_canister_types::IC_00;
+use ic_management_canister_types_private::IC_00;
 use ic_metrics::MetricsRegistry;
 use ic_protobuf::types::v1 as pb;
 use ic_registry_subnet_type::SubnetType;

rs/consensus/src/consensus/batch_delivery.rs

@@ -19,7 +19,7 @@ use ic_interfaces::{
 };
 use ic_interfaces_registry::RegistryClient;
 use ic_logger::{debug, error, info, warn, ReplicaLogger};
-use ic_management_canister_types::SetupInitialDKGResponse;
+use ic_management_canister_types_private::SetupInitialDKGResponse;
 use ic_protobuf::{
     log::consensus_log_entry::v1::ConsensusLogEntry,
     registry::{crypto::v1::PublicKey as PublicKeyProto, subnet::v1::InitialNiDkgTranscriptRecord},

rs/consensus/src/consensus/finalizer.rs

@@ -259,7 +259,7 @@ mod tests {
     use ic_consensus_mocks::{dependencies, dependencies_with_subnet_params, Dependencies};
     use ic_crypto_test_utils_ni_dkg::dummy_transcript_for_tests;
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::SetupInitialDKGResponse;
+    use ic_management_canister_types_private::SetupInitialDKGResponse;
     use ic_metrics::MetricsRegistry;
     use ic_registry_subnet_type::SubnetType;
     use ic_replicated_state::{

rs/consensus/src/idkg/payload_builder.rs

@@ -696,7 +696,7 @@ mod tests {
     use ic_crypto_test_utils_reproducible_rng::{reproducible_rng, ReproducibleRng};
     use ic_interfaces_registry::RegistryValue;
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::MasterPublicKeyId;
+    use ic_management_canister_types_private::MasterPublicKeyId;
     use ic_metrics::MetricsRegistry;
     use ic_protobuf::types::v1 as pb;
     use ic_registry_subnet_features::KeyConfig;

rs/consensus/src/idkg/payload_builder/key_transcript.rs

@@ -218,7 +218,7 @@ mod tests {
     };
     use ic_crypto_test_utils_reproducible_rng::{reproducible_rng, ReproducibleRng};
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId};
+    use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId};
     use ic_test_utilities_types::ids::subnet_test_id;
     use ic_types::consensus::idkg::HasIDkgMasterPublicKeyId;
     use ic_types::consensus::idkg::IDkgMasterPublicKeyId;

rs/consensus/src/idkg/payload_builder/pre_signatures.rs

@@ -2,7 +2,7 @@ use super::IDkgPayloadError;
 
 use crate::idkg::{pre_signer::IDkgTranscriptBuilder, utils::algorithm_for_key_id};
 use ic_logger::{debug, error, ReplicaLogger};
-use ic_management_canister_types::MasterPublicKeyId;
+use ic_management_canister_types_private::MasterPublicKeyId;
 use ic_registry_subnet_features::ChainKeyConfig;
 use ic_replicated_state::metadata_state::subnet_call_context_manager::IDkgSignWithThresholdContext;
 use ic_types::{
@@ -550,7 +550,7 @@ pub(super) mod tests {
     };
     use ic_crypto_test_utils_reproducible_rng::{reproducible_rng, ReproducibleRng};
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::SchnorrAlgorithm;
+    use ic_management_canister_types_private::SchnorrAlgorithm;
     use ic_registry_subnet_features::KeyConfig;
     use ic_test_utilities_types::ids::{node_test_id, subnet_test_id};
     use ic_types::{

rs/consensus/src/idkg/payload_builder/resharing.rs

@@ -66,7 +66,7 @@ fn make_reshare_dealings_response(
             ic_types::batch::ConsensusResponse::new(
                 *callback_id,
                 ic_types::messages::Payload::Data(
-                    ic_management_canister_types::ComputeInitialIDkgDealingsResponse {
+                    ic_management_canister_types_private::ComputeInitialIDkgDealingsResponse {
                         initial_dkg_dealings: initial_dealings.into(),
                     }
                     .encode(),
@@ -185,7 +185,7 @@ mod tests {
     };
     use ic_crypto_test_utils_reproducible_rng::reproducible_rng;
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::ComputeInitialIDkgDealingsResponse;
+    use ic_management_canister_types_private::ComputeInitialIDkgDealingsResponse;
     use ic_test_utilities_types::ids::subnet_test_id;
     use ic_types::consensus::idkg::IDkgMasterPublicKeyId;
     use ic_types::consensus::idkg::IDkgPayload;
@@ -223,7 +223,7 @@ mod tests {
         ic_types::batch::ConsensusResponse::new(
             callback_id,
             ic_types::messages::Payload::Data(
-                ic_management_canister_types::ComputeInitialIDkgDealingsResponse {
+                ic_management_canister_types_private::ComputeInitialIDkgDealingsResponse {
                     initial_dkg_dealings: initial_dealings.into(),
                 }
                 .encode(),

rs/consensus/src/idkg/payload_builder/signatures.rs

@@ -1,5 +1,5 @@
 use ic_error_types::RejectCode;
-use ic_management_canister_types::{Payload, SignWithECDSAReply, SignWithSchnorrReply};
+use ic_management_canister_types_private::{Payload, SignWithECDSAReply, SignWithSchnorrReply};
 use ic_replicated_state::metadata_state::subnet_call_context_manager::IDkgSignWithThresholdContext;
 use ic_types::{
     consensus::idkg::{self, common::CombinedSignature, IDkgMasterPublicKeyId},
@@ -170,7 +170,7 @@ mod tests {
     };
     use assert_matches::assert_matches;
     use ic_crypto_test_utils_reproducible_rng::reproducible_rng;
-    use ic_management_canister_types::MasterPublicKeyId;
+    use ic_management_canister_types_private::MasterPublicKeyId;
     use ic_replicated_state::metadata_state::subnet_call_context_manager::SignWithThresholdContext;
     use ic_test_utilities_types::ids::subnet_test_id;
     use ic_types::{

rs/consensus/src/idkg/payload_verifier.rs

@@ -37,7 +37,7 @@ use ic_interfaces::crypto::{ThresholdEcdsaSigVerifier, ThresholdSchnorrSigVerifi
 use ic_interfaces::validation::{ValidationError, ValidationResult};
 use ic_interfaces_registry::RegistryClient;
 use ic_interfaces_state_manager::{StateManager, StateManagerError};
-use ic_management_canister_types::{Payload, SignWithECDSAReply, SignWithSchnorrReply};
+use ic_management_canister_types_private::{Payload, SignWithECDSAReply, SignWithSchnorrReply};
 use ic_replicated_state::metadata_state::subnet_call_context_manager::{
     IDkgSignWithThresholdContext, SignWithThresholdContext,
 };
@@ -511,7 +511,7 @@ fn validate_reshare_dealings(
     for (request, config) in prev_payload.ongoing_xnet_reshares.iter() {
         if !curr_payload.ongoing_xnet_reshares.contains_key(request) {
             if let Some(response) = new_reshare_agreement.get(request) {
-                use ic_management_canister_types::ComputeInitialIDkgDealingsResponse;
+                use ic_management_canister_types_private::ComputeInitialIDkgDealingsResponse;
                 if let ic_types::messages::Payload::Data(data) = &response.payload {
                     let dealings_response = ComputeInitialIDkgDealingsResponse::decode(data)
                         .map_err(|err| {
@@ -629,7 +629,7 @@ mod test {
     use ic_crypto_test_utils_reproducible_rng::reproducible_rng;
     use ic_interfaces_state_manager::CertifiedStateSnapshot;
     use ic_logger::replica_logger::no_op_logger;
-    use ic_management_canister_types::{
+    use ic_management_canister_types_private::{
         MasterPublicKeyId, Payload, SchnorrAlgorithm, SignWithECDSAReply,
     };
     use ic_test_utilities::crypto::CryptoReturningOk;

rs/consensus/src/idkg/signer.rs

@@ -861,7 +861,7 @@ mod tests {
     };
     use ic_crypto_test_utils_reproducible_rng::reproducible_rng;
     use ic_interfaces::p2p::consensus::{MutablePool, UnvalidatedArtifact};
-    use ic_management_canister_types::{MasterPublicKeyId, SchnorrAlgorithm};
+    use ic_management_canister_types_private::{MasterPublicKeyId, SchnorrAlgorithm};
     use ic_replicated_state::metadata_state::subnet_call_context_manager::{
         EcdsaArguments, SchnorrArguments, ThresholdArguments, VetKdArguments,
     };

rs/consensus/src/idkg/stats.rs

@@ -3,7 +3,7 @@
 use crate::idkg::metrics::{
     IDkgPreSignatureMetrics, IDkgTranscriptMetrics, ThresholdSignatureMetrics,
 };
-use ic_management_canister_types::MasterPublicKeyId;
+use ic_management_canister_types_private::MasterPublicKeyId;
 use ic_types::consensus::idkg::{IDkgBlockReader, IDkgStats, PreSigId, RequestId};
 use ic_types::crypto::canister_threshold_sig::idkg::{
     IDkgDealingSupport, IDkgTranscriptId, IDkgTranscriptParams,

rs/consensus/src/idkg/test_utils.rs

@@ -18,7 +18,7 @@ use ic_crypto_tree_hash::{LabeledTree, MixedHashTree};
 use ic_interfaces::idkg::{IDkgChangeAction, IDkgPool};
 use ic_interfaces_state_manager::{CertifiedStateSnapshot, Labeled};
 use ic_logger::ReplicaLogger;
-use ic_management_canister_types::{
+use ic_management_canister_types_private::{
     EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, VetKdKeyId,
 };
 use ic_metrics::MetricsRegistry;

rs/consensus/src/idkg/utils.rs

@@ -8,7 +8,9 @@ use ic_interfaces::consensus_pool::ConsensusBlockChain;
 use ic_interfaces::idkg::{IDkgChangeAction, IDkgChangeSet, IDkgPool};
 use ic_interfaces_registry::RegistryClient;
 use ic_logger::{warn, ReplicaLogger};
-use ic_management_canister_types::{EcdsaCurve, MasterPublicKeyId, SchnorrAlgorithm, VetKdCurve};
+use ic_management_canister_types_private::{
+    EcdsaCurve, MasterPublicKeyId, SchnorrAlgorithm, VetKdCurve,
+};
 use ic_protobuf::registry::subnet::v1 as pb;
 use ic_registry_client_helpers::subnet::SubnetRegistry;
 use ic_registry_subnet_features::ChainKeyConfig;
@@ -627,7 +629,7 @@ mod tests {
         IDkgParticipants,
     };
     use ic_crypto_test_utils_reproducible_rng::reproducible_rng;
-    use ic_management_canister_types::{EcdsaKeyId, SchnorrKeyId};
+    use ic_management_canister_types_private::{EcdsaKeyId, SchnorrKeyId};
     use ic_protobuf::registry::subnet::v1::EcdsaInitialization;
     use ic_registry_client_fake::FakeRegistryClient;
     use ic_registry_subnet_features::KeyConfig;

rs/consensus/tests/framework/mod.rs

@@ -16,7 +16,7 @@ pub use types::{
 use ic_crypto_temp_crypto::{NodeKeysToGenerate, TempCryptoComponent, TempCryptoComponentGeneric};
 use ic_crypto_test_utils_ni_dkg::{initial_dkg_transcript, InitialNiDkgConfig};
 use ic_interfaces_registry::RegistryClient;
-use ic_management_canister_types::{
+use ic_management_canister_types_private::{
     EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId,
 };
 use ic_protobuf::registry::subnet::v1::{CatchUpPackageContents, InitialNiDkgTranscriptRecord};

rs/consensus/utils/Cargo.toml

@@ -23,7 +23,7 @@ slog = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 ic-consensus-mocks = { path = "../mocks" }
-ic-management-canister-types = { path = "../../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../../types/management_canister_types" }
 ic-test-utilities = { path = "../../test_utilities" }
 ic-test-utilities-registry = { path = "../../test_utilities/registry" }
 ic-test-utilities-state = { path = "../../test_utilities/state" }

rs/consensus/utils/src/lib.rs

@@ -428,7 +428,7 @@ mod tests {
 
     use super::*;
     use ic_consensus_mocks::{dependencies, Dependencies};
-    use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId, SchnorrKeyId};
+    use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId, SchnorrKeyId};
     use ic_replicated_state::metadata_state::subnet_call_context_manager::{
         EcdsaArguments, SchnorrArguments, SignWithThresholdContext, ThresholdArguments,
     };

rs/cross-chain/proposal-cli/src/ic_admin/mod.rs

@@ -94,7 +94,7 @@ pub struct IcAdminTemplate {
     pub args: IcAdminArgs,
 
     /// The mode to use when updating the canister.
-    // We could use CanisterInstallMode instead, but it lives in the `ic-management-canister-types` crate
+    // We could use CanisterInstallMode instead, but it lives in the `ic-management-canister-types-private` crate
     // which has a somewhat large number of dependencies for what we need here, which is
     // just a simple enum with 2 variants.
     mode: String,

rs/crypto/Cargo.toml

@@ -30,8 +30,8 @@ ic-crypto-tls-cert-validation = { path = "node_key_validation/tls_cert_validatio
 ic-crypto-tls-interfaces = { path = "tls_interfaces" }
 ic-crypto-utils-basic-sig = { path = "utils/basic_sig" }
 ic-crypto-utils-tls = { path = "utils/tls" }
+ic-management-canister-types-private = { path = "../types/management_canister_types" }
 ic-ed25519 = { path = "../../packages/ic-ed25519" }
-ic-management-canister-types = { path = "../types/management_canister_types" }
 ic-interfaces = { path = "../interfaces" }
 ic-interfaces-registry = { path = "../interfaces/registry" }
 ic-logger = { path = "../monitoring/logger" }

rs/crypto/internal/crypto_service_provider/Cargo.toml

@@ -77,7 +77,7 @@ ic-crypto-test-utils-local-csp-vault = { path = "../../../crypto/test_utils/loca
 ic-crypto-test-utils-metrics = { path = "../../../crypto/test_utils/metrics" }
 ic-crypto-test-utils-reproducible-rng = { path = "../../../crypto/test_utils/reproducible_rng" }
 ic-crypto-utils-basic-sig = { path = "../../utils/basic_sig" }
-ic-management-canister-types = { path = "../../../types/management_canister_types" }
+ic-management-canister-types-private = { path = "../../../types/management_canister_types" }
 ic-test-utilities-compare-dirs = { path = "../../../test_utilities/compare_dirs" }
 ic-test-utilities-in-memory-logger = { path = "../../../test_utilities/in_memory_logger" }
 ic-test-utilities-time = { path = "../../../test_utilities/time" }

rs/crypto/internal/crypto_service_provider/src/vault/test_utils/ni_dkg/fixtures.rs

@@ -10,7 +10,7 @@ use ic_crypto_internal_types::sign::threshold_sig::ni_dkg::{
     CspNiDkgDealing, CspNiDkgTranscript, Epoch,
 };
 use ic_crypto_internal_types::sign::threshold_sig::public_key::CspThresholdSigPublicKey;
-use ic_management_canister_types::{VetKdCurve, VetKdKeyId};
+use ic_management_canister_types_private::{VetKdCurve, VetKdKeyId};
 use ic_types::crypto::threshold_sig::ni_dkg::config::dealers::NiDkgDealers;
 use ic_types::crypto::threshold_sig::ni_dkg::config::receivers::NiDkgReceivers;
 use ic_types::crypto::threshold_sig::ni_dkg::config::NiDkgThreshold;