diff --git a/Cargo.lock b/Cargo.lock index 8703060332a..54228a03acc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1903,7 +1903,7 @@ dependencies = [ "dfn_json", "dfn_macro", "futures", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-state-machine-tests", "ic-test-utilities", "ic-types", @@ -1924,7 +1924,7 @@ dependencies = [ "ic-canister-client", "ic-config", "ic-crypto-sha2", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-registry-transport", "ic-replica-tests", "ic-state-machine-tests", @@ -2551,7 +2551,7 @@ dependencies = [ "ic-agent", "ic-base-types", "ic-canister-client", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-protobuf", "ic-recovery", @@ -2580,7 +2580,7 @@ dependencies = [ "ic-base-types", "ic-config", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-nns-governance-api", "ic-registry-nns-data-provider", @@ -2611,7 +2611,7 @@ dependencies = [ "futures", "ic-agent", "ic-canister-client", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-common-test-keys", "ic-nns-common", "ic-registry-nns-data-provider", @@ -2631,7 +2631,7 @@ version = "0.9.0" dependencies = [ "anyhow", "canister-test", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-registry-subnet-type", "ic-system-test-driver", @@ -3215,7 +3215,7 @@ dependencies = [ "ic-crypto-getrandom-for-wasm", "ic-crypto-tree-hash", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -3857,7 +3857,7 @@ dependencies = [ "candid", "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", - "ic-management-canister-types", + "ic-management-canister-types-private", "serde", "serde_bytes", "serde_json", @@ -4365,7 +4365,7 @@ dependencies = [ "ic-config", "ic-crypto-sha2", "ic-cycles-account-manager", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-registry-routing-table", "ic-registry-subnet-type", @@ -5660,7 +5660,7 @@ dependencies = [ "ic-crypto-utils-threshold-sig-der", "ic-http-utils", "ic-interfaces-registry", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -5833,7 +5833,7 @@ dependencies = [ "ic-interfaces", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-sys", @@ -6405,7 +6405,7 @@ dependencies = [ "ic-crypto-test-utils-root-of-trust", "ic-crypto-test-utils-tls", "ic-crypto-tree-hash", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "ic-read-state-response-parser", "ic-secp256k1", @@ -6478,7 +6478,7 @@ dependencies = [ "ic-interfaces-state-manager", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-registry-routing-table", "ic-registry-subnet-type", @@ -6569,7 +6569,7 @@ dependencies = [ "ic-crypto-sha2", "ic-crypto-tree-hash", "ic-error-types", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "ic-registry-routing-table", "ic-registry-subnet-features", @@ -6912,7 +6912,7 @@ dependencies = [ "ic-canisters-http-types", "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-stable-structures", "ic-state-machine-tests", @@ -6954,7 +6954,7 @@ dependencies = [ "ic-icrc1", "ic-icrc1-ledger", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-assert", "ic-metrics-encoder", "ic-secp256k1", @@ -7009,7 +7009,7 @@ dependencies = [ "ic-crypto-test-utils-reproducible-rng", "ic-ethereum-types", "ic-ledger-suite-orchestrator-test-utils", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-secp256k1", "ic-sha3 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7060,7 +7060,7 @@ dependencies = [ "ic-icrc1-ledger", "ic-ledger-suite-orchestrator", "ic-ledger-suite-orchestrator-test-utils", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-state-machine-tests", "ic-test-utilities-load-wasm", "ic-types", @@ -7122,7 +7122,7 @@ dependencies = [ "ic-interfaces-state-manager-mocks", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-messaging", "ic-metrics", "ic-protobuf", @@ -7262,7 +7262,7 @@ dependencies = [ "ic-interfaces", "ic-interfaces-registry", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-client-helpers", @@ -7341,7 +7341,7 @@ dependencies = [ "ic-interfaces-registry", "ic-interfaces-registry-mocks", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-client", @@ -7669,7 +7669,7 @@ dependencies = [ "ic-crypto-utils-basic-sig", "ic-interfaces", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-sys", @@ -8466,7 +8466,7 @@ dependencies = [ "ic-interfaces", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-registry-subnet-type", "ic-replicated-state", @@ -8498,7 +8498,7 @@ dependencies = [ "ic-execution-environment", "ic-interfaces", "ic-interfaces-state-manager", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-messaging", "ic-metrics", "ic-protobuf", @@ -8534,7 +8534,7 @@ dependencies = [ "ic-http-endpoints-metrics", "ic-interfaces", "ic-interfaces-state-manager", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-messaging", "ic-metrics", "ic-protobuf", @@ -8691,7 +8691,7 @@ dependencies = [ "ic-interfaces-state-manager-mocks", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-nns-constants", "ic-query-stats", @@ -9044,7 +9044,7 @@ dependencies = [ "ic-interfaces", "ic-interfaces-adapter-client", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-registry-subnet-type", "ic-test-utilities-time", @@ -9514,7 +9514,7 @@ dependencies = [ "ic-interfaces-state-manager-mocks", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-registry-client", "ic-registry-client-helpers", @@ -9547,7 +9547,7 @@ dependencies = [ "ic-crypto-internal-csp-proptest-utils", "ic-error-types", "ic-interfaces-state-manager", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "ic-registry-provisional-whitelist", "ic-registry-subnet-type", @@ -9692,7 +9692,7 @@ dependencies = [ "ic-ledger-core", "ic-ledger-hash-of", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-utils 0.9.0", "serde", ] @@ -9743,7 +9743,7 @@ dependencies = [ "ic-icrc1-index-ng", "ic-icrc1-ledger", "ic-ledger-suite-orchestrator-test-utils", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-stable-structures", "ic-state-machine-tests", @@ -9774,7 +9774,7 @@ dependencies = [ "ic-cdk 0.16.0", "ic-icrc1-ledger", "ic-ledger-suite-orchestrator", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-assert", "ic-state-machine-tests", "ic-test-utilities-load-wasm", @@ -9809,7 +9809,7 @@ dependencies = [ "ic-ledger-canister-core", "ic-ledger-core", "ic-ledger-hash-of", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-registry-subnet-type", "ic-rosetta-test-utils", "ic-state-machine-tests", @@ -9914,7 +9914,7 @@ dependencies = [ ] [[package]] -name = "ic-management-canister-types" +name = "ic-management-canister-types-private" version = "0.9.0" dependencies = [ "arbitrary", @@ -9982,7 +9982,7 @@ dependencies = [ "ic-interfaces-state-manager-mocks", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-query-stats", @@ -10124,7 +10124,7 @@ dependencies = [ "ic-base-types", "ic-error-types", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-common", "ic-nervous-system-proxied-canister-calls-tracker", "ic-nervous-system-runtime", @@ -10318,7 +10318,7 @@ dependencies = [ "ic-icrc1-tokens-u64", "ic-interfaces-registry", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-agent", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -10447,7 +10447,7 @@ dependencies = [ "dfn_core", "ic-cdk 0.16.0", "ic-crypto-sha2", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-runtime", "serde", @@ -10610,7 +10610,7 @@ dependencies = [ "ic-crypto-getrandom-for-wasm", "ic-crypto-sha2", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-canisters", "ic-nervous-system-clients", @@ -10798,7 +10798,7 @@ dependencies = [ "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", "ic-crypto-sha2", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -10910,7 +10910,7 @@ dependencies = [ "ic-error-types", "ic-ledger-core", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -10995,7 +10995,7 @@ dependencies = [ "ic-crypto-test-utils-reproducible-rng", "ic-crypto-utils-ni-dkg", "ic-icrc1", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -11159,7 +11159,7 @@ dependencies = [ "ic-interfaces-state-manager", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-client", @@ -11307,7 +11307,7 @@ dependencies = [ "ic-http-utils", "ic-interfaces", "ic-interfaces-registry", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-client", @@ -11439,7 +11439,7 @@ dependencies = [ "ic-base-types", "ic-interfaces-registry", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "ic-registry-client-fake", "ic-registry-common-proto", @@ -11477,7 +11477,7 @@ version = "0.9.0" dependencies = [ "candid", "ic-base-types", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-types", "rand 0.8.5", "serde", @@ -11627,7 +11627,7 @@ name = "ic-registry-subnet-features" version = "0.9.0" dependencies = [ "candid", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "serde", ] @@ -11750,7 +11750,7 @@ dependencies = [ "ic-interfaces-registry-mocks", "ic-interfaces-state-manager", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-messaging", "ic-metrics", "ic-pprof", @@ -11843,7 +11843,7 @@ dependencies = [ "ic-interfaces", "ic-interfaces-registry", "ic-interfaces-state-manager", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-prep", "ic-protobuf", @@ -11897,7 +11897,7 @@ dependencies = [ "ic-interfaces", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-routing-table", @@ -12184,7 +12184,7 @@ dependencies = [ "ic-agent", "ic-base-types", "ic-crypto-sha2", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-agent", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -12239,7 +12239,7 @@ dependencies = [ "ic-crypto-sha2", "ic-icrc1-ledger", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-canisters", "ic-nervous-system-clients", @@ -12430,7 +12430,7 @@ dependencies = [ "ic-icrc1-ledger", "ic-ledger-canister-core", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -12490,7 +12490,7 @@ dependencies = [ "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", "ic-cdk-timers", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -12609,7 +12609,7 @@ dependencies = [ "ic-icrc1-ledger", "ic-ledger-canister-core", "ic-ledger-core", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common", "ic-nervous-system-common-test-keys", @@ -12653,7 +12653,7 @@ dependencies = [ "ic-icrc1", "ic-icrc1-ledger", "ic-interfaces-registry", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -12715,7 +12715,7 @@ dependencies = [ "clap 4.5.27", "ic-config", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-prep", "ic-protobuf", "ic-registry-provisional-whitelist", @@ -12737,7 +12737,7 @@ dependencies = [ "ic-config", "ic-interfaces", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-replicated-state", @@ -12791,7 +12791,7 @@ dependencies = [ "ic-interfaces-state-manager", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-messaging", "ic-metrics", "ic-protobuf", @@ -12857,7 +12857,7 @@ dependencies = [ "ic-interfaces-certified-stream-store", "ic-interfaces-state-manager", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-protobuf", "ic-registry-routing-table", @@ -13019,7 +13019,7 @@ dependencies = [ "ic-interfaces", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-registry-routing-table", "ic-registry-subnet-features", @@ -13092,7 +13092,7 @@ dependencies = [ "ic-interfaces-registry", "ic-ledger-core", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-message", "ic-nervous-system-clients", "ic-nervous-system-common", @@ -13348,7 +13348,7 @@ dependencies = [ "ic-interfaces-state-manager", "ic-limits", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-query-stats", "ic-registry-provisional-whitelist", @@ -13450,7 +13450,7 @@ dependencies = [ "ic-base-types", "ic-btc-replica-types", "ic-interfaces", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-registry-routing-table", "ic-registry-subnet-features", "ic-registry-subnet-type", @@ -13512,7 +13512,7 @@ dependencies = [ "ic-ckbtc-minter", "ic-config", "ic-icrc1-ledger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-common-test-keys", "ic-nns-common", "ic-nns-constants", @@ -13555,7 +13555,7 @@ dependencies = [ "ic-icrc1-index-ng", "ic-icrc1-ledger", "ic-ledger-suite-orchestrator", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common-test-keys", "ic-nervous-system-root", @@ -13647,7 +13647,7 @@ dependencies = [ "ic-error-types", "ic-exhaustive-derive", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-protobuf", "ic-types-test-utils", "ic-utils 0.9.0", @@ -13971,7 +13971,7 @@ dependencies = [ "ic-config", "ic-crypto-sha2", "ic-http-endpoints-metrics", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-test-identity", "ic-types", @@ -14195,7 +14195,7 @@ dependencies = [ "ic-canister-client", "ic-config", "ic-http-utils", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-common-test-keys", "ic-nns-common", "ic-nns-constants", @@ -14233,7 +14233,7 @@ dependencies = [ "ic-agent", "ic-base-types", "ic-crypto-test-utils-reproducible-rng", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nns-constants", "ic-nns-governance-api", "ic-recovery", @@ -14273,7 +14273,7 @@ dependencies = [ "ic-canister-client", "ic-config", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-message", "ic-nervous-system-common-test-keys", "ic-nns-common", @@ -16358,7 +16358,7 @@ dependencies = [ "ic-base-types", "ic-cdk 0.16.0", "ic-limits", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-networking-subnet-update-workload", "ic-nns-governance-api", "ic-prep", @@ -16481,7 +16481,7 @@ dependencies = [ "ic-ledger-core", "ic-limits", "ic-mainnet-nns-recovery", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-nervous-system-clients", "ic-nervous-system-common-test-keys", "ic-nns-common", @@ -17121,7 +17121,7 @@ dependencies = [ "ic-interfaces", "ic-interfaces-registry", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-nns-constants", "ic-protobuf", @@ -17815,7 +17815,7 @@ dependencies = [ "ic-interfaces-registry", "ic-interfaces-state-manager", "ic-logger", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics", "ic-nns-constants", "ic-protobuf", @@ -18372,7 +18372,7 @@ dependencies = [ "candid", "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", - "ic-management-canister-types", + "ic-management-canister-types-private", "serde", ] @@ -18990,7 +18990,7 @@ dependencies = [ "ic-crypto-utils-basic-sig", "ic-crypto-utils-ni-dkg", "ic-interfaces-registry", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-metrics-encoder", "ic-nervous-system-canisters", "ic-nervous-system-clients", @@ -19549,7 +19549,7 @@ dependencies = [ "dfn_macro", "ic-canister-client-sender", "ic-error-types", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-test-identity", "ic-test-utilities", "ic-types", @@ -20956,7 +20956,7 @@ dependencies = [ "canister-test", "ic-cdk 0.16.0", "ic-cdk-macros 0.9.0", - "ic-management-canister-types", + "ic-management-canister-types-private", "ic-state-machine-tests", "ic-test-utilities", "ic-types", diff --git a/rs/artifact_pool/Cargo.toml b/rs/artifact_pool/Cargo.toml index 5817cf30bd0..11e7ba69e55 100644 --- a/rs/artifact_pool/Cargo.toml +++ b/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" } diff --git a/rs/bitcoin/ckbtc/kyt/Cargo.toml b/rs/bitcoin/ckbtc/kyt/Cargo.toml index d2194a93be4..fb2af06db38 100644 --- a/rs/bitcoin/ckbtc/kyt/Cargo.toml +++ b/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" } diff --git a/rs/bitcoin/ckbtc/kyt/tests/tests.rs b/rs/bitcoin/ckbtc/kyt/tests/tests.rs index bfcef5f6bdd..b2bf62aad3f 100644 --- a/rs/bitcoin/ckbtc/kyt/tests/tests.rs +++ b/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; diff --git a/rs/bitcoin/ckbtc/minter/Cargo.toml b/rs/bitcoin/ckbtc/minter/Cargo.toml index 48dcfbfe290..027766448f8 100644 --- a/rs/bitcoin/ckbtc/minter/Cargo.toml +++ b/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 } diff --git a/rs/bitcoin/ckbtc/minter/src/lib.rs b/rs/bitcoin/ckbtc/minter/src/lib.rs index 3d156535210..ec626711ce1 100644 --- a/rs/bitcoin/ckbtc/minter/src/lib.rs +++ b/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}; diff --git a/rs/bitcoin/ckbtc/minter/src/management.rs b/rs/bitcoin/ckbtc/minter/src/management.rs index 82ffab97dbc..67646099663 100644 --- a/rs/bitcoin/ckbtc/minter/src/management.rs +++ b/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; diff --git a/rs/bitcoin/ckbtc/minter/src/updates/get_btc_address.rs b/rs/bitcoin/ckbtc/minter/src/updates/get_btc_address.rs index de9195720eb..080d3af5733 100644 --- a/rs/bitcoin/ckbtc/minter/src/updates/get_btc_address.rs +++ b/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; diff --git a/rs/bitcoin/ckbtc/minter/src/updates/update_balance.rs b/rs/bitcoin/ckbtc/minter/src/updates/update_balance.rs index 8d28e7d330d..183f8a359cb 100644 --- a/rs/bitcoin/ckbtc/minter/src/updates/update_balance.rs +++ b/rs/bitcoin/ckbtc/minter/src/updates/update_balance.rs @@ -243,7 +243,7 @@ pub async fn update_balance( } let token_name = match btc_network { - ic_management_canister_types::BitcoinNetwork::Mainnet => "ckBTC", + ic_management_canister_types_private::BitcoinNetwork::Mainnet => "ckBTC", _ => "ckTESTBTC", }; diff --git a/rs/canister_client/Cargo.toml b/rs/canister_client/Cargo.toml index 61493fc51b7..ab37bb5a0b5 100644 --- a/rs/canister_client/Cargo.toml +++ b/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" } diff --git a/rs/canister_client/src/agent.rs b/rs/canister_client/src/agent.rs index 09514bdcf08..f04c1b4f150 100644 --- a/rs/canister_client/src/agent.rs +++ b/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::{ diff --git a/rs/canister_sandbox/Cargo.toml b/rs/canister_sandbox/Cargo.toml index bab3c711f6a..fd0f44a6ba7 100644 --- a/rs/canister_sandbox/Cargo.toml +++ b/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 diff --git a/rs/canonical_state/Cargo.toml b/rs/canonical_state/Cargo.toml index 0a8355a4a94..3e2e1a8d9a4 100644 --- a/rs/canonical_state/Cargo.toml +++ b/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" } diff --git a/rs/canonical_state/src/encoding/tests/compatibility.rs b/rs/canonical_state/src/encoding/tests/compatibility.rs index c451d085f61..c25f417b765 100644 --- a/rs/canonical_state/src/encoding/tests/compatibility.rs +++ b/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; diff --git a/rs/consensus/Cargo.toml b/rs/consensus/Cargo.toml index 38bee84bf8a..c12dd9f3f39 100644 --- a/rs/consensus/Cargo.toml +++ b/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" } diff --git a/rs/consensus/benches/validate_payload.rs b/rs/consensus/benches/validate_payload.rs index db2b14d1507..babddccd7c9 100644 --- a/rs/consensus/benches/validate_payload.rs +++ b/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; diff --git a/rs/consensus/src/consensus/batch_delivery.rs b/rs/consensus/src/consensus/batch_delivery.rs index def870cdf2e..e1654b8c501 100644 --- a/rs/consensus/src/consensus/batch_delivery.rs +++ b/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}, diff --git a/rs/consensus/src/consensus/finalizer.rs b/rs/consensus/src/consensus/finalizer.rs index e4d1183072e..e380443cbb8 100644 --- a/rs/consensus/src/consensus/finalizer.rs +++ b/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::{ diff --git a/rs/consensus/src/idkg/payload_builder.rs b/rs/consensus/src/idkg/payload_builder.rs index 66cf7c512e8..8abc956febe 100644 --- a/rs/consensus/src/idkg/payload_builder.rs +++ b/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; diff --git a/rs/consensus/src/idkg/payload_builder/key_transcript.rs b/rs/consensus/src/idkg/payload_builder/key_transcript.rs index f1cb1b2782f..9c358aeab22 100644 --- a/rs/consensus/src/idkg/payload_builder/key_transcript.rs +++ b/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; diff --git a/rs/consensus/src/idkg/payload_builder/pre_signatures.rs b/rs/consensus/src/idkg/payload_builder/pre_signatures.rs index 3dc4c717756..9510ba2ef31 100644 --- a/rs/consensus/src/idkg/payload_builder/pre_signatures.rs +++ b/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::{ diff --git a/rs/consensus/src/idkg/payload_builder/resharing.rs b/rs/consensus/src/idkg/payload_builder/resharing.rs index 7bfa83139d5..a83afb9369a 100644 --- a/rs/consensus/src/idkg/payload_builder/resharing.rs +++ b/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(), diff --git a/rs/consensus/src/idkg/payload_builder/signatures.rs b/rs/consensus/src/idkg/payload_builder/signatures.rs index 0aae77e42bf..838dfea751d 100644 --- a/rs/consensus/src/idkg/payload_builder/signatures.rs +++ b/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::{ diff --git a/rs/consensus/src/idkg/payload_verifier.rs b/rs/consensus/src/idkg/payload_verifier.rs index 2da2270eb61..bdca902d947 100644 --- a/rs/consensus/src/idkg/payload_verifier.rs +++ b/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; diff --git a/rs/consensus/src/idkg/signer.rs b/rs/consensus/src/idkg/signer.rs index 5e273ac29aa..960d432c047 100644 --- a/rs/consensus/src/idkg/signer.rs +++ b/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, }; diff --git a/rs/consensus/src/idkg/stats.rs b/rs/consensus/src/idkg/stats.rs index c985231c62a..6637b08a1a5 100644 --- a/rs/consensus/src/idkg/stats.rs +++ b/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, diff --git a/rs/consensus/src/idkg/test_utils.rs b/rs/consensus/src/idkg/test_utils.rs index f0105463490..5bfc9ff0f00 100644 --- a/rs/consensus/src/idkg/test_utils.rs +++ b/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; diff --git a/rs/consensus/src/idkg/utils.rs b/rs/consensus/src/idkg/utils.rs index b396a333763..941e660e628 100644 --- a/rs/consensus/src/idkg/utils.rs +++ b/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; diff --git a/rs/consensus/tests/framework/mod.rs b/rs/consensus/tests/framework/mod.rs index 79082b9b347..4492d1ff04c 100644 --- a/rs/consensus/tests/framework/mod.rs +++ b/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}; diff --git a/rs/consensus/utils/Cargo.toml b/rs/consensus/utils/Cargo.toml index 974d18bb33b..e2cc7728e9a 100644 --- a/rs/consensus/utils/Cargo.toml +++ b/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" } diff --git a/rs/consensus/utils/src/lib.rs b/rs/consensus/utils/src/lib.rs index 75ce1f1c6bb..3cebfb666ab 100644 --- a/rs/consensus/utils/src/lib.rs +++ b/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, }; diff --git a/rs/cross-chain/proposal-cli/src/ic_admin/mod.rs b/rs/cross-chain/proposal-cli/src/ic_admin/mod.rs index 3227a874d9f..12318857174 100644 --- a/rs/cross-chain/proposal-cli/src/ic_admin/mod.rs +++ b/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, diff --git a/rs/crypto/Cargo.toml b/rs/crypto/Cargo.toml index f874cbf633f..2a9ae954f4b 100644 --- a/rs/crypto/Cargo.toml +++ b/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" } diff --git a/rs/crypto/internal/crypto_service_provider/Cargo.toml b/rs/crypto/internal/crypto_service_provider/Cargo.toml index 7137fb3a083..24d0af6c0b3 100644 --- a/rs/crypto/internal/crypto_service_provider/Cargo.toml +++ b/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" } diff --git a/rs/crypto/internal/crypto_service_provider/src/vault/test_utils/ni_dkg/fixtures.rs b/rs/crypto/internal/crypto_service_provider/src/vault/test_utils/ni_dkg/fixtures.rs index 22ff058ed15..49ac8854050 100644 --- a/rs/crypto/internal/crypto_service_provider/src/vault/test_utils/ni_dkg/fixtures.rs +++ b/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; diff --git a/rs/crypto/src/sign/threshold_sig/store/tests.rs b/rs/crypto/src/sign/threshold_sig/store/tests.rs index 19c7bd79f0f..1ada0a813d1 100644 --- a/rs/crypto/src/sign/threshold_sig/store/tests.rs +++ b/rs/crypto/src/sign/threshold_sig/store/tests.rs @@ -2,7 +2,7 @@ use super::*; use ic_crypto_internal_types::sign::threshold_sig::ni_dkg::ni_dkg_groth20_bls12_381::PublicCoefficientsBytes; use ic_crypto_internal_types::sign::threshold_sig::public_key::bls12_381::PublicKeyBytes; 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::{NiDkgId, NiDkgTargetId, NiDkgTargetSubnet}; use ic_types::Height; use ic_types_test_utils::ids::{node_test_id, SUBNET_1}; diff --git a/rs/cycles_account_manager/Cargo.toml b/rs/cycles_account_manager/Cargo.toml index 76e6e451528..8deb0286fd2 100644 --- a/rs/cycles_account_manager/Cargo.toml +++ b/rs/cycles_account_manager/Cargo.toml @@ -11,7 +11,7 @@ ic-base-types = { path = "../types/base_types" } ic-config = { path = "../config" } ic-interfaces = { path = "../interfaces" } 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-nns-constants = { path = "../nns/constants" } ic-registry-subnet-type = { path = "../registry/subnet_type" } ic-replicated-state = { path = "../replicated_state" } diff --git a/rs/cycles_account_manager/src/lib.rs b/rs/cycles_account_manager/src/lib.rs index 27fd24326fe..5b0ec001602 100644 --- a/rs/cycles_account_manager/src/lib.rs +++ b/rs/cycles_account_manager/src/lib.rs @@ -17,7 +17,7 @@ use ic_base_types::NumSeconds; use ic_config::subnet_config::CyclesAccountManagerConfig; use ic_interfaces::execution_environment::CanisterOutOfCyclesError; use ic_logger::{error, info, ReplicaLogger}; -use ic_management_canister_types::Method; +use ic_management_canister_types_private::Method; use ic_nns_constants::CYCLES_MINTING_CANISTER_ID; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::{ @@ -1194,7 +1194,7 @@ pub enum IngressInductionCostError { mod tests { use super::*; use candid::Encode; - use ic_management_canister_types::{CanisterSettingsArgsBuilder, UpdateSettingsArgs}; + use ic_management_canister_types_private::{CanisterSettingsArgsBuilder, UpdateSettingsArgs}; use ic_test_utilities_types::ids::subnet_test_id; const WASM_EXECUTION_MODE: WasmExecutionMode = WasmExecutionMode::Wasm32; diff --git a/rs/cycles_account_manager/tests/cycles_account_manager.rs b/rs/cycles_account_manager/tests/cycles_account_manager.rs index e1bb5a4ea83..837b84ed269 100644 --- a/rs/cycles_account_manager/tests/cycles_account_manager.rs +++ b/rs/cycles_account_manager/tests/cycles_account_manager.rs @@ -4,7 +4,7 @@ use ic_cycles_account_manager::{IngressInductionCost, ResourceSaturation}; use ic_interfaces::execution_environment::CanisterOutOfCyclesError; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{CanisterIdRecord, Payload, IC_00}; +use ic_management_canister_types_private::{CanisterIdRecord, Payload, IC_00}; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::{ canister_state::execution_state::WasmExecutionMode, diff --git a/rs/determinism_test/Cargo.toml b/rs/determinism_test/Cargo.toml index 140d5660647..0e65fe3ad0b 100644 --- a/rs/determinism_test/Cargo.toml +++ b/rs/determinism_test/Cargo.toml @@ -12,7 +12,7 @@ ic-cycles-account-manager = { path = "../cycles_account_manager" } ic-execution-environment = { path = "../execution_environment" } ic-interfaces = { path = "../interfaces" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } -ic-management-canister-types = { path = "../types/management_canister_types" } +ic-management-canister-types-private = { path = "../types/management_canister_types" } ic-messaging = { path = "../messaging" } ic-metrics = { path = "../monitoring/metrics" } ic-protobuf = { path = "../protobuf" } diff --git a/rs/determinism_test/src/lib.rs b/rs/determinism_test/src/lib.rs index 5a7de569784..d5fbd9b99ff 100644 --- a/rs/determinism_test/src/lib.rs +++ b/rs/determinism_test/src/lib.rs @@ -5,7 +5,7 @@ use ic_interfaces_state_manager::{ PermanentStateHashError::*, StateHashError, StateManager, StateReader, TransientStateHashError::*, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, InstallCodeArgs, Method as Ic00Method, Payload, ProvisionalCreateCanisterWithCyclesArgs, IC_00, }; diff --git a/rs/drun/Cargo.toml b/rs/drun/Cargo.toml index 0bf9d0272b5..74e028423a1 100644 --- a/rs/drun/Cargo.toml +++ b/rs/drun/Cargo.toml @@ -19,7 +19,7 @@ ic-execution-environment = { path = "../execution_environment" } ic-http-endpoints-metrics = { path = "../http_endpoints/metrics" } ic-interfaces = { path = "../interfaces" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } -ic-management-canister-types = { path = "../types/management_canister_types" } +ic-management-canister-types-private = { path = "../types/management_canister_types" } ic-messaging = { path = "../messaging" } ic-metrics = { path = "../monitoring/metrics" } ic-protobuf = { path = "../protobuf" } diff --git a/rs/drun/src/message.rs b/rs/drun/src/message.rs index 0f15c5688aa..7314eae6c3b 100644 --- a/rs/drun/src/message.rs +++ b/rs/drun/src/message.rs @@ -2,7 +2,7 @@ use super::CanisterId; use hex::decode; use ic_execution_environment::execution::upgrade::ENHANCED_ORTHOGONAL_PERSISTENCE_SECTION; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, CanisterInstallModeV2, CanisterUpgradeOptions, Payload, WasmMemoryPersistence, }; use ic_types::{ diff --git a/rs/embedders/src/wasmtime_embedder/system_api.rs b/rs/embedders/src/wasmtime_embedder/system_api.rs index df2060f7cb6..0069e8f823f 100644 --- a/rs/embedders/src/wasmtime_embedder/system_api.rs +++ b/rs/embedders/src/wasmtime_embedder/system_api.rs @@ -383,7 +383,7 @@ pub fn syscalls< // by the log capacity and the remaining space in the log. // The cost is calculated as follows: // - the allocated bytes (x2 to account for adding new message and removing the oldest one) - // - this must be in sync with `CanisterLog::add_record()` from `ic_management_canister_types` + // - this must be in sync with `CanisterLog::add_record()` from `ic_management_canister_types_private` // - the transmitted bytes (multiplied by the cost factor) for sending the payload to the replica. Ok(2 * allocated_num_bytes + BYTE_TRANSMISSION_COST_FACTOR as u64 * transmitted_num_bytes) // LINT.ThenChange(logging_charge_bytes_rule) diff --git a/rs/ethereum/cketh/minter/Cargo.toml b/rs/ethereum/cketh/minter/Cargo.toml index fcf8c3cb39c..9c8dff7fc4c 100644 --- a/rs/ethereum/cketh/minter/Cargo.toml +++ b/rs/ethereum/cketh/minter/Cargo.toml @@ -28,7 +28,7 @@ ic-cdk = { workspace = true } ic-cdk-macros = { workspace = true } ic-cdk-timers = { workspace = true } ic-ethereum-types = { path = "../../../../packages/ic-ethereum-types" } -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-sha3 = { workspace = true } diff --git a/rs/ethereum/cketh/minter/src/management.rs b/rs/ethereum/cketh/minter/src/management.rs index 6fda8ffc746..d86ac6c6d95 100644 --- a/rs/ethereum/cketh/minter/src/management.rs +++ b/rs/ethereum/cketh/minter/src/management.rs @@ -1,5 +1,5 @@ use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::DerivationPath; +use ic_management_canister_types_private::DerivationPath; use std::fmt; /// Represents an error from a management canister call, such as diff --git a/rs/ethereum/cketh/minter/src/tx.rs b/rs/ethereum/cketh/minter/src/tx.rs index 0968efe9648..9e473bd6056 100644 --- a/rs/ethereum/cketh/minter/src/tx.rs +++ b/rs/ethereum/cketh/minter/src/tx.rs @@ -11,7 +11,7 @@ use crate::state::{lazy_call_ecdsa_public_key, mutate_state, read_state, TaskTyp use ethnum::u256; use ic_canister_log::log; use ic_ethereum_types::Address; -use ic_management_canister_types::DerivationPath; +use ic_management_canister_types_private::DerivationPath; use ic_secp256k1::RecoveryId; use minicbor::{Decode, Encode}; use rlp::RlpStream; diff --git a/rs/ethereum/cketh/minter/tests/ckerc20.rs b/rs/ethereum/cketh/minter/tests/ckerc20.rs index 024359b5922..8d21de6065b 100644 --- a/rs/ethereum/cketh/minter/tests/ckerc20.rs +++ b/rs/ethereum/cketh/minter/tests/ckerc20.rs @@ -33,7 +33,7 @@ use ic_cketh_test_utils::{ use ic_ethereum_types::Address; use ic_ledger_suite_orchestrator_test_utils::flow::call_ledger_icrc1_total_supply; use ic_ledger_suite_orchestrator_test_utils::{supported_erc20_tokens, usdc}; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_state_machine_tests::{ErrorCode, WasmResult}; use icrc_ledger_types::icrc1::account::Account; use icrc_ledger_types::icrc1::transfer::Memo; diff --git a/rs/ethereum/cketh/test_utils/Cargo.toml b/rs/ethereum/cketh/test_utils/Cargo.toml index d844188c016..eecd7d1be7e 100644 --- a/rs/ethereum/cketh/test_utils/Cargo.toml +++ b/rs/ethereum/cketh/test_utils/Cargo.toml @@ -21,7 +21,7 @@ ic-ethereum-types = { path = "../../../../packages/ic-ethereum-types" } ic-icrc1-ledger = { path = "../../../ledger_suite/icrc1/ledger" } ic-ledger-suite-orchestrator = { path = "../../ledger-suite-orchestrator" } ic-ledger-suite-orchestrator-test-utils = { path = "../../ledger-suite-orchestrator/test_utils" } -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" } diff --git a/rs/ethereum/cketh/test_utils/src/lib.rs b/rs/ethereum/cketh/test_utils/src/lib.rs index bb57fa512cf..c0134f32873 100644 --- a/rs/ethereum/cketh/test_utils/src/lib.rs +++ b/rs/ethereum/cketh/test_utils/src/lib.rs @@ -20,7 +20,7 @@ use ic_cketh_minter::{ }; use ic_ethereum_types::Address; use ic_icrc1_ledger::{InitArgsBuilder as LedgerInitArgsBuilder, LedgerArgument}; -use ic_management_canister_types::{CanisterHttpResponsePayload, CanisterStatusType}; +use ic_management_canister_types_private::{CanisterHttpResponsePayload, CanisterStatusType}; use ic_state_machine_tests::{ PayloadBuilder, StateMachine, StateMachineBuilder, UserError, WasmResult, }; diff --git a/rs/ethereum/cketh/test_utils/src/mock.rs b/rs/ethereum/cketh/test_utils/src/mock.rs index c56b34110ae..b32deb6c6a9 100644 --- a/rs/ethereum/cketh/test_utils/src/mock.rs +++ b/rs/ethereum/cketh/test_utils/src/mock.rs @@ -4,7 +4,7 @@ use ic_cdk::api::management_canister::http_request::{ HttpResponse as OutCallHttpResponse, TransformArgs, }; use ic_error_types::RejectCode; -use ic_management_canister_types::CanisterHttpResponsePayload; +use ic_management_canister_types_private::CanisterHttpResponsePayload; use ic_state_machine_tests::{PayloadBuilder, StateMachine}; use ic_types::canister_http::{CanisterHttpMethod, CanisterHttpRequestContext}; use ic_types::messages::CallbackId; diff --git a/rs/ethereum/ledger-suite-orchestrator/Cargo.toml b/rs/ethereum/ledger-suite-orchestrator/Cargo.toml index 743ed8212da..df1087682f6 100644 --- a/rs/ethereum/ledger-suite-orchestrator/Cargo.toml +++ b/rs/ethereum/ledger-suite-orchestrator/Cargo.toml @@ -26,7 +26,7 @@ ic-crypto-sha2 = { path = "../../crypto/sha2" } ic-ethereum-types = { path = "../../../packages/ic-ethereum-types" } ic-icrc1-index-ng = { path = "../../ledger_suite/icrc1/index-ng" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-metrics-encoder = "1" ic-stable-structures = { workspace = true } ic0 = "0.21.1" diff --git a/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs b/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs index 40806f8eeaf..50521464481 100644 --- a/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs +++ b/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs @@ -4,7 +4,7 @@ use candid::{CandidType, Encode, Principal}; use ic_base_types::PrincipalId; use ic_canister_log::log; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, CanisterSettingsArgsBuilder, CreateCanisterArgs, InstallCodeArgs, }; diff --git a/rs/ethereum/ledger-suite-orchestrator/test_utils/Cargo.toml b/rs/ethereum/ledger-suite-orchestrator/test_utils/Cargo.toml index 71d5c31a33f..36fcc567f2a 100644 --- a/rs/ethereum/ledger-suite-orchestrator/test_utils/Cargo.toml +++ b/rs/ethereum/ledger-suite-orchestrator/test_utils/Cargo.toml @@ -14,7 +14,7 @@ ic-canisters-http-types = { path = "../../../rust_canisters/http_types" } ic-cdk = { workspace = true } ic-icrc1-ledger = { path = "../../../ledger_suite/icrc1/ledger" } ic-ledger-suite-orchestrator = { path = "../../ledger-suite-orchestrator" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-metrics-assert = { path = "../../../../packages/ic-metrics-assert" } ic-state-machine-tests = { path = "../../../state_machine_tests" } ic-test-utilities-load-wasm = { path = "../../../test_utilities/load_wasm" } diff --git a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/flow.rs b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/flow.rs index 35fd139dd72..65e779bc7aa 100644 --- a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/flow.rs +++ b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/flow.rs @@ -8,7 +8,7 @@ use ic_base_types::{CanisterId, PrincipalId}; use ic_icrc1_ledger::ChangeArchiveOptions; use ic_ledger_suite_orchestrator::candid::{AddErc20Arg, ManagedCanisterIds}; use ic_ledger_suite_orchestrator::state::{IndexWasm, LedgerWasm}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInfoResponse, CanisterInstallMode, CanisterStatusResultV2, InstallCodeArgs, Method, Payload, }; diff --git a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/lib.rs b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/lib.rs index 20f52d86b97..8a024abac40 100644 --- a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/lib.rs +++ b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/lib.rs @@ -10,7 +10,7 @@ use ic_ledger_suite_orchestrator::candid::{ use ic_ledger_suite_orchestrator::state::{ ArchiveWasm, IndexWasm, LedgerSuiteVersion, LedgerWasm, Wasm, WasmHash, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallMode, CanisterStatusResultV2, CanisterStatusType, InstallCodeArgs, Method, Payload, }; diff --git a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/universal_canister.rs b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/universal_canister.rs index f4fb86d4fa3..e6119f469c4 100644 --- a/rs/ethereum/ledger-suite-orchestrator/test_utils/src/universal_canister.rs +++ b/rs/ethereum/ledger-suite-orchestrator/test_utils/src/universal_canister.rs @@ -1,9 +1,9 @@ use crate::assert_reply; use ic_base_types::{CanisterId, PrincipalId}; -pub use ic_management_canister_types::{ +pub use ic_management_canister_types_private::{ CanisterChangeDetails, CanisterInfoResponse, CanisterInstallMode, }; -use ic_management_canister_types::{CanisterInfoRequest, Method, Payload}; +use ic_management_canister_types_private::{CanisterInfoRequest, Method, Payload}; use ic_state_machine_tests::StateMachine; use ic_types::Cycles; use ic_universal_canister::{call_args, wasm, UNIVERSAL_CANISTER_WASM}; diff --git a/rs/ethereum/ledger-suite-orchestrator/tests/tests.rs b/rs/ethereum/ledger-suite-orchestrator/tests/tests.rs index dbd77bdfbf4..74c8837363c 100644 --- a/rs/ethereum/ledger-suite-orchestrator/tests/tests.rs +++ b/rs/ethereum/ledger-suite-orchestrator/tests/tests.rs @@ -543,7 +543,7 @@ mod upgrade { default_init_arg, ledger_suite_orchestrator_wasm, ledger_wasm, tweak_ledger_suite_wasms, usdt_erc20_contract, GIT_COMMIT_HASH_UPGRADE, }; - use ic_management_canister_types::{CanisterSettingsArgsBuilder, CanisterStatusType}; + use ic_management_canister_types_private::{CanisterSettingsArgsBuilder, CanisterStatusType}; use icrc_ledger_types::icrc1::transfer::TransferArg; use icrc_ledger_types::icrc3::blocks::GetBlocksRequest; use proptest::prelude::Rng; diff --git a/rs/execution_environment/Cargo.toml b/rs/execution_environment/Cargo.toml index 81b1a7a1f64..afdb8a087d4 100644 --- a/rs/execution_environment/Cargo.toml +++ b/rs/execution_environment/Cargo.toml @@ -24,7 +24,7 @@ ic-interfaces = { path = "../interfaces" } 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-nns-constants = { path = "../nns/constants" } ic-query-stats = { path = "../query_stats" } @@ -68,7 +68,7 @@ canister-test = { path = "../rust_canisters/canister_test" } criterion = { workspace = true } execution-environment-bench = { path = "benches/lib" } ic-interfaces-state-manager-mocks = { path = "../interfaces/state_manager/mocks" } -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 = { path = "../test_utilities" } ic-test-utilities-execution-environment = { path = "../test_utilities/execution_environment" } diff --git a/rs/execution_environment/benches/management_canister/canister_snapshots.rs b/rs/execution_environment/benches/management_canister/canister_snapshots.rs index 9cd4a33c2c1..900e9de5c12 100644 --- a/rs/execution_environment/benches/management_canister/canister_snapshots.rs +++ b/rs/execution_environment/benches/management_canister/canister_snapshots.rs @@ -2,7 +2,7 @@ // bazel run //rs/execution_environment:management_canister_bench -- canister_snapshot use crate::utils::env; use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkGroup, Criterion}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterSettingsArgsBuilder, LoadCanisterSnapshotArgs, TakeCanisterSnapshotArgs, }; use ic_state_machine_tests::StateMachine; diff --git a/rs/execution_environment/benches/management_canister/ecdsa.rs b/rs/execution_environment/benches/management_canister/ecdsa.rs index 1e949a2a0ca..4d5027add13 100644 --- a/rs/execution_environment/benches/management_canister/ecdsa.rs +++ b/rs/execution_environment/benches/management_canister/ecdsa.rs @@ -2,7 +2,7 @@ use crate::utils::{expect_error, expect_reply, test_canister_wasm}; use candid::{CandidType, Encode}; use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkGroup, Criterion}; use ic_base_types::{PrincipalId, SubnetId}; -use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; use ic_registry_subnet_type::SubnetType; use ic_state_machine_tests::{ErrorCode, StateMachineBuilder, UserError, WasmResult}; use ic_types::Cycles; diff --git a/rs/execution_environment/fuzz/fuzz_targets/execute_subnet_message_update_settings.rs b/rs/execution_environment/fuzz/fuzz_targets/execute_subnet_message_update_settings.rs index 0756f63e334..09d5017aaeb 100644 --- a/rs/execution_environment/fuzz/fuzz_targets/execute_subnet_message_update_settings.rs +++ b/rs/execution_environment/fuzz/fuzz_targets/execute_subnet_message_update_settings.rs @@ -1,4 +1,4 @@ -use ic_management_canister_types::{Method, Payload, UpdateSettingsArgs}; +use ic_management_canister_types_private::{Method, Payload, UpdateSettingsArgs}; use ic_test_utilities_execution_environment::ExecutionTestBuilder; use libfuzzer_sys::{fuzz_target, Corpus}; diff --git a/rs/execution_environment/fuzz/fuzz_targets/execute_system_api_call.rs b/rs/execution_environment/fuzz/fuzz_targets/execute_system_api_call.rs index 7c07d5e2e6f..c798c625883 100644 --- a/rs/execution_environment/fuzz/fuzz_targets/execute_system_api_call.rs +++ b/rs/execution_environment/fuzz/fuzz_targets/execute_system_api_call.rs @@ -1,5 +1,5 @@ use ic_config::{execution_environment::Config as ExecutionConfig, subnet_config::SubnetConfig}; -use ic_management_canister_types::{CanisterInstallMode, CanisterSettingsArgsBuilder}; +use ic_management_canister_types_private::{CanisterInstallMode, CanisterSettingsArgsBuilder}; use ic_registry_subnet_type::SubnetType; use ic_state_machine_tests::{StateMachine, StateMachineBuilder, StateMachineConfig}; use ic_types::{CanisterId, Cycles, NumBytes}; diff --git a/rs/execution_environment/src/bitcoin.rs b/rs/execution_environment/src/bitcoin.rs index c176a350625..34d3a2ba60b 100644 --- a/rs/execution_environment/src/bitcoin.rs +++ b/rs/execution_environment/src/bitcoin.rs @@ -1,5 +1,5 @@ use ic_error_types::{ErrorCode, UserError}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BitcoinGetSuccessorsArgs, BitcoinGetSuccessorsResponse, BitcoinSendTransactionInternalArgs, Payload, }; @@ -111,7 +111,7 @@ pub fn send_transaction_internal( #[cfg(test)] mod tests { - use ic_management_canister_types::{ + use ic_management_canister_types_private::{ BitcoinGetSuccessorsArgs, Method, Payload as Ic00Payload, IC_00, }; use ic_test_utilities::universal_canister::{call_args, wasm}; diff --git a/rs/execution_environment/src/canister_manager.rs b/rs/execution_environment/src/canister_manager.rs index 37267eae3f9..3c56312ce4e 100644 --- a/rs/execution_environment/src/canister_manager.rs +++ b/rs/execution_environment/src/canister_manager.rs @@ -23,7 +23,7 @@ use ic_interfaces::execution_environment::{ CanisterOutOfCyclesError, HypervisorError, IngressHistoryWriter, SubnetAvailableMemory, }; use ic_logger::{error, fatal, info, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChangeDetails, CanisterChangeOrigin, CanisterInstallModeV2, CanisterSnapshotResponse, CanisterStatusResultV2, CanisterStatusType, ChunkHash, InstallChunkedCodeArgs, InstallCodeArgsV2, Method as Ic00Method, StoredChunksReply, UploadChunkReply, diff --git a/rs/execution_environment/src/canister_manager/tests.rs b/rs/execution_environment/src/canister_manager/tests.rs index 3ada606f4db..21aa7e0a207 100644 --- a/rs/execution_environment/src/canister_manager/tests.rs +++ b/rs/execution_environment/src/canister_manager/tests.rs @@ -28,7 +28,7 @@ use ic_error_types::{ErrorCode, UserError}; use ic_interfaces::execution_environment::{ExecutionMode, HypervisorError, SubnetAvailableMemory}; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterIdRecord, CanisterInstallMode, CanisterInstallModeV2, CanisterSettingsArgsBuilder, CanisterStatusResultV2, CanisterStatusType, CanisterUpgradeOptions, ChunkHash, diff --git a/rs/execution_environment/src/canister_settings.rs b/rs/execution_environment/src/canister_settings.rs index bd3631caa3b..2b692a85061 100644 --- a/rs/execution_environment/src/canister_settings.rs +++ b/rs/execution_environment/src/canister_settings.rs @@ -2,7 +2,7 @@ use ic_base_types::{NumBytes, NumSeconds}; use ic_cycles_account_manager::{CyclesAccountManager, ResourceSaturation}; use ic_error_types::{ErrorCode, UserError}; use ic_interfaces::execution_environment::SubnetAvailableMemory; -use ic_management_canister_types::{CanisterSettingsArgs, LogVisibilityV2}; +use ic_management_canister_types_private::{CanisterSettingsArgs, LogVisibilityV2}; use ic_types::{ ComputeAllocation, Cycles, InvalidComputeAllocationError, InvalidMemoryAllocationError, MemoryAllocation, PrincipalId, diff --git a/rs/execution_environment/src/execution/call_or_task.rs b/rs/execution_environment/src/execution/call_or_task.rs index 601463e4d2a..50fbea10ec8 100644 --- a/rs/execution_environment/src/execution/call_or_task.rs +++ b/rs/execution_environment/src/execution/call_or_task.rs @@ -18,7 +18,7 @@ use ic_interfaces::execution_environment::{ CanisterOutOfCyclesError, HypervisorError, WasmExecutionOutput, }; use ic_logger::{info, ReplicaLogger}; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_replicated_state::{ canister_state::execution_state::WasmExecutionMode, num_bytes_try_from, CallContextAction, CallOrigin, CanisterState, diff --git a/rs/execution_environment/src/execution/common.rs b/rs/execution_environment/src/execution/common.rs index f9f5de02606..2651503c013 100644 --- a/rs/execution_environment/src/execution/common.rs +++ b/rs/execution_environment/src/execution/common.rs @@ -12,7 +12,7 @@ use ic_interfaces::execution_environment::{ HypervisorError, HypervisorResult, SubnetAvailableMemory, WasmExecutionOutput, }; use ic_logger::{error, fatal, warn, ReplicaLogger}; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::{ CallContext, CallContextAction, CallOrigin, CanisterState, ExecutionState, NetworkTopology, diff --git a/rs/execution_environment/src/execution/install_code.rs b/rs/execution_environment/src/execution/install_code.rs index 5553fbdf92e..488f24a9c83 100644 --- a/rs/execution_environment/src/execution/install_code.rs +++ b/rs/execution_environment/src/execution/install_code.rs @@ -10,7 +10,7 @@ use ic_interfaces::execution_environment::{ HypervisorError, HypervisorResult, SubnetAvailableMemoryError, WasmExecutionOutput, }; use ic_logger::{error, fatal, info, warn}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChangeDetails, CanisterChangeOrigin, CanisterInstallModeV2, }; use ic_replicated_state::canister_state::system_state::ReservationError; diff --git a/rs/execution_environment/src/execution/install_code/tests.rs b/rs/execution_environment/src/execution/install_code/tests.rs index efafed2c8a0..9745ebf41a6 100644 --- a/rs/execution_environment/src/execution/install_code/tests.rs +++ b/rs/execution_environment/src/execution/install_code/tests.rs @@ -9,8 +9,8 @@ use ic_types::{ CanisterId, ComputeAllocation, Cycles, MemoryAllocation, NumBytes, NumInstructions, }; -use ic_management_canister_types::InstallChunkedCodeArgsLegacy; -use ic_management_canister_types::{ +use ic_management_canister_types_private::InstallChunkedCodeArgsLegacy; +use ic_management_canister_types_private::{ CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterInstallMode, CanisterInstallModeV2, EmptyBlob, InstallChunkedCodeArgs, InstallCodeArgs, InstallCodeArgsV2, Method, Payload, UploadChunkArgs, UploadChunkReply, diff --git a/rs/execution_environment/src/execution/response/tests.rs b/rs/execution_environment/src/execution/response/tests.rs index 127762506c9..f5060e92e10 100644 --- a/rs/execution_environment/src/execution/response/tests.rs +++ b/rs/execution_environment/src/execution/response/tests.rs @@ -2,7 +2,7 @@ use assert_matches::assert_matches; use ic_base_types::{NumBytes, NumSeconds}; use ic_config::embedders::BestEffortResponsesFeature; use ic_error_types::{ErrorCode, UserError}; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_replicated_state::canister_state::NextExecution; use ic_replicated_state::testing::SystemStateTesting; use ic_replicated_state::NumWasmPages; diff --git a/rs/execution_environment/src/execution/upgrade.rs b/rs/execution_environment/src/execution/upgrade.rs index 994a35fea72..90ecec4fb02 100644 --- a/rs/execution_environment/src/execution/upgrade.rs +++ b/rs/execution_environment/src/execution/upgrade.rs @@ -19,7 +19,7 @@ use ic_interfaces::execution_environment::{ HypervisorError, HypervisorResult, WasmExecutionOutput, }; use ic_logger::{info, warn, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallModeV2, CanisterUpgradeOptions, WasmMemoryPersistence, }; use ic_replicated_state::{ diff --git a/rs/execution_environment/src/execution/upgrade/tests.rs b/rs/execution_environment/src/execution/upgrade/tests.rs index b09881fbbbc..251e4623259 100644 --- a/rs/execution_environment/src/execution/upgrade/tests.rs +++ b/rs/execution_environment/src/execution/upgrade/tests.rs @@ -1,6 +1,6 @@ use ic_error_types::ErrorCode; use ic_logger::replica_logger::LogEntryLogger; -use ic_management_canister_types::{CanisterUpgradeOptions, EmptyBlob, Payload}; +use ic_management_canister_types_private::{CanisterUpgradeOptions, EmptyBlob, Payload}; use ic_replicated_state::{ canister_state::execution_state::WasmExecutionMode, canister_state::NextExecution, CanisterState, diff --git a/rs/execution_environment/src/execution_environment.rs b/rs/execution_environment/src/execution_environment.rs index b011d93a0ff..f5fabb3f673 100644 --- a/rs/execution_environment/src/execution_environment.rs +++ b/rs/execution_environment/src/execution_environment.rs @@ -32,7 +32,7 @@ use ic_interfaces::execution_environment::{ }; use ic_limits::{LOG_CANISTER_OPERATION_CYCLES_THRESHOLD, SMALL_APP_SUBNET_MAX_SIZE}; use ic_logger::{error, info, warn, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChangeOrigin, CanisterHttpRequestArgs, CanisterIdRecord, CanisterInfoRequest, CanisterInfoResponse, CanisterStatusType, ClearChunkStoreArgs, ComputeInitialIDkgDealingsArgs, CreateCanisterArgs, DeleteCanisterSnapshotArgs, ECDSAPublicKeyArgs, ECDSAPublicKeyResponse, diff --git a/rs/execution_environment/src/execution_environment/tests.rs b/rs/execution_environment/src/execution_environment/tests.rs index a7c5a863477..a7ebeacca22 100644 --- a/rs/execution_environment/src/execution_environment/tests.rs +++ b/rs/execution_environment/src/execution_environment/tests.rs @@ -1,7 +1,7 @@ use candid::{Decode, Encode}; use ic_base_types::{NumBytes, NumSeconds}; use ic_error_types::{ErrorCode, RejectCode, UserError}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, BitcoinGetUtxosArgs, BitcoinNetwork, BoundedHttpHeaders, CanisterChange, CanisterHttpRequestArgs, CanisterIdRecord, CanisterStatusResultV2, CanisterStatusType, DerivationPath, EcdsaKeyId, EmptyBlob, FetchCanisterLogsRequest, HttpMethod, LogVisibilityV2, diff --git a/rs/execution_environment/src/execution_environment/tests/canister_snapshots.rs b/rs/execution_environment/src/execution_environment/tests/canister_snapshots.rs index b55d0bcc81a..78c7e60fed9 100644 --- a/rs/execution_environment/src/execution_environment/tests/canister_snapshots.rs +++ b/rs/execution_environment/src/execution_environment/tests/canister_snapshots.rs @@ -4,7 +4,7 @@ use ic_base_types::NumBytes; use ic_config::subnet_config::SubnetConfig; use ic_cycles_account_manager::ResourceSaturation; use ic_error_types::{ErrorCode, RejectCode}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, CanisterChange, CanisterChangeDetails, CanisterSnapshotResponse, ClearChunkStoreArgs, DeleteCanisterSnapshotArgs, ListCanisterSnapshotArgs, LoadCanisterSnapshotArgs, Method, Payload as Ic00Payload, TakeCanisterSnapshotArgs, diff --git a/rs/execution_environment/src/execution_environment/tests/canister_task.rs b/rs/execution_environment/src/execution_environment/tests/canister_task.rs index becf6271ef5..8362ac09713 100644 --- a/rs/execution_environment/src/execution_environment/tests/canister_task.rs +++ b/rs/execution_environment/src/execution_environment/tests/canister_task.rs @@ -2,8 +2,8 @@ use assert_matches::assert_matches; use ic_base_types::NumSeconds; use ic_config::{execution_environment::Config as HypervisorConfig, subnet_config::SubnetConfig}; use ic_error_types::RejectCode; -use ic_management_canister_types::{CanisterSettingsArgsBuilder, CanisterStatusType}; -use ic_management_canister_types::{CanisterUpgradeOptions, WasmMemoryPersistence}; +use ic_management_canister_types_private::{CanisterSettingsArgsBuilder, CanisterStatusType}; +use ic_management_canister_types_private::{CanisterUpgradeOptions, WasmMemoryPersistence}; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::canister_state::system_state::OnLowWasmMemoryHookStatus; use ic_replicated_state::canister_state::NextExecution; diff --git a/rs/execution_environment/src/execution_environment_metrics.rs b/rs/execution_environment/src/execution_environment_metrics.rs index 3d6420c79a2..987b11c0743 100644 --- a/rs/execution_environment/src/execution_environment_metrics.rs +++ b/rs/execution_environment/src/execution_environment_metrics.rs @@ -3,7 +3,7 @@ use ic_cycles_account_manager::{ }; use ic_error_types::ErrorCode; use ic_logger::{error, ReplicaLogger}; -use ic_management_canister_types as ic00; +use ic_management_canister_types_private as ic00; use ic_metrics::buckets::{decimal_buckets, decimal_buckets_with_zero}; use ic_metrics::MetricsRegistry; use ic_replicated_state::metadata_state::subnet_call_context_manager::InstallCodeCallId; diff --git a/rs/execution_environment/src/hypervisor.rs b/rs/execution_environment/src/hypervisor.rs index b0b772de966..91a78803618 100644 --- a/rs/execution_environment/src/hypervisor.rs +++ b/rs/execution_environment/src/hypervisor.rs @@ -12,7 +12,7 @@ use ic_interfaces::execution_environment::{ }; use ic_interfaces_state_manager::StateReader; use ic_logger::ReplicaLogger; -use ic_management_canister_types::LogVisibilityV2; +use ic_management_canister_types_private::LogVisibilityV2; use ic_metrics::buckets::decimal_buckets_with_zero; use ic_metrics::{buckets::exponential_buckets, MetricsRegistry}; use ic_registry_subnet_type::SubnetType; diff --git a/rs/execution_environment/src/ic00_permissions.rs b/rs/execution_environment/src/ic00_permissions.rs index 4020f67043f..118cdb89c52 100644 --- a/rs/execution_environment/src/ic00_permissions.rs +++ b/rs/execution_environment/src/ic00_permissions.rs @@ -1,5 +1,5 @@ use ic_error_types::{ErrorCode, UserError}; -use ic_management_canister_types::Method as Ic00Method; +use ic_management_canister_types_private::Method as Ic00Method; use ic_replicated_state::ReplicatedState; use ic_types::messages::CanisterCall; use ic_types::{CanisterId, SubnetId}; diff --git a/rs/execution_environment/src/metrics.rs b/rs/execution_environment/src/metrics.rs index 9a59bd1ca20..c8e619ce474 100644 --- a/rs/execution_environment/src/metrics.rs +++ b/rs/execution_environment/src/metrics.rs @@ -1,5 +1,5 @@ use ic_error_types::UserError; -use ic_management_canister_types::QueryMethod; +use ic_management_canister_types_private::QueryMethod; use ic_metrics::{ buckets::{decimal_buckets, decimal_buckets_with_zero}, MetricsRegistry, diff --git a/rs/execution_environment/src/query_handler.rs b/rs/execution_environment/src/query_handler.rs index 31970026329..73844c559ea 100644 --- a/rs/execution_environment/src/query_handler.rs +++ b/rs/execution_environment/src/query_handler.rs @@ -50,7 +50,7 @@ use tokio::sync::oneshot; use tower::{util::BoxCloneService, Service}; pub(crate) use self::query_scheduler::{QueryScheduler, QuerySchedulerFlag}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ FetchCanisterLogsRequest, FetchCanisterLogsResponse, LogVisibilityV2, Payload, QueryMethod, }; diff --git a/rs/execution_environment/src/scheduler.rs b/rs/execution_environment/src/scheduler.rs index 508bd14ba3d..1f1f2cd20b3 100644 --- a/rs/execution_environment/src/scheduler.rs +++ b/rs/execution_environment/src/scheduler.rs @@ -19,7 +19,9 @@ use ic_interfaces::execution_environment::{ IngressHistoryWriter, Scheduler, SubnetAvailableMemory, }; use ic_logger::{debug, error, fatal, info, new_logger, warn, ReplicaLogger}; -use ic_management_canister_types::{CanisterStatusType, MasterPublicKeyId, Method as Ic00Method}; +use ic_management_canister_types_private::{ + CanisterStatusType, MasterPublicKeyId, Method as Ic00Method, +}; use ic_metrics::MetricsRegistry; use ic_replicated_state::{ canister_state::{ diff --git a/rs/execution_environment/src/scheduler/test_utilities.rs b/rs/execution_environment/src/scheduler/test_utilities.rs index 288e087a15d..5267b738f69 100644 --- a/rs/execution_environment/src/scheduler/test_utilities.rs +++ b/rs/execution_environment/src/scheduler/test_utilities.rs @@ -25,7 +25,7 @@ use ic_interfaces::execution_environment::{ SystemApiCallCounters, WasmExecutionOutput, }; use ic_logger::{replica_logger::no_op_logger, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallMode, CanisterStatusType, InstallCodeArgs, MasterPublicKeyId, Method, Payload, IC_00, }; diff --git a/rs/execution_environment/src/scheduler/tests.rs b/rs/execution_environment/src/scheduler/tests.rs index a70e1826dc5..6b6f0098799 100644 --- a/rs/execution_environment/src/scheduler/tests.rs +++ b/rs/execution_environment/src/scheduler/tests.rs @@ -17,7 +17,7 @@ use ic_config::{ use ic_error_types::RejectCode; use ic_interfaces::execution_environment::SubnetAvailableMemory; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, BoundedHttpHeaders, CanisterHttpResponsePayload, CanisterIdRecord, CanisterStatusType, DerivationPath, EcdsaKeyId, EmptyBlob, Method, Payload as _, SchnorrKeyId, SignWithSchnorrArgs, TakeCanisterSnapshotArgs, UninstallCodeArgs, diff --git a/rs/execution_environment/src/scheduler/threshold_signatures.rs b/rs/execution_environment/src/scheduler/threshold_signatures.rs index 71096adbe3d..be6c898b3b9 100644 --- a/rs/execution_environment/src/scheduler/threshold_signatures.rs +++ b/rs/execution_environment/src/scheduler/threshold_signatures.rs @@ -2,7 +2,7 @@ use std::collections::{BTreeMap, BTreeSet}; use ic_crypto_prng::Csprng; use ic_interfaces::execution_environment::RegistryExecutionSettings; -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_types::{consensus::idkg::PreSigId, ExecutionRound, Height}; use rand::RngCore; @@ -104,7 +104,9 @@ mod tests { use std::sync::Arc; use super::*; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{ + EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, + }; use ic_replicated_state::metadata_state::subnet_call_context_manager::{ EcdsaArguments, SchnorrArguments, SignWithThresholdContext, ThresholdArguments, }; diff --git a/rs/execution_environment/tests/backtraces.rs b/rs/execution_environment/tests/backtraces.rs index 8c6167290e1..18d6c749413 100644 --- a/rs/execution_environment/tests/backtraces.rs +++ b/rs/execution_environment/tests/backtraces.rs @@ -3,7 +3,7 @@ use ic_config::{ execution_environment::Config as HypervisorConfig, flag_status::FlagStatus, subnet_config::SubnetConfig, }; -use ic_management_canister_types::{CanisterSettingsArgsBuilder, LogVisibilityV2}; +use ic_management_canister_types_private::{CanisterSettingsArgsBuilder, LogVisibilityV2}; use ic_registry_subnet_type::SubnetType; use ic_state_machine_tests::{ErrorCode, StateMachine, StateMachineBuilder, StateMachineConfig}; use ic_types::{CanisterId, Cycles, PrincipalId}; @@ -195,7 +195,7 @@ _wasm_backtrace_canister::stable_oob::outer } mod visibility { - use ic_management_canister_types::BoundedVec; + use ic_management_canister_types_private::BoundedVec; use super::*; diff --git a/rs/execution_environment/tests/canister_history.rs b/rs/execution_environment/tests/canister_history.rs index 0df802fb4d2..94109185f86 100644 --- a/rs/execution_environment/tests/canister_history.rs +++ b/rs/execution_environment/tests/canister_history.rs @@ -6,8 +6,8 @@ use ic_base_types::PrincipalId; use ic_config::{execution_environment::Config as HypervisorConfig, subnet_config::SubnetConfig}; use ic_crypto_sha2::Sha256; use ic_error_types::{ErrorCode, UserError}; -use ic_management_canister_types::CanisterInstallMode::{Install, Reinstall, Upgrade}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::CanisterInstallMode::{Install, Reinstall, Upgrade}; +use ic_management_canister_types_private::{ self as ic00, CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterIdRecord, CanisterInfoRequest, CanisterInfoResponse, CreateCanisterArgs, InstallCodeArgs, Method, Payload, UpdateSettingsArgs, diff --git a/rs/execution_environment/tests/canister_logging.rs b/rs/execution_environment/tests/canister_logging.rs index 9198c83d45e..66db9004088 100644 --- a/rs/execution_environment/tests/canister_logging.rs +++ b/rs/execution_environment/tests/canister_logging.rs @@ -1,7 +1,7 @@ use ic_base_types::PrincipalId; use ic_config::execution_environment::Config as ExecutionConfig; use ic_config::subnet_config::SubnetConfig; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, BoundedAllowedViewers, CanisterIdRecord, CanisterInstallMode, CanisterLogRecord, CanisterSettingsArgs, CanisterSettingsArgsBuilder, DataSize, EmptyBlob, FetchCanisterLogsRequest, FetchCanisterLogsResponse, LogVisibilityV2, Payload, diff --git a/rs/execution_environment/tests/canister_version.rs b/rs/execution_environment/tests/canister_version.rs index 0c01c061bea..1fa0cca97fb 100644 --- a/rs/execution_environment/tests/canister_version.rs +++ b/rs/execution_environment/tests/canister_version.rs @@ -2,8 +2,8 @@ use ic00::CanisterSettingsArgsBuilder; use ic_base_types::PrincipalId; use ic_config::execution_environment; use ic_config::subnet_config::{SchedulerConfig, SubnetConfig}; -use ic_management_canister_types::CanisterInstallMode::{Install, Reinstall, Upgrade}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::CanisterInstallMode::{Install, Reinstall, Upgrade}; +use ic_management_canister_types_private::{ self as ic00, CanisterIdRecord, CanisterInstallMode, InstallCodeArgs, Method, Payload, }; use ic_registry_subnet_type::SubnetType; diff --git a/rs/execution_environment/tests/dts.rs b/rs/execution_environment/tests/dts.rs index 9bce638462a..3e91c3d760a 100644 --- a/rs/execution_environment/tests/dts.rs +++ b/rs/execution_environment/tests/dts.rs @@ -9,7 +9,7 @@ use ic_config::{ flag_status::FlagStatus, subnet_config::{SchedulerConfig, SubnetConfig}, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInfoRequest, CanisterInstallMode, CanisterInstallModeV2, CanisterSettingsArgsBuilder, ClearChunkStoreArgs, DeleteCanisterSnapshotArgs, EmptyBlob, InstallChunkedCodeArgs, InstallCodeArgs, ListCanisterSnapshotArgs, LoadCanisterSnapshotArgs, diff --git a/rs/execution_environment/tests/execution_test.rs b/rs/execution_environment/tests/execution_test.rs index ce5b319c1dd..db5234f9cdd 100644 --- a/rs/execution_environment/tests/execution_test.rs +++ b/rs/execution_environment/tests/execution_test.rs @@ -7,7 +7,7 @@ use ic_config::{ execution_environment::{Config as HypervisorConfig, DEFAULT_WASM_MEMORY_LIMIT}, subnet_config::{CyclesAccountManagerConfig, SubnetConfig}, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusResultV2, CreateCanisterArgs, DerivationPath, EcdsaKeyId, EmptyBlob, MasterPublicKeyId, Method, Payload, SignWithECDSAArgs, TakeCanisterSnapshotArgs, UpdateSettingsArgs, IC_00, diff --git a/rs/execution_environment/tests/hypervisor.rs b/rs/execution_environment/tests/hypervisor.rs index 8593403654c..897dbaff358 100644 --- a/rs/execution_environment/tests/hypervisor.rs +++ b/rs/execution_environment/tests/hypervisor.rs @@ -8,7 +8,7 @@ use ic_embedders::wasm_utils::instrumentation::instruction_to_cost; use ic_embedders::wasm_utils::instrumentation::WasmMemoryType; use ic_error_types::{ErrorCode, RejectCode}; use ic_interfaces::execution_environment::{HypervisorError, SubnetAvailableMemory}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChange, CanisterHttpResponsePayload, CanisterStatusType, CanisterUpgradeOptions, }; use ic_nns_constants::CYCLES_MINTING_CANISTER_ID; @@ -1670,7 +1670,10 @@ fn ic0_msg_caller_size_works_in_heartbeat() { .unwrap(); assert_eq!( WasmResult::Reply( - (ic_management_canister_types::IC_00.get().to_vec().len() as u32) + (ic_management_canister_types_private::IC_00 + .get() + .to_vec() + .len() as u32) .to_le_bytes() .to_vec() ), @@ -1687,7 +1690,10 @@ fn ic0_msg_caller_copy_works_in_heartbeat() { wasm() .msg_caller_copy( 0, - ic_management_canister_types::IC_00.get().to_vec().len() as u32, + ic_management_canister_types_private::IC_00 + .get() + .to_vec() + .len() as u32, ) .set_global_data_from_stack() .build(), @@ -1705,7 +1711,7 @@ fn ic0_msg_caller_copy_works_in_heartbeat() { ) .unwrap(); assert_eq!( - WasmResult::Reply(ic_management_canister_types::IC_00.get().to_vec()), + WasmResult::Reply(ic_management_canister_types_private::IC_00.get().to_vec()), result ); } @@ -1736,7 +1742,10 @@ fn ic0_msg_caller_size_works_in_global_timer() { .unwrap(); assert_eq!( WasmResult::Reply( - (ic_management_canister_types::IC_00.get().to_vec().len() as u32) + (ic_management_canister_types_private::IC_00 + .get() + .to_vec() + .len() as u32) .to_le_bytes() .to_vec() ), @@ -1753,7 +1762,10 @@ fn ic0_msg_caller_copy_works_in_global_timer() { wasm() .msg_caller_copy( 0, - ic_management_canister_types::IC_00.get().to_vec().len() as u32, + ic_management_canister_types_private::IC_00 + .get() + .to_vec() + .len() as u32, ) .set_global_data_from_stack() .build(), @@ -1771,7 +1783,7 @@ fn ic0_msg_caller_copy_works_in_global_timer() { ) .unwrap(); assert_eq!( - WasmResult::Reply(ic_management_canister_types::IC_00.get().to_vec()), + WasmResult::Reply(ic_management_canister_types_private::IC_00.get().to_vec()), result ); } diff --git a/rs/execution_environment/tests/in_replicated_execution.rs b/rs/execution_environment/tests/in_replicated_execution.rs index 69ec7c41a97..8ac8d0e3002 100644 --- a/rs/execution_environment/tests/in_replicated_execution.rs +++ b/rs/execution_environment/tests/in_replicated_execution.rs @@ -1,4 +1,4 @@ -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_registry_subnet_type::SubnetType; use ic_state_machine_tests::{StateMachine, StateMachineBuilder, UserError, WasmResult}; use ic_test_utilities::universal_canister::{wasm, UNIVERSAL_CANISTER_WASM}; diff --git a/rs/execution_environment/tests/smoke.rs b/rs/execution_environment/tests/smoke.rs index 7804e224834..8b706238ddf 100644 --- a/rs/execution_environment/tests/smoke.rs +++ b/rs/execution_environment/tests/smoke.rs @@ -1,5 +1,5 @@ use candid::{decode_one, encode_args, CandidType}; -use ic_management_canister_types::{EmptyBlob, Payload}; +use ic_management_canister_types_private::{EmptyBlob, Payload}; use ic_state_machine_tests::{StateMachine, WasmResult}; use serde::Deserialize; diff --git a/rs/execution_environment/tests/storage_reservation.rs b/rs/execution_environment/tests/storage_reservation.rs index 38a919891c7..b572bd2a757 100644 --- a/rs/execution_environment/tests/storage_reservation.rs +++ b/rs/execution_environment/tests/storage_reservation.rs @@ -1,8 +1,8 @@ use ic_config::execution_environment::Config as ExecutionConfig; use ic_config::subnet_config::SubnetConfig; use ic_error_types::ErrorCode; -use ic_management_canister_types::TakeCanisterSnapshotArgs; -use ic_management_canister_types::{self as ic00, CanisterInstallMode, EmptyBlob, Payload}; +use ic_management_canister_types_private::TakeCanisterSnapshotArgs; +use ic_management_canister_types_private::{self as ic00, CanisterInstallMode, EmptyBlob, Payload}; use ic_registry_subnet_type::SubnetType; use ic_state_machine_tests::{StateMachine, StateMachineBuilder, StateMachineConfig}; use ic_test_utilities::universal_canister::{call_args, wasm, UNIVERSAL_CANISTER_WASM}; diff --git a/rs/execution_environment/tests/subnet_size_test.rs b/rs/execution_environment/tests/subnet_size_test.rs index 52e4c58feb1..a8586fe1711 100644 --- a/rs/execution_environment/tests/subnet_size_test.rs +++ b/rs/execution_environment/tests/subnet_size_test.rs @@ -4,7 +4,7 @@ use ic_config::{ execution_environment::Config as HypervisorConfig, subnet_config::{CyclesAccountManagerConfig, SubnetConfig}, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, BoundedHttpHeaders, CanisterHttpRequestArgs, CanisterIdRecord, CanisterInstallMode, CanisterSettingsArgsBuilder, DerivationPath, EcdsaCurve, EcdsaKeyId, HttpMethod, MasterPublicKeyId, TransformContext, TransformFunc, diff --git a/rs/execution_environment/tests/threshold_signatures.rs b/rs/execution_environment/tests/threshold_signatures.rs index b9ed178ad4b..12d94a126a4 100644 --- a/rs/execution_environment/tests/threshold_signatures.rs +++ b/rs/execution_environment/tests/threshold_signatures.rs @@ -1,6 +1,6 @@ use candid::Decode; use ic_base_types::PrincipalId; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, CanisterInstallMode, DerivationPath, ECDSAPublicKeyResponse, EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, Method, Payload as Ic00Payload, SchnorrAlgorithm, SchnorrKeyId, SchnorrPublicKeyResponse, SignWithBip341Aux, SignWithECDSAReply, SignWithSchnorrAux, diff --git a/rs/https_outcalls/client/Cargo.toml b/rs/https_outcalls/client/Cargo.toml index 220c377a6a8..529fa9c223e 100644 --- a/rs/https_outcalls/client/Cargo.toml +++ b/rs/https_outcalls/client/Cargo.toml @@ -16,7 +16,7 @@ ic-http-endpoints-async-utils = { path = "../../http_endpoints/async_utils" } ic-config = { path = "../../config" } ic-error-types = { path = "../../types/error_types" } ic-https-outcalls-service = { path = "../service" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-interfaces = { path = "../../interfaces" } ic-interfaces-adapter-client = { path = "../../interfaces/adapter_client" } ic-logger = { path = "../../monitoring/logger" } diff --git a/rs/https_outcalls/client/src/client.rs b/rs/https_outcalls/client/src/client.rs index 8914ce54943..f38ad01340e 100644 --- a/rs/https_outcalls/client/src/client.rs +++ b/rs/https_outcalls/client/src/client.rs @@ -8,7 +8,7 @@ use ic_https_outcalls_service::{ }; use ic_interfaces::execution_environment::QueryExecutionService; use ic_interfaces_adapter_client::{NonBlockingChannel, SendError, TryReceiveError}; -use ic_management_canister_types::{CanisterHttpResponsePayload, TransformArgs}; +use ic_management_canister_types_private::{CanisterHttpResponsePayload, TransformArgs}; use ic_metrics::MetricsRegistry; use ic_registry_subnet_type::SubnetType; use ic_types::{ @@ -186,7 +186,7 @@ impl NonBlockingChannel for CanisterHttpAdapterClientImpl { let canister_http_payload = CanisterHttpResponsePayload{ status: status as u128, headers: headers.into_iter().map(|HttpHeader { name, value }| { - ic_management_canister_types::HttpHeader { name, value } + ic_management_canister_types_private::HttpHeader { name, value } }).collect(), body, }; @@ -483,16 +483,18 @@ mod tests { timeout: request_timeout, canister_id: ic_types::CanisterId::from(1), content: CanisterHttpResponseContent::Success( - Encode!(&ic_management_canister_types::CanisterHttpResponsePayload { - status, - headers: headers - .into_iter() - .map(|HttpHeader { name, value }| { - ic_management_canister_types::HttpHeader { name, value } - }) - .collect(), - body, - }) + Encode!( + &ic_management_canister_types_private::CanisterHttpResponsePayload { + status, + headers: headers + .into_iter() + .map(|HttpHeader { name, value }| { + ic_management_canister_types_private::HttpHeader { name, value } + }) + .collect(), + body, + } + ) .unwrap(), ), } @@ -800,17 +802,19 @@ mod tests { let (_, rsp) = handle.next_request().await.unwrap(); rsp.send_response(Ok(( Ok(WasmResult::Reply( - Encode!(&ic_management_canister_types::CanisterHttpResponsePayload { - status: 200_u128, - headers: adapter_h - .clone() - .into_iter() - .map(|HttpHeader { name, value }| { - ic_management_canister_types::HttpHeader { name, value } - }) - .collect(), - body: adapter_b.clone(), - }) + Encode!( + &ic_management_canister_types_private::CanisterHttpResponsePayload { + status: 200_u128, + headers: adapter_h + .clone() + .into_iter() + .map(|HttpHeader { name, value }| { + ic_management_canister_types_private::HttpHeader { name, value } + }) + .collect(), + body: adapter_b.clone(), + } + ) .unwrap(), )), current_time(), diff --git a/rs/ingress_manager/Cargo.toml b/rs/ingress_manager/Cargo.toml index dc51570f1f0..2b6e39bc69b 100644 --- a/rs/ingress_manager/Cargo.toml +++ b/rs/ingress_manager/Cargo.toml @@ -14,7 +14,7 @@ ic-interfaces = { path = "../interfaces" } ic-interfaces-registry = { path = "../interfaces/registry" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } 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-registry-client-helpers = { path = "../registry/helpers" } ic-registry-keys = { path = "../registry/keys" } diff --git a/rs/ingress_manager/src/ingress_selector.rs b/rs/ingress_manager/src/ingress_selector.rs index 553bf46bad1..979c6e64636 100644 --- a/rs/ingress_manager/src/ingress_selector.rs +++ b/rs/ingress_manager/src/ingress_selector.rs @@ -15,7 +15,7 @@ use ic_interfaces::{ }; use ic_limits::{MAX_INGRESS_TTL, SMALL_APP_SUBNET_MAX_SIZE}; use ic_logger::warn; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_registry_client_helpers::subnet::IngressMessageSettings; use ic_replicated_state::ReplicatedState; use ic_types::{ @@ -668,7 +668,7 @@ mod tests { use ic_interfaces_mocks::consensus_pool::MockConsensusTime; use ic_interfaces_state_manager::{StateManagerError, StateManagerResult}; use ic_interfaces_state_manager_mocks::MockStateManager; - use ic_management_canister_types::{CanisterIdRecord, Payload, IC_00}; + use ic_management_canister_types_private::{CanisterIdRecord, Payload, IC_00}; use ic_metrics::MetricsRegistry; use ic_replicated_state::CanisterState; use ic_test_utilities::{ diff --git a/rs/interfaces/Cargo.toml b/rs/interfaces/Cargo.toml index 307e04bc40d..5a5fa059922 100644 --- a/rs/interfaces/Cargo.toml +++ b/rs/interfaces/Cargo.toml @@ -11,7 +11,7 @@ ic-base-types = { path = "../types/base_types" } ic-crypto-interfaces-sig-verification = { path = "../crypto/interfaces/sig_verification" } ic-error-types = { path = "../types/error_types" } ic-interfaces-state-manager = { path = "./state_manager" } -ic-management-canister-types = { path = "../types/management_canister_types" } +ic-management-canister-types-private = { path = "../types/management_canister_types" } ic-protobuf = { path = "../protobuf" } ic-registry-provisional-whitelist = { path = "../registry/provisional_whitelist" } ic-registry-subnet-type = { path = "../registry/subnet_type" } diff --git a/rs/interfaces/src/execution_environment.rs b/rs/interfaces/src/execution_environment.rs index 5ec2c5f58b2..813011d69e8 100644 --- a/rs/interfaces/src/execution_environment.rs +++ b/rs/interfaces/src/execution_environment.rs @@ -4,7 +4,7 @@ mod errors; pub use errors::{CanisterBacktrace, CanisterOutOfCyclesError, HypervisorError, TrapCode}; use ic_base_types::NumBytes; use ic_error_types::UserError; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_registry_provisional_whitelist::ProvisionalWhitelist; use ic_registry_subnet_type::SubnetType; use ic_sys::{PageBytes, PageIndex}; diff --git a/rs/ledger_suite/common/ledger_canister_core/Cargo.toml b/rs/ledger_suite/common/ledger_canister_core/Cargo.toml index 81d6e881697..06edbf39639 100644 --- a/rs/ledger_suite/common/ledger_canister_core/Cargo.toml +++ b/rs/ledger_suite/common/ledger_canister_core/Cargo.toml @@ -14,6 +14,6 @@ ic-canister-log = { path = "../../../rust_canisters/canister_log" } ic-limits = { path = "../../../limits" } ic-ledger-core = { path = "../ledger_core" } ic-ledger-hash-of = { path = "../../../../packages/ic-ledger-hash-of" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-utils = { path = "../../../utils" } serde = { workspace = true } diff --git a/rs/ledger_suite/common/ledger_canister_core/src/archive.rs b/rs/ledger_suite/common/ledger_canister_core/src/archive.rs index ff6b4dd59e3..7c3d4817e04 100644 --- a/rs/ledger_suite/common/ledger_canister_core/src/archive.rs +++ b/rs/ledger_suite/common/ledger_canister_core/src/archive.rs @@ -2,7 +2,7 @@ use crate::{runtime::Runtime, spawn}; use candid::{CandidType, Encode}; use ic_base_types::{CanisterId, PrincipalId}; use ic_canister_log::{log, Sink}; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use serde::{Deserialize, Serialize}; use std::borrow::Cow; use std::collections::VecDeque; @@ -385,12 +385,14 @@ async fn create_and_initialize_node_canister( canister_id: CanisterId, @@ -42,7 +44,7 @@ where IC_00, "create_canister", cycles_for_canister_creation, - (ic_management_canister_types::CreateCanisterArgs::default(),), + (ic_management_canister_types_private::CreateCanisterArgs::default(),), ) .await .map(|(record,): (CanisterIdRecord,)| record); diff --git a/rs/ledger_suite/tests/sm-tests/Cargo.toml b/rs/ledger_suite/tests/sm-tests/Cargo.toml index 7809a057777..50c31e89ff3 100644 --- a/rs/ledger_suite/tests/sm-tests/Cargo.toml +++ b/rs/ledger_suite/tests/sm-tests/Cargo.toml @@ -28,7 +28,7 @@ ic-ledger-canister-core = { path = "../../common/ledger_canister_core" } ic-ledger-core = { path = "../../common/ledger_core" } ic-ledger-hash-of = { path = "../../../../packages/ic-ledger-hash-of" } ic-rosetta-test-utils = { path = "../../../rosetta-api/icp/test_utils" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-registry-subnet-type = { path = "../../../registry/subnet_type" } ic-state-machine-tests = { path = "../../../state_machine_tests" } ic-types = { path = "../../../types/types" } diff --git a/rs/ledger_suite/tests/sm-tests/src/lib.rs b/rs/ledger_suite/tests/sm-tests/src/lib.rs index 5a84a1166d1..faeb3f9810c 100644 --- a/rs/ledger_suite/tests/sm-tests/src/lib.rs +++ b/rs/ledger_suite/tests/sm-tests/src/lib.rs @@ -17,8 +17,8 @@ use ic_ledger_core::timestamp::TimeStamp; use ic_ledger_core::tokens::TokensType; use ic_ledger_core::Tokens; use ic_ledger_hash_of::HashOf; -use ic_management_canister_types::CanisterSettingsArgsBuilder; -use ic_management_canister_types::{ +use ic_management_canister_types_private::CanisterSettingsArgsBuilder; +use ic_management_canister_types_private::{ self as ic00, CanisterInfoRequest, CanisterInfoResponse, Method, Payload, }; use ic_registry_subnet_type::SubnetType; diff --git a/rs/messaging/Cargo.toml b/rs/messaging/Cargo.toml index a953fe97c64..b67961b605e 100644 --- a/rs/messaging/Cargo.toml +++ b/rs/messaging/Cargo.toml @@ -20,7 +20,7 @@ ic-interfaces-certified-stream-store = { path = "../interfaces/certified_stream_ ic-interfaces-registry = { path = "../interfaces/registry" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } 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-query-stats = { path = "../query_stats" } diff --git a/rs/messaging/src/message_routing/tests.rs b/rs/messaging/src/message_routing/tests.rs index 5f42a49b406..2c796515ba1 100644 --- a/rs/messaging/src/message_routing/tests.rs +++ b/rs/messaging/src/message_routing/tests.rs @@ -11,7 +11,7 @@ use ic_crypto_test_utils_ni_dkg::{ use ic_interfaces_registry::RegistryValue; use ic_interfaces_state_manager::StateReader; use ic_interfaces_state_manager_mocks::MockStateManager; -use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; use ic_protobuf::registry::crypto::v1::{ChainKeySigningSubnetList, PublicKey as PublicKeyProto}; use ic_protobuf::registry::subnet::v1::SubnetRecord as SubnetRecordProto; use ic_protobuf::registry::{ diff --git a/rs/messaging/src/routing/stream_builder/tests.rs b/rs/messaging/src/routing/stream_builder/tests.rs index 9318d3b8e4c..0dc818676d5 100644 --- a/rs/messaging/src/routing/stream_builder/tests.rs +++ b/rs/messaging/src/routing/stream_builder/tests.rs @@ -3,7 +3,7 @@ use crate::message_routing::MessageRoutingMetrics; use super::*; use ic_base_types::NumSeconds; use ic_error_types::RejectCode; -use ic_management_canister_types::Method; +use ic_management_canister_types_private::Method; use ic_registry_routing_table::{CanisterIdRange, RoutingTable}; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::{ diff --git a/rs/messaging/src/scheduling/valid_set_rule.rs b/rs/messaging/src/scheduling/valid_set_rule.rs index 918f0bd8724..3b1ea1ad644 100644 --- a/rs/messaging/src/scheduling/valid_set_rule.rs +++ b/rs/messaging/src/scheduling/valid_set_rule.rs @@ -12,7 +12,7 @@ use ic_interfaces::{ }; use ic_limits::{INGRESS_HISTORY_MAX_MESSAGES, SMALL_APP_SUBNET_MAX_SIZE}; use ic_logger::{debug, error, trace, ReplicaLogger}; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_metrics::{buckets::decimal_buckets, buckets::linear_buckets, MetricsRegistry}; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::ReplicatedState; diff --git a/rs/messaging/src/scheduling/valid_set_rule/test.rs b/rs/messaging/src/scheduling/valid_set_rule/test.rs index c66f4ced6d2..248e119f43a 100644 --- a/rs/messaging/src/scheduling/valid_set_rule/test.rs +++ b/rs/messaging/src/scheduling/valid_set_rule/test.rs @@ -3,7 +3,7 @@ use super::*; use assert_matches::assert_matches; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterSettingsArgsBuilder, Payload, UpdateSettingsArgs, IC_00, }; use ic_registry_subnet_type::SubnetType; diff --git a/rs/messaging/src/state_machine/tests.rs b/rs/messaging/src/state_machine/tests.rs index 33e309f8751..7a8ff1dd7d1 100644 --- a/rs/messaging/src/state_machine/tests.rs +++ b/rs/messaging/src/state_machine/tests.rs @@ -6,7 +6,7 @@ use crate::{ }; use ic_interfaces::execution_environment::Scheduler; use ic_interfaces_state_manager::StateManager; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_metrics::MetricsRegistry; use ic_registry_subnet_features::SubnetFeatures; use ic_registry_subnet_type::SubnetType; diff --git a/rs/nervous_system/clients/Cargo.toml b/rs/nervous_system/clients/Cargo.toml index 5e85502c345..99ad88cb887 100644 --- a/rs/nervous_system/clients/Cargo.toml +++ b/rs/nervous_system/clients/Cargo.toml @@ -15,7 +15,7 @@ dfn_core = { path = "../../rust_canisters/dfn_core" } ic-base-types = { path = "../../types/base_types" } ic-error-types = { path = "../../types/error_types" } 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-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-proxied-canister-calls-tracker = { path = "../proxied_canister_calls_tracker" } ic-nervous-system-runtime = { path = "../runtime" } diff --git a/rs/nervous_system/clients/src/canister_status.rs b/rs/nervous_system/clients/src/canister_status.rs index bf787c42ffe..6f49533f2e4 100644 --- a/rs/nervous_system/clients/src/canister_status.rs +++ b/rs/nervous_system/clients/src/canister_status.rs @@ -1,7 +1,7 @@ use crate::canister_id_record::CanisterIdRecord; use candid::{CandidType, Deserialize}; use ic_base_types::{CanisterId, NumBytes, PrincipalId}; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_nervous_system_runtime::Runtime; use num_traits::cast::ToPrimitive; @@ -54,7 +54,7 @@ pub enum LogVisibility { AllowedViewers(Vec), } -/// Partial copy-paste of `ic_management_canister_types::DefiniteCanisterSettings`, and it's used +/// Partial copy-paste of `ic_management_canister_types_private::DefiniteCanisterSettings`, and it's used /// for the response type in the NNS/SNS Root `canister_status` method. /// /// Only the fields that we need are copied. Candid deserialization is supposed to be tolerant to @@ -71,7 +71,7 @@ pub struct DefiniteCanisterSettings { pub wasm_memory_threshold: Option, } -/// Partial copy-paste of `ic_management_canister_types::CanisterStatusResultV2`, and it's used for +/// Partial copy-paste of `ic_management_canister_types_private::CanisterStatusResultV2`, and it's used for /// the response type in the NNS/SNS Root `canister_status` method. /// /// Only the fields that we need are copied. Candid deserialization is supposed to be tolerant to @@ -89,7 +89,7 @@ pub struct CanisterStatusResult { pub query_stats: Option, } -/// Partial copy-paste of `ic_management_canister_types::QueryStats`, and it's used for the response +/// Partial copy-paste of `ic_management_canister_types_private::QueryStats`, and it's used for the response /// type in the NNS/SNS Root `canister_status` method. /// /// Only the fields that we need are copied. Candid deserialization is supposed to be tolerant to @@ -102,7 +102,7 @@ pub struct QueryStats { pub response_payload_bytes_total: Option, } -/// Copy-paste of `ic_management_canister_types::CanisterStatusResultV2`, and it's used for the +/// Copy-paste of `ic_management_canister_types_private::CanisterStatusResultV2`, and it's used for the /// `canister_status`` method on the management canister. #[derive(Clone, Eq, PartialEq, Debug, Default, CandidType, Deserialize)] pub struct CanisterStatusResultFromManagementCanister { @@ -116,7 +116,7 @@ pub struct CanisterStatusResultFromManagementCanister { pub query_stats: QueryStatsFromManagementCanister, } -/// Partial copy-paste of `ic_management_canister_types::DefiniteCanisterSettingsArgs`, and it's +/// Partial copy-paste of `ic_management_canister_types_private::DefiniteCanisterSettingsArgs`, and it's /// used for the response type in the management canister `canister_status` method. /// /// Only the fields that we need are copied. Candid deserialization is supposed to be tolerant to @@ -133,7 +133,7 @@ pub struct DefiniteCanisterSettingsFromManagementCanister { pub wasm_memory_threshold: candid::Nat, } -/// Partial copy-paste of `ic_management_canister_types::QueryStats`, and it's used for the response +/// Partial copy-paste of `ic_management_canister_types_private::QueryStats`, and it's used for the response /// type in the management canister `canister_status` method. #[derive(Clone, Eq, PartialEq, Debug, Default, CandidType, Deserialize)] pub struct QueryStatsFromManagementCanister { @@ -397,10 +397,10 @@ pub struct DefiniteCanisterSettingsArgs { pub wasm_memory_threshold: Option, } -impl From +impl From for DefiniteCanisterSettingsArgs { - fn from(settings: ic_management_canister_types::DefiniteCanisterSettingsArgs) -> Self { + fn from(settings: ic_management_canister_types_private::DefiniteCanisterSettingsArgs) -> Self { Self { controllers: settings.controllers(), compute_allocation: settings.compute_allocation(), diff --git a/rs/nervous_system/clients/src/management_canister_client.rs b/rs/nervous_system/clients/src/management_canister_client.rs index 93e8770a77d..32b18a47f5a 100644 --- a/rs/nervous_system/clients/src/management_canister_client.rs +++ b/rs/nervous_system/clients/src/management_canister_client.rs @@ -6,7 +6,7 @@ use crate::{ use async_trait::async_trait; use candid::Encode; use ic_error_types::RejectCode; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_nervous_system_proxied_canister_calls_tracker::ProxiedCanisterCallsTracker; use ic_nervous_system_runtime::Runtime; use std::{ diff --git a/rs/nervous_system/clients/src/update_settings.rs b/rs/nervous_system/clients/src/update_settings.rs index 56acee4adbf..ebf90f793d8 100644 --- a/rs/nervous_system/clients/src/update_settings.rs +++ b/rs/nervous_system/clients/src/update_settings.rs @@ -1,6 +1,6 @@ use candid::CandidType; use ic_base_types::PrincipalId; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_nervous_system_runtime::Runtime; use serde::Deserialize; diff --git a/rs/nervous_system/integration_tests/Cargo.toml b/rs/nervous_system/integration_tests/Cargo.toml index c6147a5066b..e71c7d2eac4 100644 --- a/rs/nervous_system/integration_tests/Cargo.toml +++ b/rs/nervous_system/integration_tests/Cargo.toml @@ -52,7 +52,7 @@ ic-error-types = { path = "../../types/error_types" } ic-icrc1 = { path = "../../ledger_suite/icrc1/" } ic-icrc1-index-ng = { path = "../../ledger_suite/icrc1/index-ng" } ic-icrc1-tokens-u64 = { path = "../../ledger_suite/icrc1/tokens_u64" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-common-test-keys = { path = "../common/test_keys" } ic-nervous-system-common-test-utils = { path = "../../nervous_system/common/test_utils" } ic-nervous-system-root = { path = "../root" } diff --git a/rs/nervous_system/integration_tests/tests/upgrade_sns_controlled_canister_with_large_wasm.rs b/rs/nervous_system/integration_tests/tests/upgrade_sns_controlled_canister_with_large_wasm.rs index 6ee7503a996..2144d6637ed 100644 --- a/rs/nervous_system/integration_tests/tests/upgrade_sns_controlled_canister_with_large_wasm.rs +++ b/rs/nervous_system/integration_tests/tests/upgrade_sns_controlled_canister_with_large_wasm.rs @@ -1,7 +1,7 @@ use assert_matches::assert_matches; use canister_test::Wasm; use ic_base_types::CanisterId; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_agent::management_canister::canister_status; use ic_nervous_system_agent::pocketic_impl::{ PocketIcAgent, PocketIcCallError::CanisterSubnetNotFound, diff --git a/rs/nervous_system/root/Cargo.toml b/rs/nervous_system/root/Cargo.toml index 7f4c22a2946..c072d6779c9 100644 --- a/rs/nervous_system/root/Cargo.toml +++ b/rs/nervous_system/root/Cargo.toml @@ -13,7 +13,7 @@ candid = { workspace = true } dfn_core = { path = "../../rust_canisters/dfn_core" } ic-cdk = { workspace = true } 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-nervous-system-clients = { path = "../clients" } ic-nervous-system-runtime = { path = "../runtime" } serde = { workspace = true } diff --git a/rs/nervous_system/root/src/change_canister.rs b/rs/nervous_system/root/src/change_canister.rs index d32dea8927c..36931482c97 100644 --- a/rs/nervous_system/root/src/change_canister.rs +++ b/rs/nervous_system/root/src/change_canister.rs @@ -4,7 +4,7 @@ use dfn_core::api::CanisterId; #[cfg(target_arch = "wasm32")] use dfn_core::println; use ic_crypto_sha2::Sha256; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallMode, CanisterInstallModeV2, ChunkHash, InstallChunkedCodeArgs, InstallCodeArgs, IC_00, }; diff --git a/rs/nns/cmc/Cargo.toml b/rs/nns/cmc/Cargo.toml index f590503d15b..80c7015352a 100644 --- a/rs/nns/cmc/Cargo.toml +++ b/rs/nns/cmc/Cargo.toml @@ -19,7 +19,7 @@ icrc-ledger-types = { path = "../../../packages/icrc-ledger-types" } ic-base-types = { path = "../../types/base_types" } ic-crypto-getrandom-for-wasm = { path = "../../crypto/getrandom_for_wasm" } 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-ledger-core = { path = "../../ledger_suite/common/ledger_core" } ic-metrics-encoder = "1" ic-nervous-system-clients = { path = "../../nervous_system/clients" } diff --git a/rs/nns/cmc/src/lib.rs b/rs/nns/cmc/src/lib.rs index 39bb8a74187..5a109cb771e 100644 --- a/rs/nns/cmc/src/lib.rs +++ b/rs/nns/cmc/src/lib.rs @@ -1,6 +1,6 @@ use candid::{CandidType, Nat}; // TODO(EXC-1687): remove temporary alias `Ic00CanisterSettingsArgs`. -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedControllers, CanisterSettingsArgs as Ic00CanisterSettingsArgs, LogVisibilityV2, }; use ic_nns_common::types::UpdateIcpXdrConversionRatePayload; diff --git a/rs/nns/cmc/src/main.rs b/rs/nns/cmc/src/main.rs index 57cb87c5f7b..78559d0e925 100644 --- a/rs/nns/cmc/src/main.rs +++ b/rs/nns/cmc/src/main.rs @@ -17,7 +17,7 @@ use ic_crypto_tree_hash::{ }; use ic_ledger_core::{block::BlockType, tokens::CheckedSub}; // TODO(EXC-1687): remove temporary aliases `Ic00CanisterSettingsArgs` and `Ic00CanisterSettingsArgsBuilder`. -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedVec, CanisterIdRecord, CanisterSettingsArgs as Ic00CanisterSettingsArgs, CanisterSettingsArgsBuilder as Ic00CanisterSettingsArgsBuilder, CreateCanisterArgs, Method, IC_00, diff --git a/rs/nns/governance/Cargo.toml b/rs/nns/governance/Cargo.toml index cce23c0cf03..558f1c84a44 100644 --- a/rs/nns/governance/Cargo.toml +++ b/rs/nns/governance/Cargo.toml @@ -42,7 +42,7 @@ ic-cdk-timers = { workspace = true } ic-crypto-getrandom-for-wasm = { path = "../../crypto/getrandom_for_wasm" } ic-crypto-sha2 = { path = "../../crypto/sha2/" } 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-nervous-system-canisters = { path = "../../nervous_system/canisters" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } diff --git a/rs/nns/governance/canister/canister.rs b/rs/nns/governance/canister/canister.rs index 276f7286f1d..fefdc5be7d5 100644 --- a/rs/nns/governance/canister/canister.rs +++ b/rs/nns/governance/canister/canister.rs @@ -6,7 +6,7 @@ use ic_cdk::{ api::{call::arg_data_raw, call_context_instruction_counter}, caller as ic_cdk_caller, heartbeat, post_upgrade, pre_upgrade, println, query, spawn, update, }; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_nervous_system_canisters::cmc::CMCCanister; use ic_nervous_system_common::{ memory_manager_upgrade_storage::{load_protobuf, store_protobuf}, diff --git a/rs/nns/governance/src/proposals/install_code.rs b/rs/nns/governance/src/proposals/install_code.rs index 5e69bebfbad..84b48c40bac 100644 --- a/rs/nns/governance/src/proposals/install_code.rs +++ b/rs/nns/governance/src/proposals/install_code.rs @@ -6,7 +6,7 @@ use crate::{ use candid::{CandidType, Deserialize, Encode}; use ic_base_types::CanisterId; -use ic_management_canister_types::CanisterInstallMode as RootCanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode as RootCanisterInstallMode; use ic_nervous_system_root::change_canister::ChangeCanisterRequest; use ic_nns_constants::{LIFELINE_CANISTER_ID, ROOT_CANISTER_ID}; use serde::Serialize; diff --git a/rs/nns/handlers/root/impl/Cargo.toml b/rs/nns/handlers/root/impl/Cargo.toml index 3e591c022d4..9d34c67b6e0 100644 --- a/rs/nns/handlers/root/impl/Cargo.toml +++ b/rs/nns/handlers/root/impl/Cargo.toml @@ -26,7 +26,7 @@ ic-canisters-http-types = { path = "../../../../rust_canisters/http_types" } ic-cdk = { workspace = true } ic-cdk-macros = { workspace = true } 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-metrics-encoder = "1" ic-nervous-system-clients = { path = "../../../../nervous_system/clients" } ic-nervous-system-common = { path = "../../../../nervous_system/common" } diff --git a/rs/nns/handlers/root/impl/src/canister_management.rs b/rs/nns/handlers/root/impl/src/canister_management.rs index a490846b52b..14db447b463 100644 --- a/rs/nns/handlers/root/impl/src/canister_management.rs +++ b/rs/nns/handlers/root/impl/src/canister_management.rs @@ -4,7 +4,7 @@ use ic_cdk::{ api::call::{call_with_payment, RejectionCode}, call, caller, print, }; -use ic_management_canister_types::{CanisterInstallMode::Install, InstallCodeArgs}; +use ic_management_canister_types_private::{CanisterInstallMode::Install, InstallCodeArgs}; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, management_canister_client::ManagementCanisterClient, diff --git a/rs/nns/handlers/root/impl/src/root_proposals.rs b/rs/nns/handlers/root/impl/src/root_proposals.rs index 7d7f30fa148..2390f7c2e34 100644 --- a/rs/nns/handlers/root/impl/src/root_proposals.rs +++ b/rs/nns/handlers/root/impl/src/root_proposals.rs @@ -1,7 +1,7 @@ use candid::{CandidType, Deserialize}; use ic_base_types::{CanisterId, NodeId, PrincipalId, SubnetId}; use ic_cdk::call; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::CanisterStatusResultFromManagementCanister, diff --git a/rs/nns/handlers/root/impl/tests/test.rs b/rs/nns/handlers/root/impl/tests/test.rs index 3893af00b97..6a30777340a 100644 --- a/rs/nns/handlers/root/impl/tests/test.rs +++ b/rs/nns/handlers/root/impl/tests/test.rs @@ -2,7 +2,7 @@ use assert_matches::assert_matches; use candid::Encode; use dfn_candid::candid; use ic_base_types::{CanisterId, PrincipalId}; -use ic_management_canister_types::CanisterInstallMode::Upgrade; +use ic_management_canister_types_private::CanisterInstallMode::Upgrade; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::CanisterStatusResult, }; diff --git a/rs/nns/handlers/root/impl/tests/test_bad_wasm.rs b/rs/nns/handlers/root/impl/tests/test_bad_wasm.rs index 40e2602aa19..7e65002f0c9 100644 --- a/rs/nns/handlers/root/impl/tests/test_bad_wasm.rs +++ b/rs/nns/handlers/root/impl/tests/test_bad_wasm.rs @@ -3,7 +3,7 @@ use candid::Encode; use canister_test::Runtime; use dfn_candid::candid; -use ic_management_canister_types::CanisterInstallMode::{self, Reinstall, Upgrade}; +use ic_management_canister_types_private::CanisterInstallMode::{self, Reinstall, Upgrade}; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::{CanisterStatusResult, CanisterStatusType}, diff --git a/rs/nns/handlers/root/impl/tests/test_reinstall_and_upgrade.rs b/rs/nns/handlers/root/impl/tests/test_reinstall_and_upgrade.rs index 135556d6564..924eed0a3ce 100644 --- a/rs/nns/handlers/root/impl/tests/test_reinstall_and_upgrade.rs +++ b/rs/nns/handlers/root/impl/tests/test_reinstall_and_upgrade.rs @@ -2,7 +2,9 @@ use assert_matches::assert_matches; use candid::Encode; use canister_test::{Project, Runtime}; use dfn_candid::{candid, candid_one}; -use ic_management_canister_types::CanisterInstallMode::{self, Install, Reinstall, Upgrade}; +use ic_management_canister_types_private::CanisterInstallMode::{ + self, Install, Reinstall, Upgrade, +}; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::{CanisterStatusResult, CanisterStatusType::Running}, diff --git a/rs/nns/handlers/root/impl/tests/test_upgrade_proposals_canister.rs b/rs/nns/handlers/root/impl/tests/test_upgrade_proposals_canister.rs index 5ff8ba9f11d..871edfe280d 100644 --- a/rs/nns/handlers/root/impl/tests/test_upgrade_proposals_canister.rs +++ b/rs/nns/handlers/root/impl/tests/test_upgrade_proposals_canister.rs @@ -1,6 +1,6 @@ use candid::Encode; use dfn_candid::candid; -use ic_management_canister_types::CanisterInstallMode::Upgrade; +use ic_management_canister_types_private::CanisterInstallMode::Upgrade; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::{CanisterStatusResult, CanisterStatusType::Running}, diff --git a/rs/nns/integration_tests/Cargo.toml b/rs/nns/integration_tests/Cargo.toml index 55aed4b3f53..24fc64e031c 100644 --- a/rs/nns/integration_tests/Cargo.toml +++ b/rs/nns/integration_tests/Cargo.toml @@ -79,7 +79,7 @@ ic-config = { path = "../../config" } ic-crypto = { path = "../../crypto" } ic-crypto-sha2 = { path = "../../crypto/sha2" } ic-error-types = { path = "../../types/error_types" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } ic-nervous-system-root = { path = "../../nervous_system/root" } ic-nns-constants = { path = "../constants" } diff --git a/rs/nns/integration_tests/src/autonomy.rs b/rs/nns/integration_tests/src/autonomy.rs index 04bc562fb94..1399ce8ae9e 100644 --- a/rs/nns/integration_tests/src/autonomy.rs +++ b/rs/nns/integration_tests/src/autonomy.rs @@ -4,7 +4,7 @@ use assert_matches::assert_matches; use dfn_candid::candid_multi_arity; use ic_error_types::ErrorCode; -use ic_management_canister_types::CanisterIdRecord; +use ic_management_canister_types_private::CanisterIdRecord; use ic_nns_test_utils::{ common::NnsInitPayloadsBuilder, itest_helpers::{state_machine_test_on_nns_subnet, NnsCanisters}, diff --git a/rs/nns/integration_tests/src/cycles_minting_canister.rs b/rs/nns/integration_tests/src/cycles_minting_canister.rs index 743b7a04c04..e9241069039 100644 --- a/rs/nns/integration_tests/src/cycles_minting_canister.rs +++ b/rs/nns/integration_tests/src/cycles_minting_canister.rs @@ -14,7 +14,7 @@ use dfn_protobuf::protobuf; use ic_canister_client_sender::Sender; use ic_ledger_core::tokens::{CheckedAdd, CheckedSub}; // TODO(EXC-1687): remove temporary alias `Ic00CanisterSettingsArgs`. -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInfoResponse, CanisterSettingsArgs as Ic00CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusResultV2, }; diff --git a/rs/nns/integration_tests/src/governance_mem_test.rs b/rs/nns/integration_tests/src/governance_mem_test.rs index 7f1914d2528..ed520a2492d 100644 --- a/rs/nns/integration_tests/src/governance_mem_test.rs +++ b/rs/nns/integration_tests/src/governance_mem_test.rs @@ -3,7 +3,7 @@ use candid::{Decode, Encode}; use canister_test::Project; use ic_base_types::PrincipalId; -use ic_management_canister_types::{CanisterInstallMode, CanisterSettingsArgsBuilder}; +use ic_management_canister_types_private::{CanisterInstallMode, CanisterSettingsArgsBuilder}; use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL}; use ic_nns_common::pb::v1::NeuronId; use ic_nns_constants::{ diff --git a/rs/nns/integration_tests/src/governance_upgrade.rs b/rs/nns/integration_tests/src/governance_upgrade.rs index 15d49a492c0..50cd5ae5227 100644 --- a/rs/nns/integration_tests/src/governance_upgrade.rs +++ b/rs/nns/integration_tests/src/governance_upgrade.rs @@ -8,7 +8,7 @@ use canister_test::Project; use dfn_candid::candid_one; use ic_base_types::PrincipalId; use ic_canister_client_sender::Sender; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, CanisterSettingsArgsBuilder, }; use ic_nervous_system_clients::canister_status::{CanisterStatusResult, CanisterStatusType}; diff --git a/rs/nns/integration_tests/src/lifeline.rs b/rs/nns/integration_tests/src/lifeline.rs index 5dde460c826..d6a5ec60354 100644 --- a/rs/nns/integration_tests/src/lifeline.rs +++ b/rs/nns/integration_tests/src/lifeline.rs @@ -1,6 +1,6 @@ use canister_test::Project; use ic_base_types::CanisterId; -use ic_management_canister_types::{CanisterInstallMode, CanisterStatusType}; +use ic_management_canister_types_private::{CanisterInstallMode, CanisterStatusType}; use ic_nervous_system_clients::canister_id_record::CanisterIdRecord; use ic_nervous_system_common_test_keys::{ TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_ID, diff --git a/rs/nns/integration_tests/src/reinstall_and_upgrade.rs b/rs/nns/integration_tests/src/reinstall_and_upgrade.rs index 8e023b24c86..8c32f664861 100644 --- a/rs/nns/integration_tests/src/reinstall_and_upgrade.rs +++ b/rs/nns/integration_tests/src/reinstall_and_upgrade.rs @@ -2,7 +2,7 @@ use candid::Encode; use canister_test::{Canister, Project, Wasm}; use dfn_candid::candid_one; use ic_canister_client_sender::Sender; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_common_test_keys::{ TEST_NEURON_2_ID, TEST_NEURON_2_OWNER_KEYPAIR, TEST_NEURON_2_OWNER_PRINCIPAL, }; diff --git a/rs/nns/integration_tests/src/root_proposals.rs b/rs/nns/integration_tests/src/root_proposals.rs index d7c67c486a4..2ca96384af6 100644 --- a/rs/nns/integration_tests/src/root_proposals.rs +++ b/rs/nns/integration_tests/src/root_proposals.rs @@ -1,7 +1,7 @@ use canister_test::{Canister, Project}; use ic_base_types::PrincipalId; use ic_canister_client_sender::Sender; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::CanisterStatusResult, }; diff --git a/rs/nns/sns-wasm/Cargo.toml b/rs/nns/sns-wasm/Cargo.toml index d5d6c013570..a5cd29abd4b 100644 --- a/rs/nns/sns-wasm/Cargo.toml +++ b/rs/nns/sns-wasm/Cargo.toml @@ -19,7 +19,7 @@ ic-base-types = { path = "../../types/base_types" } ic-canisters-http-types = { path = "../../rust_canisters/http_types" } ic-cdk = { workspace = true } 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-metrics-encoder = "1" ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } @@ -50,7 +50,7 @@ candid_parser = { workspace = true } canister-test = { path = "../../rust_canisters/canister_test" } ic-icrc1 = { path = "../../ledger_suite/icrc1" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-common-test-utils = { path = "../../nervous_system/common/test_utils" } ic-nns-test-utils = { path = "../test_utils" } diff --git a/rs/nns/sns-wasm/canister/canister.rs b/rs/nns/sns-wasm/canister/canister.rs index c17ad3f2247..866e46b7965 100644 --- a/rs/nns/sns-wasm/canister/canister.rs +++ b/rs/nns/sns-wasm/canister/canister.rs @@ -2,7 +2,7 @@ use async_trait::async_trait; use ic_base_types::{PrincipalId, SubnetId}; use ic_canisters_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder}; use ic_cdk::api::call::{CallResult, RejectionCode}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallMode::Install, CanisterSettingsArgsBuilder, CreateCanisterArgs, InstallCodeArgs, Method, UpdateSettingsArgs, }; diff --git a/rs/nns/sns-wasm/tests/upgrade_sns_instance.rs b/rs/nns/sns-wasm/tests/upgrade_sns_instance.rs index e5ac35a62c5..68bd946abce 100644 --- a/rs/nns/sns-wasm/tests/upgrade_sns_instance.rs +++ b/rs/nns/sns-wasm/tests/upgrade_sns_instance.rs @@ -3,7 +3,7 @@ use candid::{Decode, Encode, Nat}; use canister_test::Project; use ic_base_types::{CanisterId, PrincipalId}; use ic_icrc1_ledger::LedgerArgument; -use ic_management_canister_types::{CanisterIdRecord, CanisterInstallMode}; +use ic_management_canister_types_private::{CanisterIdRecord, CanisterInstallMode}; use ic_nervous_system_clients::canister_status::{CanisterStatusResultV2, CanisterStatusType}; use ic_nervous_system_common::{ledger::compute_neuron_staking_subaccount, DEFAULT_TRANSFER_FEE}; use ic_nns_constants::{GOVERNANCE_CANISTER_ID, SNS_WASM_CANISTER_ID}; diff --git a/rs/nns/test_utils/Cargo.toml b/rs/nns/test_utils/Cargo.toml index 294afe58d84..3017f2e34b8 100644 --- a/rs/nns/test_utils/Cargo.toml +++ b/rs/nns/test_utils/Cargo.toml @@ -30,7 +30,7 @@ ic-crypto-test-utils-ni-dkg = { path = "../../crypto/test_utils/ni-dkg" } ic-crypto-test-utils-reproducible-rng = { path = "../../crypto/test_utils/reproducible_rng" } ic-crypto-utils-ni-dkg = { path = "../../crypto/utils/ni_dkg" } ic-icrc1 = { path = "../../ledger_suite/icrc1" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } diff --git a/rs/nns/test_utils/src/itest_helpers.rs b/rs/nns/test_utils/src/itest_helpers.rs index 166cb785d32..aad2cf653a1 100644 --- a/rs/nns/test_utils/src/itest_helpers.rs +++ b/rs/nns/test_utils/src/itest_helpers.rs @@ -16,7 +16,7 @@ use dfn_candid::{candid_one, CandidOne}; use futures::{future::join_all, FutureExt}; use ic_canister_client_sender::Sender; use ic_config::Config; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR}; use ic_nns_common::{ init::LifelineCanisterInitPayload, diff --git a/rs/nns/test_utils/src/state_test_helpers.rs b/rs/nns/test_utils/src/state_test_helpers.rs index 819e11e898c..ba8a7f29f2d 100644 --- a/rs/nns/test_utils/src/state_test_helpers.rs +++ b/rs/nns/test_utils/src/state_test_helpers.rs @@ -11,7 +11,7 @@ use cycles_minting_canister::{ use dfn_http::types::{HttpRequest, HttpResponse}; use dfn_protobuf::ToProto; use ic_base_types::{CanisterId, PrincipalId, SubnetId}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallMode, CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusResultV2, UpdateSettingsArgs, }; diff --git a/rs/orchestrator/Cargo.toml b/rs/orchestrator/Cargo.toml index f1948ce0d5b..2724755cbf5 100644 --- a/rs/orchestrator/Cargo.toml +++ b/rs/orchestrator/Cargo.toml @@ -34,7 +34,7 @@ ic-image-upgrader = { path = "./image_upgrader" } ic-interfaces = { path = "../interfaces" } ic-interfaces-registry = { path = "../interfaces/registry" } 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-nns-constants = { path = "../nns/constants" } ic-protobuf = { path = "../protobuf" } diff --git a/rs/orchestrator/src/upgrade.rs b/rs/orchestrator/src/upgrade.rs index 5035d848612..b46b90553ff 100644 --- a/rs/orchestrator/src/upgrade.rs +++ b/rs/orchestrator/src/upgrade.rs @@ -14,7 +14,7 @@ use ic_image_upgrader::{ }; use ic_interfaces_registry::RegistryClient; use ic_logger::{error, info, warn, ReplicaLogger}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::proxy::try_from_option_field; use ic_registry_client_helpers::{node::NodeRegistry, subnet::SubnetRegistry}; use ic_registry_local_store::LocalStoreImpl; @@ -937,7 +937,7 @@ mod tests { generate_key_transcript, CanisterThresholdSigTestEnvironment, IDkgParticipants, }; use ic_crypto_test_utils_reproducible_rng::{reproducible_rng, ReproducibleRng}; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId}; + use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId}; use ic_metrics::MetricsRegistry; use ic_test_utilities_consensus::fake::{Fake, FakeContent}; use ic_test_utilities_logger::with_test_replica_logger; diff --git a/rs/pocket_ic_server/Cargo.toml b/rs/pocket_ic_server/Cargo.toml index 4f32b553121..c554b446a17 100644 --- a/rs/pocket_ic_server/Cargo.toml +++ b/rs/pocket_ic_server/Cargo.toml @@ -47,7 +47,7 @@ ic-interfaces = { path = "../interfaces" } ic-interfaces-adapter-client = { path = "../interfaces/adapter_client" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } 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-keys = { path = "../registry/keys" } diff --git a/rs/pocket_ic_server/src/pocket_ic.rs b/rs/pocket_ic_server/src/pocket_ic.rs index 7f9dc473c0c..6c4ff7d934e 100644 --- a/rs/pocket_ic_server/src/pocket_ic.rs +++ b/rs/pocket_ic_server/src/pocket_ic.rs @@ -39,7 +39,7 @@ use ic_interfaces::{crypto::BasicSigner, ingress_pool::IngressPoolThrottler}; use ic_interfaces_adapter_client::NonBlockingChannel; use ic_interfaces_state_manager::StateReader; use ic_logger::ReplicaLogger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, Method as Ic00Method, ProvisionalCreateCanisterWithCyclesArgs, SchnorrAlgorithm, SchnorrKeyId, }; diff --git a/rs/pocket_ic_server/tests/test.rs b/rs/pocket_ic_server/tests/test.rs index 68d9ad3eb06..b4fea50812b 100644 --- a/rs/pocket_ic_server/tests/test.rs +++ b/rs/pocket_ic_server/tests/test.rs @@ -5,7 +5,7 @@ use ic_cdk::api::management_canister::provisional::ProvisionalCreateCanisterWith use ic_interfaces_registry::{ RegistryDataProvider, RegistryVersionedRecord, ZERO_REGISTRY_VERSION, }; -use ic_management_canister_types::ProvisionalCreateCanisterWithCyclesArgs; +use ic_management_canister_types_private::ProvisionalCreateCanisterWithCyclesArgs; use ic_registry_proto_data_provider::ProtoRegistryDataProvider; use ic_registry_transport::pb::v1::{ registry_mutation::Type, RegistryAtomicMutateRequest, RegistryMutation, diff --git a/rs/prep/Cargo.toml b/rs/prep/Cargo.toml index 5b0e2290cc6..6b6ba893672 100644 --- a/rs/prep/Cargo.toml +++ b/rs/prep/Cargo.toml @@ -21,7 +21,7 @@ ic-interfaces = { path = "../interfaces" } ic-interfaces-registry = { path = "../interfaces/registry" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } 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 = { path = "../registry/client" } diff --git a/rs/prep/src/initialized_subnet.rs b/rs/prep/src/initialized_subnet.rs index a8bf26945c7..bcb79a16bd8 100644 --- a/rs/prep/src/initialized_subnet.rs +++ b/rs/prep/src/initialized_subnet.rs @@ -4,7 +4,7 @@ use std::{ path::{Path, PathBuf}, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::registry::{ crypto::v1::{ChainKeySigningSubnetList, PublicKey}, subnet::v1::{CatchUpPackageContents, SubnetRecord}, diff --git a/rs/recovery/Cargo.toml b/rs/recovery/Cargo.toml index 2b234dbdd50..c74a8325327 100644 --- a/rs/recovery/Cargo.toml +++ b/rs/recovery/Cargo.toml @@ -8,7 +8,7 @@ documentation.workspace = true [dependencies] base64 = { workspace = true } -clap = { workspace = true} +clap = { workspace = true } futures = { workspace = true } hex = { workspace = true } ic-artifact-pool = { path = "../artifact_pool" } @@ -20,7 +20,7 @@ ic-cup-explorer = { path = "../cup_explorer" } ic-http-utils = { path = "../http_utils" } ic-interfaces = { path = "../interfaces" } ic-interfaces-registry = { path = "../interfaces/registry" } -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 = { path = "../registry/client" } diff --git a/rs/recovery/src/admin_helper.rs b/rs/recovery/src/admin_helper.rs index 7035d114ac9..2a33564eda0 100644 --- a/rs/recovery/src/admin_helper.rs +++ b/rs/recovery/src/admin_helper.rs @@ -336,7 +336,7 @@ mod tests { use super::*; use ic_base_types::PrincipalId; - use ic_management_canister_types::{ + use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; use ic_registry_subnet_features::KeyConfig; diff --git a/rs/registry/admin/Cargo.toml b/rs/registry/admin/Cargo.toml index 055a990025b..9b24f55e9c7 100644 --- a/rs/registry/admin/Cargo.toml +++ b/rs/registry/admin/Cargo.toml @@ -25,7 +25,7 @@ ic-crypto-internal-types = { path = "../../crypto/internal/crypto_lib/types" } ic-crypto-utils-threshold-sig-der = { path = "../../crypto/utils/threshold_sig_der" } ic-http-utils = { path = "../../http_utils" } ic-interfaces-registry = { path = "../../interfaces/registry" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } @@ -55,7 +55,7 @@ ic-sns-init = { path = "../../sns/init" } ic-sns-swap = { path = "../../sns/swap" } ic-sns-wasm = { path = "../../nns/sns-wasm" } ic-types = { path = "../../types/types" } -indexmap = "2.2.6" # TODO: consider using the std's BTreeMap instead +indexmap = "2.2.6" # TODO: consider using the std's BTreeMap instead itertools = { workspace = true } maplit = "1.0.2" pretty_assertions = { workspace = true } diff --git a/rs/registry/admin/src/create_subnet.rs b/rs/registry/admin/src/create_subnet.rs index 03ab8c0a00c..58c3d171614 100644 --- a/rs/registry/admin/src/create_subnet.rs +++ b/rs/registry/admin/src/create_subnet.rs @@ -7,7 +7,7 @@ use async_trait::async_trait; use clap::Parser; use ic_admin_derive::derive_common_proposal_fields; use ic_canister_client::{Agent, Sender}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_common::types::NeuronId; use ic_prep_lib::subnet_configuration::get_default_config_params; use ic_protobuf::registry::subnet::v1::SubnetFeatures as SubnetFeaturesPb; @@ -309,7 +309,9 @@ impl ProposalPayload for ProposeToCreateS mod tests { use std::str::FromStr; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{ + EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, + }; use ic_types::PrincipalId; use super::*; diff --git a/rs/registry/admin/src/main.rs b/rs/registry/admin/src/main.rs index 825deaa928e..b14cd8a8a0a 100644 --- a/rs/registry/admin/src/main.rs +++ b/rs/registry/admin/src/main.rs @@ -21,7 +21,7 @@ use ic_crypto_utils_threshold_sig_der::{ }; use ic_http_utils::file_downloader::{check_file_hash, FileDownloader}; use ic_interfaces_registry::{RegistryClient, RegistryDataProvider}; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::CanisterStatusResult, }; diff --git a/rs/registry/admin/src/recover_subnet.rs b/rs/registry/admin/src/recover_subnet.rs index 6eb2fd4f2a0..be3310d44d0 100644 --- a/rs/registry/admin/src/recover_subnet.rs +++ b/rs/registry/admin/src/recover_subnet.rs @@ -8,7 +8,7 @@ use async_trait::async_trait; use clap::Parser; use ic_admin_derive::derive_common_proposal_fields; use ic_canister_client::{Agent, Sender}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_common::types::NeuronId; use ic_registry_nns_data_provider::registry::RegistryCanister; use ic_types::{NodeId, PrincipalId, SubnetId}; @@ -220,7 +220,9 @@ impl ProposalPayload for ProposeToUpdat mod tests { use std::str::FromStr; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{ + EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, + }; use ic_types::PrincipalId; use super::*; diff --git a/rs/registry/admin/src/update_subnet.rs b/rs/registry/admin/src/update_subnet.rs index 0eff0559601..d74bcaf806f 100644 --- a/rs/registry/admin/src/update_subnet.rs +++ b/rs/registry/admin/src/update_subnet.rs @@ -8,7 +8,7 @@ use async_trait::async_trait; use clap::Parser; use ic_admin_derive::derive_common_proposal_fields; use ic_canister_client::{Agent, Sender}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_common::types::NeuronId; use ic_registry_nns_data_provider::registry::RegistryCanister; use ic_registry_subnet_features::SubnetFeatures; @@ -348,7 +348,9 @@ impl ProposalPayload for ProposeToUpdateS #[cfg(test)] mod tests { - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{ + EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, + }; use ic_registry_subnet_features::{ChainKeyConfig, KeyConfig}; use ic_types::PrincipalId; diff --git a/rs/registry/canister/Cargo.toml b/rs/registry/canister/Cargo.toml index 6e2d38ac566..7594c681f4e 100644 --- a/rs/registry/canister/Cargo.toml +++ b/rs/registry/canister/Cargo.toml @@ -25,7 +25,7 @@ ic-crypto-node-key-validation = { path = "../../crypto/node_key_validation" } ic-crypto-sha2 = { path = "../../crypto/sha2/" } ic-crypto-utils-basic-sig = { path = "../../crypto/utils/basic_sig" } ic-crypto-utils-ni-dkg = { path = "../../crypto/utils/ni_dkg" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-metrics-encoder = "1" ic-nervous-system-canisters = { path = "../../nervous_system/canisters" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } @@ -55,7 +55,7 @@ serde = { workspace = true } url = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -getrandom = { version = "0.2", features = [ "custom" ] } +getrandom = { version = "0.2", features = ["custom"] } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] assert_matches = { workspace = true } diff --git a/rs/registry/canister/src/chain_key.rs b/rs/registry/canister/src/chain_key.rs index a82d0bed14e..55f99f9116d 100644 --- a/rs/registry/canister/src/chain_key.rs +++ b/rs/registry/canister/src/chain_key.rs @@ -1,6 +1,6 @@ use candid::CandidType; use ic_base_types::PrincipalId; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::registry::subnet::v1::{ ChainKeyConfig as ChainKeyConfigPb, KeyConfig as KeyConfigPb, }; diff --git a/rs/registry/canister/src/invariants/crypto/tests.rs b/rs/registry/canister/src/invariants/crypto/tests.rs index 411ac6b0767..7a108f933a6 100644 --- a/rs/registry/canister/src/invariants/crypto/tests.rs +++ b/rs/registry/canister/src/invariants/crypto/tests.rs @@ -601,7 +601,7 @@ mod ecdsa_signing_subnet_lists { use super::*; use crate::common::test_helpers::invariant_compliant_registry; use ic_base_types::{subnet_id_into_protobuf, SubnetId}; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; + use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; use ic_protobuf::registry::crypto::v1::ChainKeySigningSubnetList; use ic_protobuf::registry::subnet::v1::{ ChainKeyConfig as ChainKeyConfigPb, KeyConfig as KeyConfigPb, diff --git a/rs/registry/canister/src/mutations/do_create_subnet.rs b/rs/registry/canister/src/mutations/do_create_subnet.rs index ad974c9ad45..2fb1850b46e 100644 --- a/rs/registry/canister/src/mutations/do_create_subnet.rs +++ b/rs/registry/canister/src/mutations/do_create_subnet.rs @@ -5,7 +5,7 @@ use dfn_core::api::{call, CanisterId}; #[cfg(target_arch = "wasm32")] use dfn_core::println; use ic_base_types::{NodeId, PrincipalId, RegistryVersion, SubnetId}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ EcdsaKeyId, MasterPublicKeyId, SetupInitialDKGArgs, SetupInitialDKGResponse, }; use ic_protobuf::registry::{ @@ -527,7 +527,7 @@ mod test { add_fake_subnet, get_invariant_compliant_subnet_record, invariant_compliant_registry, prepare_registry_with_nodes, }; - use ic_management_canister_types::EcdsaCurve; + use ic_management_canister_types_private::EcdsaCurve; use ic_nervous_system_common_test_keys::{TEST_USER1_PRINCIPAL, TEST_USER2_PRINCIPAL}; use ic_registry_subnet_features::{ChainKeyConfig, DEFAULT_ECDSA_MAX_QUEUE_SIZE}; use ic_types::ReplicaVersion; diff --git a/rs/registry/canister/src/mutations/do_recover_subnet.rs b/rs/registry/canister/src/mutations/do_recover_subnet.rs index d7a30a5ffff..04688231a0c 100644 --- a/rs/registry/canister/src/mutations/do_recover_subnet.rs +++ b/rs/registry/canister/src/mutations/do_recover_subnet.rs @@ -15,7 +15,7 @@ use dfn_core::api::{call, CanisterId}; #[cfg(target_arch = "wasm32")] use dfn_core::println; use ic_base_types::{NodeId, PrincipalId, RegistryVersion, SubnetId}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ MasterPublicKeyId, SetupInitialDKGArgs, SetupInitialDKGResponse, }; use ic_protobuf::registry::subnet::v1::{ChainKeyConfig as ChainKeyConfigPb, RegistryStoreUri}; @@ -489,7 +489,7 @@ mod test { registry::Registry, }; use ic_base_types::SubnetId; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId}; + use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId}; use ic_protobuf::registry::subnet::v1::{ChainKeyConfig as ChainKeyConfigPb, SubnetRecord}; use ic_registry_subnet_features::{ChainKeyConfig, DEFAULT_ECDSA_MAX_QUEUE_SIZE}; use ic_registry_transport::{delete, upsert}; diff --git a/rs/registry/canister/src/mutations/do_update_node_directly.rs b/rs/registry/canister/src/mutations/do_update_node_directly.rs index da85a98e278..554f8df65bb 100644 --- a/rs/registry/canister/src/mutations/do_update_node_directly.rs +++ b/rs/registry/canister/src/mutations/do_update_node_directly.rs @@ -204,7 +204,7 @@ mod test { use ic_config::crypto::CryptoConfig; use ic_crypto_node_key_generation::generate_node_keys_once; use ic_crypto_node_key_validation::ValidNodePublicKeys; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; + use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId}; use ic_protobuf::registry::subnet::v1::{ChainKeyConfig as ChainKeyConfigPb, SubnetRecord}; use ic_registry_subnet_features::{ChainKeyConfig, KeyConfig, DEFAULT_ECDSA_MAX_QUEUE_SIZE}; use ic_test_utilities_types::ids::subnet_test_id; diff --git a/rs/registry/canister/src/mutations/do_update_subnet.rs b/rs/registry/canister/src/mutations/do_update_subnet.rs index 21a43ca7e0b..ca826a6387f 100644 --- a/rs/registry/canister/src/mutations/do_update_subnet.rs +++ b/rs/registry/canister/src/mutations/do_update_subnet.rs @@ -2,7 +2,7 @@ use crate::{common::LOG_PREFIX, mutations::common::has_duplicates, registry::Reg use candid::{CandidType, Deserialize}; use dfn_core::println; use ic_base_types::{subnet_id_into_protobuf, SubnetId}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::registry::subnet::v1::{ SubnetFeatures as SubnetFeaturesPb, SubnetRecord as SubnetRecordPb, }; @@ -494,7 +494,9 @@ mod tests { add_fake_subnet, get_invariant_compliant_subnet_record, invariant_compliant_registry, prepare_registry_with_nodes, }; - use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{ + EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, + }; use ic_nervous_system_common_test_keys::{TEST_USER1_PRINCIPAL, TEST_USER2_PRINCIPAL}; use ic_protobuf::registry::subnet::v1::{ ChainKeyConfig as ChainKeyConfigPb, KeyConfig as KeyConfigPb, diff --git a/rs/registry/canister/src/mutations/subnet.rs b/rs/registry/canister/src/mutations/subnet.rs index 1b0594fe84c..cf097c3b5b1 100644 --- a/rs/registry/canister/src/mutations/subnet.rs +++ b/rs/registry/canister/src/mutations/subnet.rs @@ -9,7 +9,7 @@ use dfn_core::call; use ic_base_types::{ subnet_id_into_protobuf, CanisterId, NodeId, PrincipalId, RegistryVersion, SubnetId, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ ComputeInitialIDkgDealingsArgs, ComputeInitialIDkgDealingsResponse, MasterPublicKeyId, }; use ic_protobuf::registry::{ diff --git a/rs/registry/canister/tests/common/test_helpers.rs b/rs/registry/canister/tests/common/test_helpers.rs index 16e415e05b5..b2e2db52e71 100644 --- a/rs/registry/canister/tests/common/test_helpers.rs +++ b/rs/registry/canister/tests/common/test_helpers.rs @@ -4,7 +4,7 @@ use candid::Encode; use canister_test::{Canister, Runtime}; use ic_base_types::{NodeId, PrincipalId, RegistryVersion, SubnetId}; use ic_crypto_node_key_validation::ValidNodePublicKeys; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ DerivationPath, ECDSAPublicKeyArgs, EcdsaKeyId, MasterPublicKeyId, Method as Ic00Method, SchnorrKeyId, SchnorrPublicKeyArgs, }; diff --git a/rs/registry/canister/tests/create_subnet.rs b/rs/registry/canister/tests/create_subnet.rs index 2b9b117667d..7e56a20ebe5 100644 --- a/rs/registry/canister/tests/create_subnet.rs +++ b/rs/registry/canister/tests/create_subnet.rs @@ -10,7 +10,7 @@ use dfn_candid::candid; use ic_base_types::{PrincipalId, SubnetId}; use ic_config::Config; use ic_interfaces_registry::RegistryClient; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; use ic_nns_test_utils::itest_helpers::try_call_via_universal_canister; diff --git a/rs/registry/canister/tests/recover_subnet.rs b/rs/registry/canister/tests/recover_subnet.rs index d4b182d23b6..10ba3808451 100644 --- a/rs/registry/canister/tests/recover_subnet.rs +++ b/rs/registry/canister/tests/recover_subnet.rs @@ -4,7 +4,7 @@ use ic_base_types::{subnet_id_into_protobuf, NodeId, PrincipalId, SubnetId}; use ic_config::Config; use ic_crypto_test_utils_reproducible_rng::reproducible_rng; use ic_interfaces_registry::RegistryClient; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; use ic_nns_test_utils::{ diff --git a/rs/registry/canister/tests/update_subnet.rs b/rs/registry/canister/tests/update_subnet.rs index a3a06be8ccb..e0770120512 100644 --- a/rs/registry/canister/tests/update_subnet.rs +++ b/rs/registry/canister/tests/update_subnet.rs @@ -2,7 +2,7 @@ use assert_matches::assert_matches; use candid::Encode; use dfn_candid::candid; use ic_base_types::{subnet_id_try_from_protobuf, PrincipalId, SubnetId}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; use ic_nns_test_utils::registry::TEST_ID; diff --git a/rs/registry/helpers/Cargo.toml b/rs/registry/helpers/Cargo.toml index c765c080ae8..9272cf8f318 100644 --- a/rs/registry/helpers/Cargo.toml +++ b/rs/registry/helpers/Cargo.toml @@ -10,7 +10,7 @@ documentation.workspace = true ic-base-types = { path = "../../types/base_types" } ic-interfaces-registry = { path = "../../interfaces/registry" } ic-limits = { path = "../../limits" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-protobuf = { path = "../../protobuf" } ic-registry-common-proto = { path = "../proto" } ic-registry-keys = { path = "../keys" } diff --git a/rs/registry/helpers/src/chain_keys.rs b/rs/registry/helpers/src/chain_keys.rs index 8581d61ee6b..4b48f08c1e3 100644 --- a/rs/registry/helpers/src/chain_keys.rs +++ b/rs/registry/helpers/src/chain_keys.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use ic_interfaces_registry::{RegistryClient, RegistryClientResult}; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::registry::crypto::v1::ChainKeySigningSubnetList; use ic_registry_keys::{ get_master_public_key_id_from_signing_subnet_list_key, CHAIN_KEY_SIGNING_SUBNET_LIST_KEY_PREFIX, diff --git a/rs/registry/helpers/src/ecdsa_keys.rs b/rs/registry/helpers/src/ecdsa_keys.rs index f8a6379130e..bc9935134be 100644 --- a/rs/registry/helpers/src/ecdsa_keys.rs +++ b/rs/registry/helpers/src/ecdsa_keys.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use ic_interfaces_registry::{RegistryClient, RegistryClientResult}; -use ic_management_canister_types::EcdsaKeyId; +use ic_management_canister_types_private::EcdsaKeyId; use ic_protobuf::registry::crypto::v1::EcdsaSigningSubnetList; use ic_registry_keys::{ get_ecdsa_key_id_from_signing_subnet_list_key, ECDSA_SIGNING_SUBNET_LIST_KEY_PREFIX, diff --git a/rs/registry/keys/Cargo.toml b/rs/registry/keys/Cargo.toml index 58149590d11..4890dcaf28c 100644 --- a/rs/registry/keys/Cargo.toml +++ b/rs/registry/keys/Cargo.toml @@ -9,7 +9,7 @@ documentation.workspace = true [dependencies] candid = { workspace = true } ic-base-types = { path = "../../types/base_types" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-types = { path = "../../types/types" } serde = { workspace = true } diff --git a/rs/registry/keys/src/lib.rs b/rs/registry/keys/src/lib.rs index 28ef39bb687..e0ffbcfb757 100644 --- a/rs/registry/keys/src/lib.rs +++ b/rs/registry/keys/src/lib.rs @@ -6,7 +6,7 @@ use candid::{CandidType, Deserialize}; use core::fmt; use ic_base_types::{NodeId, SubnetId}; -use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId}; use ic_types::crypto::KeyPurpose; use ic_types::registry::RegistryClientError; use ic_types::PrincipalId; @@ -372,7 +372,7 @@ pub fn make_nns_canister_records_key() -> String { #[cfg(test)] mod tests { use super::*; - use ic_management_canister_types::{EcdsaCurve, SchnorrAlgorithm, SchnorrKeyId}; + use ic_management_canister_types_private::{EcdsaCurve, SchnorrAlgorithm, SchnorrKeyId}; use rand::Rng; use strum::IntoEnumIterator; diff --git a/rs/registry/subnet_features/Cargo.toml b/rs/registry/subnet_features/Cargo.toml index 9cb0efaee27..421bf332fc6 100644 --- a/rs/registry/subnet_features/Cargo.toml +++ b/rs/registry/subnet_features/Cargo.toml @@ -8,6 +8,6 @@ documentation.workspace = true [dependencies] candid = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-protobuf = { path = "../../protobuf" } serde = { workspace = true } diff --git a/rs/registry/subnet_features/src/lib.rs b/rs/registry/subnet_features/src/lib.rs index 6ba58e12616..ff3280e2691 100644 --- a/rs/registry/subnet_features/src/lib.rs +++ b/rs/registry/subnet_features/src/lib.rs @@ -1,5 +1,5 @@ use candid::CandidType; -use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId}; use ic_protobuf::types::v1 as pb_types; use ic_protobuf::{ proxy::{try_from_option_field, ProxyDecodeError}, @@ -194,7 +194,7 @@ impl TryFrom for ChainKeyConfig { #[cfg(test)] mod tests { - use ic_management_canister_types::EcdsaCurve; + use ic_management_canister_types_private::EcdsaCurve; use super::*; use std::str::FromStr; diff --git a/rs/replica/Cargo.toml b/rs/replica/Cargo.toml index e1253355c52..2e653f3619b 100644 --- a/rs/replica/Cargo.toml +++ b/rs/replica/Cargo.toml @@ -66,7 +66,7 @@ assert_cmd = { workspace = true } canister-test = { path = "../rust_canisters/canister_test" } criterion = { workspace = true } ic-interfaces-registry-mocks = { path = "../interfaces/registry/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" } predicates = { workspace = true } wat = { workspace = true } diff --git a/rs/replica_tests/Cargo.toml b/rs/replica_tests/Cargo.toml index 23a5deaefaa..6e7b12c1fdb 100644 --- a/rs/replica_tests/Cargo.toml +++ b/rs/replica_tests/Cargo.toml @@ -20,7 +20,7 @@ ic-execution-environment = { path = "../execution_environment" } ic-interfaces = { path = "../interfaces" } ic-interfaces-registry = { path = "../interfaces/registry" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } -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-prep = { path = "../prep" } ic-protobuf = { path = "../protobuf" } diff --git a/rs/replica_tests/src/lib.rs b/rs/replica_tests/src/lib.rs index c21a123df43..720dbb75ec7 100644 --- a/rs/replica_tests/src/lib.rs +++ b/rs/replica_tests/src/lib.rs @@ -9,7 +9,7 @@ use ic_interfaces::execution_environment::{ }; use ic_interfaces_registry::RegistryClient; use ic_interfaces_state_manager::StateReader; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, InstallCodeArgs, Method, Payload, ProvisionalCreateCanisterWithCyclesArgs, IC_00, }; diff --git a/rs/replica_tests/tests/bitcoin.rs b/rs/replica_tests/tests/bitcoin.rs index 0df4085a748..65994222ddb 100644 --- a/rs/replica_tests/tests/bitcoin.rs +++ b/rs/replica_tests/tests/bitcoin.rs @@ -14,7 +14,7 @@ use ic_config::{ }; use ic_error_types::RejectCode; use ic_http_endpoints_async_utils::incoming_from_path; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, BitcoinGetBalanceArgs, BitcoinGetCurrentFeePercentilesArgs, BitcoinGetSuccessorsArgs, BitcoinGetUtxosArgs, BitcoinSendTransactionArgs, BitcoinSendTransactionInternalArgs, EmptyBlob, Method, Payload, diff --git a/rs/replica_tests/tests/canister_lifecycle.rs b/rs/replica_tests/tests/canister_lifecycle.rs index ea9cfcc6697..df67b76a03c 100644 --- a/rs/replica_tests/tests/canister_lifecycle.rs +++ b/rs/replica_tests/tests/canister_lifecycle.rs @@ -4,7 +4,7 @@ use ic_config::execution_environment::DEFAULT_WASM_MEMORY_LIMIT; use ic_config::subnet_config::CyclesAccountManagerConfig; use ic_config::Config; use ic_error_types::{ErrorCode, RejectCode}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, CanisterChange, CanisterIdRecord, CanisterInstallMode, CanisterSettingsArgsBuilder, CanisterStatusResultV2, CanisterStatusType, EmptyBlob, InstallCodeArgs, Method, Payload, UpdateSettingsArgs, IC_00, diff --git a/rs/replica_tests/tests/funds.rs b/rs/replica_tests/tests/funds.rs index 80dee891c7d..99d1c3be389 100644 --- a/rs/replica_tests/tests/funds.rs +++ b/rs/replica_tests/tests/funds.rs @@ -1,5 +1,5 @@ use ic_config::subnet_config::CyclesAccountManagerConfig; -use ic_management_canister_types::{CanisterIdRecord, EmptyBlob, Method, Payload, IC_00}; +use ic_management_canister_types_private::{CanisterIdRecord, EmptyBlob, Method, Payload, IC_00}; use ic_replica_tests as utils; use ic_test_utilities::assert_utils::assert_balance_equals; use ic_test_utilities::universal_canister::{call_args, wasm}; diff --git a/rs/replica_tests/tests/tests.rs b/rs/replica_tests/tests/tests.rs index 1972d373180..d1cdf2b56c7 100644 --- a/rs/replica_tests/tests/tests.rs +++ b/rs/replica_tests/tests/tests.rs @@ -1,7 +1,7 @@ use assert_matches::assert_matches; use candid::{Decode, Encode}; use ic_error_types::ErrorCode; -use ic_management_canister_types::{self as ic00, EmptyBlob, Method, Payload}; +use ic_management_canister_types_private::{self as ic00, EmptyBlob, Method, Payload}; use ic_replica_tests as utils; use ic_replica_tests::{assert_reply, install_universal_canister}; use ic_replicated_state::{PageIndex, PageMap}; diff --git a/rs/replicated_state/Cargo.toml b/rs/replicated_state/Cargo.toml index 3f1fe6b63c5..de6dc880ab8 100644 --- a/rs/replicated_state/Cargo.toml +++ b/rs/replicated_state/Cargo.toml @@ -19,7 +19,7 @@ ic-crypto-sha2 = { path = "../crypto/sha2" } ic-error-types = { path = "../types/error_types" } ic-interfaces = { path = "../interfaces" } 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-routing-table = { path = "../registry/routing_table" } diff --git a/rs/replicated_state/src/bitcoin.rs b/rs/replicated_state/src/bitcoin.rs index 88f7445f7d1..ded3e2147d5 100644 --- a/rs/replicated_state/src/bitcoin.rs +++ b/rs/replicated_state/src/bitcoin.rs @@ -4,7 +4,7 @@ use ic_btc_replica_types::{ GetSuccessorsResponseComplete, GetSuccessorsResponsePartial, }; use ic_error_types::RejectCode; -use ic_management_canister_types::{BitcoinGetSuccessorsResponse, EmptyBlob, Payload as _}; +use ic_management_canister_types_private::{BitcoinGetSuccessorsResponse, EmptyBlob, Payload as _}; use ic_types::{ batch::ConsensusResponse, messages::{CallbackId, Payload, RejectContext}, diff --git a/rs/replicated_state/src/canister_state.rs b/rs/replicated_state/src/canister_state.rs index 44c2cc9591b..526c498965a 100644 --- a/rs/replicated_state/src/canister_state.rs +++ b/rs/replicated_state/src/canister_state.rs @@ -8,7 +8,7 @@ use crate::canister_state::queues::CanisterOutputQueuesIterator; use crate::canister_state::system_state::{ExecutionTask, SystemState}; use crate::{InputQueueType, StateError}; pub use execution_state::{EmbedderCache, ExecutionState, ExportedFunctions, Global}; -use ic_management_canister_types::{CanisterStatusType, LogVisibilityV2}; +use ic_management_canister_types_private::{CanisterStatusType, LogVisibilityV2}; use ic_registry_subnet_type::SubnetType; use ic_types::batch::TotalQueryStats; use ic_types::methods::SystemMethod; diff --git a/rs/replicated_state/src/canister_state/queues.rs b/rs/replicated_state/src/canister_state/queues.rs index 3b5e43f310c..20ac9c21e1c 100644 --- a/rs/replicated_state/src/canister_state/queues.rs +++ b/rs/replicated_state/src/canister_state/queues.rs @@ -15,7 +15,7 @@ use crate::replicated_state::MR_SYNTHETIC_REJECT_MESSAGE_MAX_LEN; use crate::{CanisterState, CheckpointLoadingMetrics, InputQueueType, InputSource, StateError}; use ic_base_types::PrincipalId; use ic_error_types::RejectCode; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_protobuf::proxy::{try_from_option_field, ProxyDecodeError}; use ic_protobuf::state::queues::v1 as pb_queues; use ic_protobuf::state::queues::v1::canister_queues::CanisterQueuePair; diff --git a/rs/replicated_state/src/canister_state/system_state.rs b/rs/replicated_state/src/canister_state/system_state.rs index be629d4c9fe..d244623c214 100644 --- a/rs/replicated_state/src/canister_state/system_state.rs +++ b/rs/replicated_state/src/canister_state/system_state.rs @@ -21,7 +21,7 @@ use ic_base_types::NumSeconds; use ic_error_types::RejectCode; use ic_interfaces::execution_environment::HypervisorError; use ic_logger::{error, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterStatusType, LogVisibilityV2, }; diff --git a/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs b/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs index e6b38f53a37..e67cbf0ccce 100644 --- a/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs +++ b/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs @@ -3,7 +3,7 @@ mod tests; use crate::page_map::int_map::{AsInt, MutableIntMap}; use ic_interfaces::execution_environment::HypervisorError; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use ic_protobuf::proxy::{try_from_option_field, ProxyDecodeError}; use ic_protobuf::state::canister_state_bits::v1 as pb; use ic_protobuf::types::v1 as pb_types; diff --git a/rs/replicated_state/src/canister_state/tests.rs b/rs/replicated_state/src/canister_state/tests.rs index 741d0b7946a..5a36649c920 100644 --- a/rs/replicated_state/src/canister_state/tests.rs +++ b/rs/replicated_state/src/canister_state/tests.rs @@ -17,7 +17,7 @@ use crate::Memory; use assert_matches::assert_matches; use ic_base_types::NumSeconds; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedAllowedViewers, CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterLogRecord, LogVisibilityV2, }; diff --git a/rs/replicated_state/src/metadata_state.rs b/rs/replicated_state/src/metadata_state.rs index b77aa920c7f..d8f7a64e8d4 100644 --- a/rs/replicated_state/src/metadata_state.rs +++ b/rs/replicated_state/src/metadata_state.rs @@ -10,7 +10,9 @@ use ic_btc_replica_types::BlockBlob; use ic_certification_version::{CertificationVersion, CURRENT_CERTIFICATION_VERSION}; use ic_error_types::{ErrorCode, RejectCode, UserError}; use ic_limits::MAX_INGRESS_TTL; -use ic_management_canister_types::{MasterPublicKeyId, NodeMetrics, NodeMetricsHistoryResponse}; +use ic_management_canister_types_private::{ + MasterPublicKeyId, NodeMetrics, NodeMetricsHistoryResponse, +}; use ic_protobuf::state::system_metadata::v1::ThresholdSignatureAgreementsEntry; use ic_protobuf::{ proxy::{try_from_option_field, ProxyDecodeError}, diff --git a/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs b/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs index f7575d04e04..0ac3eaa1ccd 100644 --- a/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs +++ b/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs @@ -1,6 +1,8 @@ use ic_btc_replica_types::{GetSuccessorsRequestInitial, SendTransactionRequest}; use ic_logger::{info, ReplicaLogger}; -use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId, SchnorrKeyId, VetKdKeyId}; +use ic_management_canister_types_private::{ + EcdsaKeyId, MasterPublicKeyId, SchnorrKeyId, VetKdKeyId, +}; use ic_protobuf::{ proxy::{try_from_option_field, ProxyDecodeError}, state::queues::v1 as pb_queues, diff --git a/rs/replicated_state/src/metadata_state/tests.rs b/rs/replicated_state/src/metadata_state/tests.rs index b391e7dc11c..8e33770138c 100644 --- a/rs/replicated_state/src/metadata_state/tests.rs +++ b/rs/replicated_state/src/metadata_state/tests.rs @@ -5,7 +5,7 @@ use crate::metadata_state::subnet_call_context_manager::{ use assert_matches::assert_matches; use ic_error_types::{ErrorCode, UserError}; use ic_limits::MAX_INGRESS_TTL; -use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, IC_00}; +use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, IC_00}; use ic_registry_routing_table::CanisterIdRange; use ic_test_utilities_types::{ ids::{ diff --git a/rs/replicated_state/tests/replicated_state.rs b/rs/replicated_state/tests/replicated_state.rs index 3df3c525500..05469e1578a 100644 --- a/rs/replicated_state/tests/replicated_state.rs +++ b/rs/replicated_state/tests/replicated_state.rs @@ -6,7 +6,7 @@ use ic_btc_replica_types::{ GetSuccessorsRequestInitial, GetSuccessorsResponseComplete, SendTransactionRequest, }; use ic_error_types::RejectCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BitcoinGetSuccessorsResponse, CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, Payload as _, }; diff --git a/rs/rust_canisters/canister_creator/Cargo.toml b/rs/rust_canisters/canister_creator/Cargo.toml index d52407651ef..9578789936c 100644 --- a/rs/rust_canisters/canister_creator/Cargo.toml +++ b/rs/rust_canisters/canister_creator/Cargo.toml @@ -16,7 +16,7 @@ dfn_core = { path = "../dfn_core" } dfn_json = { path = "../dfn_json" } dfn_macro = { path = "../dfn_macro" } futures = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } serde = { workspace = true } serde_json = { workspace = true } wat = { workspace = true } diff --git a/rs/rust_canisters/canister_creator/src/main.rs b/rs/rust_canisters/canister_creator/src/main.rs index 1f8532cf416..6f6ad4f7ae5 100644 --- a/rs/rust_canisters/canister_creator/src/main.rs +++ b/rs/rust_canisters/canister_creator/src/main.rs @@ -2,7 +2,7 @@ use candid::Decode; use dfn_core::{api, CanisterId}; use dfn_macro::update; use futures::future::join_all; -use ic_management_canister_types::{CanisterIdRecord, CanisterInstallMode, Payload}; +use ic_management_canister_types_private::{CanisterIdRecord, CanisterInstallMode, Payload}; use std::cell::RefCell; use std::collections::BTreeSet; @@ -37,9 +37,9 @@ async fn create_canisters_in_batch( let result = api::call_bytes( CanisterId::ic_00(), "create_canister", - &ic_management_canister_types::CreateCanisterArgs { + &ic_management_canister_types_private::CreateCanisterArgs { settings: Some( - ic_management_canister_types::CanisterSettingsArgsBuilder::new() + ic_management_canister_types_private::CanisterSettingsArgsBuilder::new() .with_controllers(vec![api::id().get()]) .build(), ), @@ -91,7 +91,7 @@ async fn install_code(wasm_module: Vec, arg: Vec) { let result = api::call_bytes( CanisterId::ic_00(), "install_code", - &ic_management_canister_types::InstallCodeArgs::new( + &ic_management_canister_types_private::InstallCodeArgs::new( CanisterInstallMode::Install, *canister_id, wasm_module.clone(), diff --git a/rs/rust_canisters/canister_test/Cargo.toml b/rs/rust_canisters/canister_test/Cargo.toml index 40f09ab9dbe..633a8d07848 100644 --- a/rs/rust_canisters/canister_test/Cargo.toml +++ b/rs/rust_canisters/canister_test/Cargo.toml @@ -10,12 +10,12 @@ documentation.workspace = true backoff = { workspace = true } candid = { workspace = true } cargo_metadata = "0.14.2" -dfn_candid={path="../dfn_candid"} +dfn_candid = { path = "../dfn_candid" } escargot = "0.5.2" ic-canister-client = { path = "../../canister_client" } ic-config = { path = "../../config" } 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-transport = { path = "../../registry/transport" } ic-replica-tests = { path = "../../replica_tests" } ic-state-machine-tests = { path = "../../state_machine_tests" } @@ -25,4 +25,3 @@ rand = { workspace = true } tokio = { workspace = true } wasmprinter = { workspace = true } wat = { workspace = true } - diff --git a/rs/rust_canisters/canister_test/src/canister.rs b/rs/rust_canisters/canister_test/src/canister.rs index 63fd6a6a469..d32a504340c 100644 --- a/rs/rust_canisters/canister_test/src/canister.rs +++ b/rs/rust_canisters/canister_test/src/canister.rs @@ -3,8 +3,8 @@ use core::future::Future; use dfn_candid::{candid, candid_multi_arity}; use ic_canister_client::{Agent, Sender}; use ic_config::Config; -use ic_management_canister_types::CanisterStatusType::Stopped; -pub use ic_management_canister_types::{ +use ic_management_canister_types_private::CanisterStatusType::Stopped; +pub use ic_management_canister_types_private::{ self as ic00, CanisterIdRecord, CanisterInstallMode, InstallCodeArgs, ProvisionalCreateCanisterWithCyclesArgs, IC_00, }; @@ -12,7 +12,7 @@ use ic_registry_transport::pb::v1::RegistryMutation; pub use ic_types::{ingress::WasmResult, CanisterId, Cycles, PrincipalId}; use on_wire::{FromWire, IntoWire, NewType}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterSettingsArgsBuilder, CanisterStatusResultV2, UpdateSettingsArgs, }; use ic_replica_tests::{canister_test_async, LocalTestRuntime}; diff --git a/rs/rust_canisters/ecdsa/Cargo.toml b/rs/rust_canisters/ecdsa/Cargo.toml index 47ddb252bc2..a0cc6dd3079 100644 --- a/rs/rust_canisters/ecdsa/Cargo.toml +++ b/rs/rust_canisters/ecdsa/Cargo.toml @@ -11,7 +11,7 @@ path = "src/main.rs" candid = { workspace = true } ic-cdk = { workspace = true } ic-cdk-macros = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } serde = { workspace = true } serde_bytes = { workspace = true } serde_json = { workspace = true } diff --git a/rs/rust_canisters/ecdsa/src/main.rs b/rs/rust_canisters/ecdsa/src/main.rs index b7f00520bb8..ab8431f8f77 100644 --- a/rs/rust_canisters/ecdsa/src/main.rs +++ b/rs/rust_canisters/ecdsa/src/main.rs @@ -1,7 +1,7 @@ use candid::{candid_method, CandidType, Encode}; use ic_cdk::api::{call::call_raw, print}; use ic_cdk_macros::update; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ DerivationPath, EcdsaCurve, EcdsaKeyId, Method as Ic00Method, SignWithECDSAArgs, IC_00, }; use serde::{Deserialize, Serialize}; diff --git a/rs/rust_canisters/proxy_canister/Cargo.toml b/rs/rust_canisters/proxy_canister/Cargo.toml index 450bc613090..74221a4235a 100644 --- a/rs/rust_canisters/proxy_canister/Cargo.toml +++ b/rs/rust_canisters/proxy_canister/Cargo.toml @@ -9,10 +9,9 @@ edition = "2021" candid = { workspace = true } ic-cdk = { workspace = true } ic-cdk-macros = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } serde = { workspace = true } [[bin]] name = "proxy_canister" path = "src/main.rs" - diff --git a/rs/rust_canisters/proxy_canister/src/lib.rs b/rs/rust_canisters/proxy_canister/src/lib.rs index 4d7afcaab6c..78c5a8fb5c9 100644 --- a/rs/rust_canisters/proxy_canister/src/lib.rs +++ b/rs/rust_canisters/proxy_canister/src/lib.rs @@ -6,7 +6,7 @@ //! otherwise errors out. //! use candid::{CandidType, Deserialize}; -use ic_management_canister_types::CanisterHttpRequestArgs; +use ic_management_canister_types_private::CanisterHttpRequestArgs; #[derive(Clone, Debug, CandidType, Deserialize)] pub struct RemoteHttpRequest { diff --git a/rs/rust_canisters/proxy_canister/src/main.rs b/rs/rust_canisters/proxy_canister/src/main.rs index 95a568f489c..4906ea60c3d 100644 --- a/rs/rust_canisters/proxy_canister/src/main.rs +++ b/rs/rust_canisters/proxy_canister/src/main.rs @@ -9,7 +9,7 @@ use candid::Principal; use ic_cdk::api::call::RejectionCode; use ic_cdk::caller; use ic_cdk_macros::{query, update}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterHttpResponsePayload, HttpHeader, Payload, TransformArgs, }; use proxy_canister::{RemoteHttpRequest, RemoteHttpResponse}; @@ -155,7 +155,7 @@ fn main() {} #[cfg(test)] mod proxy_canister_test { use super::*; - use ic_management_canister_types::HttpHeader; + use ic_management_canister_types_private::HttpHeader; #[test] fn test_transform() { diff --git a/rs/rust_canisters/statesync_test/Cargo.toml b/rs/rust_canisters/statesync_test/Cargo.toml index 820a8bc0422..2ff008cd808 100644 --- a/rs/rust_canisters/statesync_test/Cargo.toml +++ b/rs/rust_canisters/statesync_test/Cargo.toml @@ -22,7 +22,7 @@ serde_json = { workspace = true } [dev-dependencies] canister-test = { path = "../../rust_canisters/canister_test" } -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 = { path = "../../test_utilities" } ic-types = { path = "../../types/types" } diff --git a/rs/rust_canisters/statesync_test/test/test.rs b/rs/rust_canisters/statesync_test/test/test.rs index e6afdf8b240..ecc910901b9 100644 --- a/rs/rust_canisters/statesync_test/test/test.rs +++ b/rs/rust_canisters/statesync_test/test/test.rs @@ -1,6 +1,6 @@ use candid::{Decode, Encode}; use canister_test::*; -use ic_management_canister_types::CanisterSettingsArgsBuilder; +use ic_management_canister_types_private::CanisterSettingsArgsBuilder; use ic_state_machine_tests::StateMachine; #[test] diff --git a/rs/rust_canisters/tests/Cargo.toml b/rs/rust_canisters/tests/Cargo.toml index 303b91b9878..c2e17f16225 100644 --- a/rs/rust_canisters/tests/Cargo.toml +++ b/rs/rust_canisters/tests/Cargo.toml @@ -48,7 +48,7 @@ criterion = { workspace = true } dfn_candid = { path = "../dfn_candid" } ic-canister-client-sender = { path = "../../canister_client/sender" } ic-error-types = { path = "../../types/error_types" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-test-identity = { path = "../../test_utilities/identity" } ic-test-utilities = { path = "../../test_utilities" } ic-types = { path = "../../types/types" } diff --git a/rs/rust_canisters/tests/test/canister_management.rs b/rs/rust_canisters/tests/test/canister_management.rs index e40df5ec821..51066edb8e5 100644 --- a/rs/rust_canisters/tests/test/canister_management.rs +++ b/rs/rust_canisters/tests/test/canister_management.rs @@ -2,7 +2,9 @@ use assert_matches::assert_matches; use candid::{Decode, Encode}; use canister_test::{local_test_e, Canister, Runtime, Wasm}; use ic_error_types::ErrorCode; -use ic_management_canister_types::{self as ic00, CanisterIdRecord, CanisterStatusResultV2, IC_00}; +use ic_management_canister_types_private::{ + self as ic00, CanisterIdRecord, CanisterStatusResultV2, IC_00, +}; use ic_test_utilities::universal_canister::UNIVERSAL_CANISTER_WASM; use ic_test_utilities::universal_canister::{ wasm as universal_canister_argument_builder, CallArgs, diff --git a/rs/rust_canisters/tests/test/upgrade.rs b/rs/rust_canisters/tests/test/upgrade.rs index ad467b20969..b4ce8911ef8 100644 --- a/rs/rust_canisters/tests/test/upgrade.rs +++ b/rs/rust_canisters/tests/test/upgrade.rs @@ -3,7 +3,7 @@ use assert_matches::assert_matches; use canister_test::{local_test_e, Canister, Runtime, Wasm}; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_test_utilities::stable_memory_reader::STABLE_MEMORY_READER_WAT; use ic_test_utilities::universal_canister::wasm as universal_canister_argument_builder; use ic_test_utilities::universal_canister::UNIVERSAL_CANISTER_WASM; diff --git a/rs/sns/cli/Cargo.toml b/rs/sns/cli/Cargo.toml index ed4d14d76b6..587c598dd3d 100644 --- a/rs/sns/cli/Cargo.toml +++ b/rs/sns/cli/Cargo.toml @@ -25,7 +25,7 @@ hex = { workspace = true } ic-agent = { workspace = true } ic-base-types = { path = "../../types/base_types" } 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-nervous-system-agent = { path = "../../nervous_system/agent" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } diff --git a/rs/sns/cli/src/upgrade_sns_controlled_canister.rs b/rs/sns/cli/src/upgrade_sns_controlled_canister.rs index 645a8fad79b..730bf72342c 100644 --- a/rs/sns/cli/src/upgrade_sns_controlled_canister.rs +++ b/rs/sns/cli/src/upgrade_sns_controlled_canister.rs @@ -9,7 +9,7 @@ use clap::Parser; use core::convert::From; use cycles_minting_canister::{CanisterSettingsArgs, CreateCanister, SubnetSelection}; use ic_base_types::{CanisterId, PrincipalId}; -use ic_management_canister_types::{BoundedVec, CanisterInstallMode}; +use ic_management_canister_types_private::{BoundedVec, CanisterInstallMode}; use ic_nervous_system_agent::{ management_canister::{self, delete_canister, stop_canister}, nns, diff --git a/rs/sns/governance/Cargo.toml b/rs/sns/governance/Cargo.toml index 6d00f0868f6..df1a936e828 100644 --- a/rs/sns/governance/Cargo.toml +++ b/rs/sns/governance/Cargo.toml @@ -42,7 +42,7 @@ ic-canisters-http-types = { path = "../../rust_canisters/http_types" } ic-canister-log = { path = "../../rust_canisters/canister_log" } ic-canister-profiler = { path = "../../rust_canisters/canister_profiler" } 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" } icrc-ledger-client = { path = "../../../packages/icrc-ledger-client" } ic-ledger-core = { path = "../../ledger_suite/common/ledger_core" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } diff --git a/rs/sns/governance/src/canister_control.rs b/rs/sns/governance/src/canister_control.rs index d9a1a8ff1be..5b75b1aba5c 100644 --- a/rs/sns/governance/src/canister_control.rs +++ b/rs/sns/governance/src/canister_control.rs @@ -88,8 +88,8 @@ async fn install_code( wasm: Vec, arg: Vec, ) -> Result<(), GovernanceError> { - let install_code_args = ic_management_canister_types::InstallCodeArgs { - mode: ic_management_canister_types::CanisterInstallMode::Upgrade, + let install_code_args = ic_management_canister_types_private::InstallCodeArgs { + mode: ic_management_canister_types_private::CanisterInstallMode::Upgrade, canister_id: canister_id.get(), wasm_module: wasm, arg, @@ -99,7 +99,7 @@ async fn install_code( }; env.call_canister( - ic_management_canister_types::IC_00, + ic_management_canister_types_private::IC_00, "install_code", Encode!(&install_code_args).expect("Unable to encode install_code args."), ) diff --git a/rs/sns/governance/src/governance.rs b/rs/sns/governance/src/governance.rs index e9b730ca7ca..45ec531512a 100644 --- a/rs/sns/governance/src/governance.rs +++ b/rs/sns/governance/src/governance.rs @@ -80,7 +80,7 @@ use ic_canister_profiler::SpanStats; #[cfg(target_arch = "wasm32")] use ic_cdk::spawn; use ic_ledger_core::Tokens; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChangeDetails, CanisterInfoRequest, CanisterInfoResponse, CanisterInstallMode, }; use ic_nervous_system_clients::ledger_client::ICRC1Ledger; diff --git a/rs/sns/governance/src/governance/advance_target_sns_version_tests.rs b/rs/sns/governance/src/governance/advance_target_sns_version_tests.rs index f8b7fb80620..91eb2655e2f 100644 --- a/rs/sns/governance/src/governance/advance_target_sns_version_tests.rs +++ b/rs/sns/governance/src/governance/advance_target_sns_version_tests.rs @@ -1098,8 +1098,8 @@ fn add_environment_mock_calls_for_initiate_upgrade( env.require_call_canister_invocation( CanisterId::ic_00(), "install_code", - Encode!(&ic_management_canister_types::InstallCodeArgs { - mode: ic_management_canister_types::CanisterInstallMode::Upgrade, + Encode!(&ic_management_canister_types_private::InstallCodeArgs { + mode: ic_management_canister_types_private::CanisterInstallMode::Upgrade, canister_id: canister_id.get(), wasm_module: vec![9, 8, 7, 6, 5, 4, 3, 2], arg: Encode!().unwrap(), diff --git a/rs/sns/governance/src/governance/assorted_governance_tests.rs b/rs/sns/governance/src/governance/assorted_governance_tests.rs index a076bde6f13..48bb80aa5f5 100644 --- a/rs/sns/governance/src/governance/assorted_governance_tests.rs +++ b/rs/sns/governance/src/governance/assorted_governance_tests.rs @@ -1502,8 +1502,8 @@ fn setup_env_for_sns_upgrade_to_next_version_test( env.require_call_canister_invocation( CanisterId::ic_00(), "install_code", - Encode!(&ic_management_canister_types::InstallCodeArgs { - mode: ic_management_canister_types::CanisterInstallMode::Upgrade, + Encode!(&ic_management_canister_types_private::InstallCodeArgs { + mode: ic_management_canister_types_private::CanisterInstallMode::Upgrade, canister_id: canister_id.get(), wasm_module: vec![9, 8, 7, 6, 5, 4, 3, 2], arg: Encode!().unwrap(), diff --git a/rs/sns/governance/src/proposal.rs b/rs/sns/governance/src/proposal.rs index a620fe0d804..bdb164c0d10 100644 --- a/rs/sns/governance/src/proposal.rs +++ b/rs/sns/governance/src/proposal.rs @@ -2580,7 +2580,7 @@ mod tests { use futures::FutureExt; use ic_base_types::{NumBytes, PrincipalId}; use ic_crypto_sha2::Sha256; - use ic_management_canister_types::{CanisterIdRecord, ChunkHash, StoredChunksReply}; + use ic_management_canister_types_private::{CanisterIdRecord, ChunkHash, StoredChunksReply}; use ic_nervous_system_clients::canister_status::{CanisterStatusResultV2, CanisterStatusType}; use ic_nervous_system_common_test_keys::TEST_USER1_PRINCIPAL; use ic_nns_constants::SNS_WASM_CANISTER_ID; diff --git a/rs/sns/governance/src/types.rs b/rs/sns/governance/src/types.rs index 14e823b0996..6b333fc1523 100644 --- a/rs/sns/governance/src/types.rs +++ b/rs/sns/governance/src/types.rs @@ -45,7 +45,9 @@ use ic_canister_log::log; use ic_crypto_sha2::Sha256; use ic_icrc1_ledger::UpgradeArgs as LedgerUpgradeArgs; use ic_ledger_core::tokens::TOKEN_SUBDIVIDABLE_BY; -use ic_management_canister_types::{CanisterIdRecord, CanisterInstallModeError, StoredChunksReply}; +use ic_management_canister_types_private::{ + CanisterIdRecord, CanisterInstallModeError, StoredChunksReply, +}; use ic_nervous_system_common::{ hash_to_hex_string, ledger_validation::MAX_LOGO_LENGTH, NervousSystemError, DEFAULT_TRANSFER_FEE, ONE_DAY_SECONDS, ONE_MONTH_SECONDS, ONE_YEAR_SECONDS, diff --git a/rs/sns/governance/src/types/tests.rs b/rs/sns/governance/src/types/tests.rs index 670a6f8ca9d..8dc731bae28 100644 --- a/rs/sns/governance/src/types/tests.rs +++ b/rs/sns/governance/src/types/tests.rs @@ -9,7 +9,7 @@ use crate::pb::v1::{ use candid::Nat; use futures::FutureExt; use ic_base_types::PrincipalId; -use ic_management_canister_types::ChunkHash; +use ic_management_canister_types_private::ChunkHash; use ic_nervous_system_common_test_keys::TEST_USER1_PRINCIPAL; use ic_nervous_system_proto::pb::v1::Principals; use lazy_static::lazy_static; diff --git a/rs/sns/integration_tests/Cargo.toml b/rs/sns/integration_tests/Cargo.toml index 282d6a4c669..92c8efa0fee 100644 --- a/rs/sns/integration_tests/Cargo.toml +++ b/rs/sns/integration_tests/Cargo.toml @@ -28,7 +28,7 @@ ic-icrc1 = { path = "../../ledger_suite/icrc1" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } ic-ledger-canister-core = { path = "../../ledger_suite/common/ledger_canister_core" } 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-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-proto = { path = "../../nervous_system/proto" } diff --git a/rs/sns/integration_tests/src/manage_dapp_canister_settings.rs b/rs/sns/integration_tests/src/manage_dapp_canister_settings.rs index 6f667f5e141..3a3a3dc0832 100644 --- a/rs/sns/integration_tests/src/manage_dapp_canister_settings.rs +++ b/rs/sns/integration_tests/src/manage_dapp_canister_settings.rs @@ -2,7 +2,7 @@ use candid::Encode; use canister_test::Wasm; use ic_base_types::PrincipalId; use ic_ledger_core::Tokens; -use ic_management_canister_types::CanisterSettingsArgsBuilder; +use ic_management_canister_types_private::CanisterSettingsArgsBuilder; use ic_nervous_system_clients::canister_status::DefiniteCanisterSettingsArgs; use ic_nervous_system_common::ONE_YEAR_SECONDS; use ic_nns_test_utils::state_test_helpers::{ @@ -61,7 +61,7 @@ fn test_manage_dapp_canister_settings_successful() { .with_memory_allocation(1 << 30) .with_freezing_threshold(100_000) .with_reserved_cycles_limit(1_000_000_000_000) - .with_log_visibility(ic_management_canister_types::LogVisibilityV2::Public) + .with_log_visibility(ic_management_canister_types_private::LogVisibilityV2::Public) .with_wasm_memory_limit(1_000_000_000) .build(), ), @@ -199,7 +199,7 @@ fn test_manage_dapp_canister_settings_failure() { .with_freezing_threshold(100_000) .with_reserved_cycles_limit(1_000_000_000_000) .with_wasm_memory_limit(1_000_000_000) - .with_log_visibility(ic_management_canister_types::LogVisibilityV2::Public) + .with_log_visibility(ic_management_canister_types_private::LogVisibilityV2::Public) .build(), ), ); diff --git a/rs/sns/integration_tests/src/root.rs b/rs/sns/integration_tests/src/root.rs index 7d240bd854b..f9e891e13cb 100644 --- a/rs/sns/integration_tests/src/root.rs +++ b/rs/sns/integration_tests/src/root.rs @@ -3,7 +3,7 @@ use canister_test::Project; use dfn_candid::candid; use ic_base_types::{CanisterId, PrincipalId}; use ic_ledger_core::Tokens; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::{CanisterStatusResult, CanisterStatusType}, diff --git a/rs/sns/integration_tests/src/upgrade_canister.rs b/rs/sns/integration_tests/src/upgrade_canister.rs index de01de27d3a..2e35c43cd93 100644 --- a/rs/sns/integration_tests/src/upgrade_canister.rs +++ b/rs/sns/integration_tests/src/upgrade_canister.rs @@ -5,7 +5,7 @@ use dfn_core::bytes; use ic_base_types::{CanisterId, PrincipalId}; use ic_canister_client_sender::Sender; use ic_ledger_core::Tokens; -use ic_management_canister_types::{CanisterInstallMode, CanisterSettingsArgsBuilder}; +use ic_management_canister_types_private::{CanisterInstallMode, CanisterSettingsArgsBuilder}; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::{CanisterStatusResult, CanisterStatusType}, diff --git a/rs/sns/root/Cargo.toml b/rs/sns/root/Cargo.toml index 41298f5b7a4..2eb1d0250d6 100644 --- a/rs/sns/root/Cargo.toml +++ b/rs/sns/root/Cargo.toml @@ -24,7 +24,7 @@ ic-canisters-http-types = { path = "../../rust_canisters/http_types" } ic-cdk = { workspace = true } ic-cdk-macros = { workspace = true } ic-cdk-timers = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-metrics-encoder = "1" ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } diff --git a/rs/sns/root/proto/ic_sns_root/pb/v1/root.proto b/rs/sns/root/proto/ic_sns_root/pb/v1/root.proto index 13a307d16b0..633214b7187 100644 --- a/rs/sns/root/proto/ic_sns_root/pb/v1/root.proto +++ b/rs/sns/root/proto/ic_sns_root/pb/v1/root.proto @@ -8,7 +8,7 @@ import "ic_nervous_system/pb/v1/nervous_system.proto"; // All essential state of an SNS root canister. // // When canister_init is called in the SNS root canister, it is expected that a -// serialized version of this was passed via ic_management_canister_types::InstallCodeArgs::args, +// serialized version of this was passed via ic_management_canister_types_private::InstallCodeArgs::args, // which can be retrieved by the canister via ic_cdk::api::call::arg_data(). message SnsRootCanister { // Required. diff --git a/rs/sns/root/src/gen/ic_sns_root.pb.v1.rs b/rs/sns/root/src/gen/ic_sns_root.pb.v1.rs index 182d0b49bd4..231d10b2421 100644 --- a/rs/sns/root/src/gen/ic_sns_root.pb.v1.rs +++ b/rs/sns/root/src/gen/ic_sns_root.pb.v1.rs @@ -2,7 +2,7 @@ /// All essential state of an SNS root canister. /// /// When canister_init is called in the SNS root canister, it is expected that a -/// serialized version of this was passed via ic_management_canister_types::InstallCodeArgs::args, +/// serialized version of this was passed via ic_management_canister_types_private::InstallCodeArgs::args, /// which can be retrieved by the canister via ic_cdk::api::call::arg_data(). #[derive( candid::CandidType, diff --git a/rs/sns/test_utils/Cargo.toml b/rs/sns/test_utils/Cargo.toml index d15f9559d8a..e4d6996abc0 100644 --- a/rs/sns/test_utils/Cargo.toml +++ b/rs/sns/test_utils/Cargo.toml @@ -22,7 +22,7 @@ ic-icrc1-index-ng = { path = "../../ledger_suite/icrc1/index-ng" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } ic-ledger-canister-core = { path = "../../ledger_suite/common/ledger_canister_core" } 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-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } diff --git a/rs/sns/test_utils/src/state_test_helpers.rs b/rs/sns/test_utils/src/state_test_helpers.rs index d506918369a..a3d630c5999 100644 --- a/rs/sns/test_utils/src/state_test_helpers.rs +++ b/rs/sns/test_utils/src/state_test_helpers.rs @@ -3,7 +3,7 @@ use candid::{CandidType, Decode, Encode}; use canister_test::Project; use ic_base_types::{CanisterId, PrincipalId}; use ic_ledger_core::Tokens; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::{ canister_id_record::CanisterIdRecord, canister_status::CanisterStatusResultV2, }; diff --git a/rs/starter/Cargo.toml b/rs/starter/Cargo.toml index e28824a3d2d..5d8e7262271 100644 --- a/rs/starter/Cargo.toml +++ b/rs/starter/Cargo.toml @@ -13,7 +13,7 @@ anyhow = { workspace = true } clap = { workspace = true } ic-config = { path = "../config" } 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-prep = { path = "../prep" } ic-protobuf = { path = "../protobuf" } ic-registry-provisional-whitelist = { path = "../registry/provisional_whitelist" } diff --git a/rs/starter/src/main.rs b/rs/starter/src/main.rs index 970b03ae284..c8c310287e1 100644 --- a/rs/starter/src/main.rs +++ b/rs/starter/src/main.rs @@ -35,7 +35,7 @@ use ic_config::{ ConfigOptional as ReplicaConfig, }; use ic_logger::{info, new_replica_logger_from_config}; -use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId}; use ic_prep_lib::{ internet_computer::{IcConfig, TopologyConfig}, node::{NodeConfiguration, NodeIndex}, diff --git a/rs/state_layout/Cargo.toml b/rs/state_layout/Cargo.toml index b193a20083d..7734ddd8ad9 100644 --- a/rs/state_layout/Cargo.toml +++ b/rs/state_layout/Cargo.toml @@ -11,7 +11,7 @@ hex = { workspace = true } ic-base-types = { path = "../types/base_types" } ic-config = { path = "../config" } 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-replicated-state = { path = "../replicated_state" } diff --git a/rs/state_layout/src/state_layout.rs b/rs/state_layout/src/state_layout.rs index 5376110fd5a..64c5182eb14 100644 --- a/rs/state_layout/src/state_layout.rs +++ b/rs/state_layout/src/state_layout.rs @@ -1,6 +1,6 @@ use ic_base_types::{NumBytes, NumSeconds}; use ic_logger::{error, info, warn, ReplicaLogger}; -use ic_management_canister_types::LogVisibilityV2; +use ic_management_canister_types_private::LogVisibilityV2; use ic_metrics::{buckets::decimal_buckets, MetricsRegistry}; use ic_protobuf::{ proxy::{try_from_option_field, ProxyDecodeError}, diff --git a/rs/state_layout/src/state_layout/tests.rs b/rs/state_layout/src/state_layout/tests.rs index e3f117fd597..2bd928e291f 100644 --- a/rs/state_layout/src/state_layout/tests.rs +++ b/rs/state_layout/src/state_layout/tests.rs @@ -1,6 +1,6 @@ use super::*; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChange, CanisterChangeDetails, CanisterChangeOrigin, CanisterInstallMode, IC_00, }; use ic_replicated_state::{ diff --git a/rs/state_machine_tests/Cargo.toml b/rs/state_machine_tests/Cargo.toml index cfa56ee7d1c..af273ff64e5 100644 --- a/rs/state_machine_tests/Cargo.toml +++ b/rs/state_machine_tests/Cargo.toml @@ -37,7 +37,7 @@ ic-interfaces-certified-stream-store = { path = "../interfaces/certified_stream_ ic-interfaces-registry = { path = "../interfaces/registry" } ic-interfaces-state-manager = { path = "../interfaces/state_manager" } 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-messaging = { path = "../messaging" } ic-metrics = { path = "../monitoring/metrics" } ic-protobuf = { path = "../protobuf" } diff --git a/rs/state_machine_tests/src/lib.rs b/rs/state_machine_tests/src/lib.rs index 1c3f93201c5..5f0040e5fb3 100644 --- a/rs/state_machine_tests/src/lib.rs +++ b/rs/state_machine_tests/src/lib.rs @@ -45,10 +45,10 @@ use ic_interfaces_state_manager::{CertificationScope, StateHashError, StateManag use ic_limits::{MAX_INGRESS_TTL, PERMITTED_DRIFT, SMALL_APP_SUBNET_MAX_SIZE}; use ic_logger::replica_logger::no_op_logger; use ic_logger::{error, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ self as ic00, CanisterIdRecord, InstallCodeArgs, MasterPublicKeyId, Method, Payload, }; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterHttpResponsePayload, CanisterInstallMode, CanisterSettingsArgs, CanisterSnapshotResponse, CanisterStatusResultV2, ClearChunkStoreArgs, EcdsaCurve, EcdsaKeyId, InstallChunkedCodeArgs, LoadCanisterSnapshotArgs, SchnorrAlgorithm, SignWithECDSAReply, diff --git a/rs/state_manager/Cargo.toml b/rs/state_manager/Cargo.toml index cd15948e5a0..c7d45d7793b 100644 --- a/rs/state_manager/Cargo.toml +++ b/rs/state_manager/Cargo.toml @@ -58,7 +58,7 @@ criterion-time = { path = "../criterion_time" } ic-canonical-state-tree-hash-test-utils = { path = "../canonical_state/tree_hash/test_utils" } ic-certification-version = { path = "../canonical_state/certification_version" } ic-error-types = { path = "../types/error_types" } -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-registry-subnet-features = { path = "../registry/subnet_features" } ic-registry-subnet-type = { path = "../registry/subnet_type" } diff --git a/rs/state_manager/src/checkpoint/tests.rs b/rs/state_manager/src/checkpoint/tests.rs index 9408ec94188..c27258db69b 100644 --- a/rs/state_manager/src/checkpoint/tests.rs +++ b/rs/state_manager/src/checkpoint/tests.rs @@ -3,7 +3,7 @@ use crate::{spawn_tip_thread, StateManagerMetrics, NUMBER_OF_CHECKPOINT_THREADS} use ic_base_types::NumSeconds; use ic_config::state_manager::lsmt_config_default; use ic_logger::ReplicaLogger; -use ic_management_canister_types::CanisterStatusType; +use ic_management_canister_types_private::CanisterStatusType; use ic_metrics::MetricsRegistry; use ic_registry_subnet_type::SubnetType; use ic_replicated_state::{ diff --git a/rs/state_manager/src/tree_hash.rs b/rs/state_manager/src/tree_hash.rs index e9fc73544f5..eee572290a4 100644 --- a/rs/state_manager/src/tree_hash.rs +++ b/rs/state_manager/src/tree_hash.rs @@ -64,7 +64,7 @@ mod tests { use ic_canonical_state::{all_supported_versions, CertificationVersion}; use ic_crypto_tree_hash::Digest; use ic_error_types::{ErrorCode, UserError}; - use ic_management_canister_types::{ + use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; use ic_registry_routing_table::{CanisterIdRange, RoutingTable}; diff --git a/rs/state_manager/tests/state_manager.rs b/rs/state_manager/tests/state_manager.rs index 98001228236..281425f9b42 100644 --- a/rs/state_manager/tests/state_manager.rs +++ b/rs/state_manager/tests/state_manager.rs @@ -10,7 +10,7 @@ use ic_interfaces::p2p::state_sync::{ChunkId, Chunkable, StateSyncArtifactId, St use ic_interfaces_certified_stream_store::{CertifiedStreamStore, EncodeStreamError}; use ic_interfaces_state_manager::*; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterChangeDetails, CanisterChangeOrigin, CanisterInstallModeV2, InstallChunkedCodeArgs, LoadCanisterSnapshotArgs, TakeCanisterSnapshotArgs, UploadChunkArgs, }; diff --git a/rs/system_api/Cargo.toml b/rs/system_api/Cargo.toml index e0cadf8b253..2d1bdf4b808 100644 --- a/rs/system_api/Cargo.toml +++ b/rs/system_api/Cargo.toml @@ -18,7 +18,7 @@ ic-cycles-account-manager = { path = "../cycles_account_manager" } ic-error-types = { path = "../types/error_types" } ic-interfaces = { path = "../interfaces" } 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-nns-constants = { path = "../nns/constants" } ic-registry-routing-table = { path = "../registry/routing_table" } ic-registry-subnet-type = { path = "../registry/subnet_type" } diff --git a/rs/system_api/src/routing.rs b/rs/system_api/src/routing.rs index e5162f9f998..74de5fe2984 100644 --- a/rs/system_api/src/routing.rs +++ b/rs/system_api/src/routing.rs @@ -4,7 +4,7 @@ use std::str::FromStr; use ic_base_types::{CanisterId, PrincipalId, SubnetId}; use ic_btc_interface::NetworkInRequest as BitcoinNetwork; use ic_error_types::UserError; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BitcoinGetBalanceArgs, BitcoinGetBlockHeadersArgs, BitcoinGetCurrentFeePercentilesArgs, BitcoinGetUtxosArgs, BitcoinSendTransactionArgs, CanisterIdRecord, CanisterInfoRequest, ClearChunkStoreArgs, ComputeInitialIDkgDealingsArgs, DeleteCanisterSnapshotArgs, @@ -422,7 +422,7 @@ mod tests { use assert_matches::assert_matches; use candid::Encode; use ic_base_types::RegistryVersion; - use ic_management_canister_types::{ + use ic_management_canister_types_private::{ DerivationPath, EcdsaCurve, EcdsaKeyId, SchnorrAlgorithm, SchnorrKeyId, SignWithECDSAArgs, VetKdCurve, VetKdKeyId, }; diff --git a/rs/system_api/src/sandbox_safe_system_state.rs b/rs/system_api/src/sandbox_safe_system_state.rs index f1e27332066..a520d54a003 100644 --- a/rs/system_api/src/sandbox_safe_system_state.rs +++ b/rs/system_api/src/sandbox_safe_system_state.rs @@ -9,7 +9,7 @@ use ic_error_types::{ErrorCode, RejectCode, UserError}; use ic_interfaces::execution_environment::{HypervisorError, HypervisorResult}; use ic_limits::{LOG_CANISTER_OPERATION_CYCLES_THRESHOLD, SMALL_APP_SUBNET_MAX_SIZE}; use ic_logger::{info, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterStatusType, CreateCanisterArgs, InstallChunkedCodeArgs, InstallCodeArgsV2, LoadCanisterSnapshotArgs, Method as Ic00Method, Payload, ProvisionalCreateCanisterWithCyclesArgs, UninstallCodeArgs, UpdateSettingsArgs, IC_00, diff --git a/rs/system_api/tests/common/mod.rs b/rs/system_api/tests/common/mod.rs index e211f0002d3..bae1ce65e7c 100644 --- a/rs/system_api/tests/common/mod.rs +++ b/rs/system_api/tests/common/mod.rs @@ -7,7 +7,7 @@ use ic_config::{ use ic_cycles_account_manager::{CyclesAccountManager, ResourceSaturation}; use ic_interfaces::execution_environment::{ExecutionMode, SubnetAvailableMemory}; 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_nns_constants::CYCLES_MINTING_CANISTER_ID; use ic_registry_routing_table::{CanisterIdRange, RoutingTable}; use ic_registry_subnet_type::SubnetType; diff --git a/rs/system_api/tests/sandbox_safe_system_state.rs b/rs/system_api/tests/sandbox_safe_system_state.rs index 4ad62595d7f..4717a4e2d9e 100644 --- a/rs/system_api/tests/sandbox_safe_system_state.rs +++ b/rs/system_api/tests/sandbox_safe_system_state.rs @@ -4,7 +4,7 @@ use ic_config::subnet_config::SchedulerConfig; use ic_interfaces::execution_environment::SystemApi; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; use ic_logger::replica_logger::no_op_logger; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterSettingsArgs, Payload, UpdateSettingsArgs, IC_00, }; use ic_nns_constants::CYCLES_MINTING_CANISTER_ID; diff --git a/rs/test_utilities/execution_environment/Cargo.toml b/rs/test_utilities/execution_environment/Cargo.toml index dbafb311065..cd7521296e0 100644 --- a/rs/test_utilities/execution_environment/Cargo.toml +++ b/rs/test_utilities/execution_environment/Cargo.toml @@ -18,7 +18,7 @@ ic-execution-environment = { path = "../../execution_environment" } ic-interfaces = { path = "../../interfaces" } ic-interfaces-state-manager = { path = "../../interfaces/state_manager" } 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-query-stats = { path = "../../query_stats" } ic-registry-provisional-whitelist = { path = "../../registry/provisional_whitelist" } diff --git a/rs/test_utilities/execution_environment/src/lib.rs b/rs/test_utilities/execution_environment/src/lib.rs index 7b427a559b2..c56692be1b4 100644 --- a/rs/test_utilities/execution_environment/src/lib.rs +++ b/rs/test_utilities/execution_environment/src/lib.rs @@ -26,7 +26,7 @@ use ic_interfaces::execution_environment::{ use ic_interfaces_state_manager::Labeled; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; use ic_logger::{replica_logger::no_op_logger, ReplicaLogger}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, CanisterInstallModeV2, CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusType, CanisterUpgradeOptions, EmptyBlob, InstallCodeArgs, InstallCodeArgsV2, LogVisibilityV2, MasterPublicKeyId, Method, Payload, diff --git a/rs/test_utilities/state/Cargo.toml b/rs/test_utilities/state/Cargo.toml index 201ecef62db..4a32ce327b1 100644 --- a/rs/test_utilities/state/Cargo.toml +++ b/rs/test_utilities/state/Cargo.toml @@ -10,7 +10,7 @@ documentation.workspace = true ic-base-types = { path = "../../types/base_types" } ic-btc-replica-types = { path = "../../bitcoin/replica_types" } ic-interfaces = { path = "../../interfaces" } -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-registry-subnet-features = { path = "../../registry/subnet_features" } ic-registry-subnet-type = { path = "../../registry/subnet_type" } diff --git a/rs/test_utilities/state/src/lib.rs b/rs/test_utilities/state/src/lib.rs index d4b4d859c6e..25162233824 100644 --- a/rs/test_utilities/state/src/lib.rs +++ b/rs/test_utilities/state/src/lib.rs @@ -1,6 +1,6 @@ use ic_base_types::NumSeconds; use ic_btc_replica_types::BitcoinAdapterRequestWrapper; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterStatusType, EcdsaCurve, EcdsaKeyId, LogVisibilityV2, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, }; diff --git a/rs/tests/ckbtc/Cargo.toml b/rs/tests/ckbtc/Cargo.toml index e23131167b0..bad136d55e7 100644 --- a/rs/tests/ckbtc/Cargo.toml +++ b/rs/tests/ckbtc/Cargo.toml @@ -22,7 +22,7 @@ ic-ckbtc-agent = { path = "../../bitcoin/ckbtc/agent" } ic-ckbtc-minter = { path = "../../bitcoin/ckbtc/minter" } ic-config = { path = "../../config" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } ic-nns-common = { path = "../../nns/common" } ic-nns-constants = { path = "../../nns/constants" } diff --git a/rs/tests/ckbtc/src/lib.rs b/rs/tests/ckbtc/src/lib.rs index 18c2eea8954..8423269fa82 100644 --- a/rs/tests/ckbtc/src/lib.rs +++ b/rs/tests/ckbtc/src/lib.rs @@ -19,7 +19,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ get_public_key_with_logger, get_signature_with_logger, make_key, verify_signature, }; use ic_icrc1_ledger::{InitArgsBuilder, LedgerArgument}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, MasterPublicKeyId, ProvisionalCreateCanisterWithCyclesArgs, }; use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR}; @@ -336,7 +336,8 @@ pub async fn create_canister_at_id(runtime: &Runtime, specified_id: PrincipalId) let canister_id_record: CanisterIdRecord = runtime .get_management_canister() .update_( - ic_management_canister_types::Method::ProvisionalCreateCanisterWithCycles.to_string(), + ic_management_canister_types_private::Method::ProvisionalCreateCanisterWithCycles + .to_string(), candid, (ProvisionalCreateCanisterWithCyclesArgs::new( None, diff --git a/rs/tests/consensus/Cargo.toml b/rs/tests/consensus/Cargo.toml index de0dd75dd1d..3fa99abf509 100644 --- a/rs/tests/consensus/Cargo.toml +++ b/rs/tests/consensus/Cargo.toml @@ -14,7 +14,7 @@ futures = { workspace = true } ic-agent = { workspace = true } ic-base-types = { path = "../../types/base_types" } ic-crypto-test-utils-reproducible-rng = { path = "../../crypto/test_utils/reproducible_rng" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nns-constants = { path = "../../nns/constants" } ic-nns-governance-api = { path = "../../nns/governance/api" } ic-recovery = { path = "../../recovery" } diff --git a/rs/tests/consensus/subnet_recovery/Cargo.toml b/rs/tests/consensus/subnet_recovery/Cargo.toml index f90c3df7ac4..92a50aeb9ac 100644 --- a/rs/tests/consensus/subnet_recovery/Cargo.toml +++ b/rs/tests/consensus/subnet_recovery/Cargo.toml @@ -15,7 +15,7 @@ ic-agent = { workspace = true } ic-base-types = { path = "../../../types/base_types" } ic-canister-client = { path = "../../../canister_client" } ic_consensus_threshold_sig_system_test_utils = { path = "../tecdsa/utils" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-nns-constants = { path = "../../../nns/constants" } ic-protobuf = { path = "../../../protobuf" } ic-recovery = { path = "../../../recovery" } @@ -81,5 +81,3 @@ path = "sr_app_no_upgrade_with_tecdsa_test.rs" [[bin]] name = "ic-systest-subnet-recovery-app-large-with-tecdsa" path = "sr_app_large_with_tecdsa_test.rs" - - diff --git a/rs/tests/consensus/subnet_recovery/common.rs b/rs/tests/consensus/subnet_recovery/common.rs index 4d824815b05..43ca5d8ae88 100644 --- a/rs/tests/consensus/subnet_recovery/common.rs +++ b/rs/tests/consensus/subnet_recovery/common.rs @@ -46,7 +46,7 @@ use ic_consensus_system_test_utils::{ use ic_consensus_threshold_sig_system_test_utils::{ create_new_subnet_with_keys, make_key_ids_for_all_schemes, run_chain_key_signature_test, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_protobuf::types::v1 as pb; use ic_recovery::{ diff --git a/rs/tests/consensus/tecdsa/Cargo.toml b/rs/tests/consensus/tecdsa/Cargo.toml index 7024f63e7f9..e272465889d 100644 --- a/rs/tests/consensus/tecdsa/Cargo.toml +++ b/rs/tests/consensus/tecdsa/Cargo.toml @@ -15,7 +15,7 @@ ic-agent = { workspace = true } ic-base-types = { path = "../../../types/base_types" } ic-config = { path = "../../../config" } ic-limits = { path = "../../../limits" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-nns-constants = { path = "../../../nns/constants" } ic-nns-governance-api = { path = "../../../nns/governance/api" } ic-registry-nns-data-provider = { path = "../../../registry/nns_data_provider" } diff --git a/rs/tests/consensus/tecdsa/tecdsa_add_nodes_test.rs b/rs/tests/consensus/tecdsa/tecdsa_add_nodes_test.rs index 6f857a6716d..60b8852ffe1 100644 --- a/rs/tests/consensus/tecdsa/tecdsa_add_nodes_test.rs +++ b/rs/tests/consensus/tecdsa/tecdsa_add_nodes_test.rs @@ -29,7 +29,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ enable_chain_key_signing, get_public_key_and_test_signature, get_public_key_with_logger, make_key_ids_for_all_schemes, DKG_INTERVAL, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_nns_governance_api::pb::v1::NnsFunction; use ic_registry_subnet_type::SubnetType; diff --git a/rs/tests/consensus/tecdsa/tecdsa_performance_test_template.rs b/rs/tests/consensus/tecdsa/tecdsa_performance_test_template.rs index 7a29679cc54..d8919144533 100644 --- a/rs/tests/consensus/tecdsa/tecdsa_performance_test_template.rs +++ b/rs/tests/consensus/tecdsa/tecdsa_performance_test_template.rs @@ -47,7 +47,7 @@ use ic_consensus_system_test_utils::{ use ic_consensus_threshold_sig_system_test_utils::{ run_chain_key_signature_test, ChainSignatureRequest, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_registry_subnet_features::{ChainKeyConfig, KeyConfig}; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::canister_agent::HasCanisterAgentCapability; diff --git a/rs/tests/consensus/tecdsa/tecdsa_signature_fails_without_cycles_test.rs b/rs/tests/consensus/tecdsa/tecdsa_signature_fails_without_cycles_test.rs index 2e335230498..9e3adcd6f88 100644 --- a/rs/tests/consensus/tecdsa/tecdsa_signature_fails_without_cycles_test.rs +++ b/rs/tests/consensus/tecdsa/tecdsa_signature_fails_without_cycles_test.rs @@ -8,7 +8,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ enable_chain_key_signing, get_public_key_with_logger, get_signature_with_logger, make_key_ids_for_all_schemes, scale_cycles, setup, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::{ diff --git a/rs/tests/consensus/tecdsa/tecdsa_signature_life_cycle_test.rs b/rs/tests/consensus/tecdsa/tecdsa_signature_life_cycle_test.rs index 830a459e0a0..113c93ca4f8 100644 --- a/rs/tests/consensus/tecdsa/tecdsa_signature_life_cycle_test.rs +++ b/rs/tests/consensus/tecdsa/tecdsa_signature_life_cycle_test.rs @@ -12,7 +12,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ get_signature_with_logger, make_bip340_key_id, make_ecdsa_key_id, make_eddsa_key_id, scale_cycles, setup_without_ecdsa_on_nns, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_registry_nns_data_provider::registry::RegistryCanister; use ic_registry_subnet_type::SubnetType; diff --git a/rs/tests/consensus/tecdsa/tecdsa_two_signing_subnets_test.rs b/rs/tests/consensus/tecdsa/tecdsa_two_signing_subnets_test.rs index a14e8758b33..927f77548b6 100644 --- a/rs/tests/consensus/tecdsa/tecdsa_two_signing_subnets_test.rs +++ b/rs/tests/consensus/tecdsa/tecdsa_two_signing_subnets_test.rs @@ -28,7 +28,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ create_new_subnet_with_keys, empty_subnet_update, execute_update_subnet_proposal, get_master_public_key, make_key, run_chain_key_signature_test, KEY_ID1, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_registry_subnet_features::{ChainKeyConfig, KeyConfig, DEFAULT_ECDSA_MAX_QUEUE_SIZE}; use ic_registry_subnet_type::SubnetType; diff --git a/rs/tests/consensus/tecdsa/tschnorr_message_sizes_test.rs b/rs/tests/consensus/tecdsa/tschnorr_message_sizes_test.rs index eebbb3ba50a..5f85b044d78 100644 --- a/rs/tests/consensus/tecdsa/tschnorr_message_sizes_test.rs +++ b/rs/tests/consensus/tecdsa/tschnorr_message_sizes_test.rs @@ -24,7 +24,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ get_public_key_with_logger, get_signature_with_logger, make_bip340_key_id, make_eddsa_key_id, verify_signature, DKG_INTERVAL, NUMBER_OF_NODES, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_registry_subnet_features::{ChainKeyConfig, KeyConfig, DEFAULT_ECDSA_MAX_QUEUE_SIZE}; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::driver::group::SystemTestGroup; diff --git a/rs/tests/consensus/tecdsa/utils/Cargo.toml b/rs/tests/consensus/tecdsa/utils/Cargo.toml index 5b76fb4bbd8..c28ca4daac6 100644 --- a/rs/tests/consensus/tecdsa/utils/Cargo.toml +++ b/rs/tests/consensus/tecdsa/utils/Cargo.toml @@ -16,7 +16,7 @@ ic-base-types = { path = "../../../../types/base_types" } ic-canister-client = { path = "../../../../canister_client" } ic-config = { path = "../../../../config" } ic-limits = { path = "../../../../limits" } -ic-management-canister-types = { path = "../../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../../types/management_canister_types" } ic-message = { path = "../../../test_canisters/message" } ic-nervous-system-common-test-keys = { path = "../../../../nervous_system/common/test_keys" } ic-nns-common = { path = "../../../../nns/common" } diff --git a/rs/tests/consensus/tecdsa/utils/src/lib.rs b/rs/tests/consensus/tecdsa/utils/src/lib.rs index 452213297ab..d7aa5c5dd41 100644 --- a/rs/tests/consensus/tecdsa/utils/src/lib.rs +++ b/rs/tests/consensus/tecdsa/utils/src/lib.rs @@ -5,7 +5,7 @@ use ic_base_types::{NodeId, SubnetId}; use ic_canister_client::Sender; use ic_config::subnet_config::{ECDSA_SIGNATURE_FEE, SCHNORR_SIGNATURE_FEE}; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ DerivationPath, ECDSAPublicKeyArgs, ECDSAPublicKeyResponse, EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, Payload, SchnorrAlgorithm, SchnorrKeyId, SchnorrPublicKeyArgs, SchnorrPublicKeyResponse, SignWithECDSAArgs, SignWithECDSAReply, SignWithSchnorrArgs, diff --git a/rs/tests/consensus/upgrade/Cargo.toml b/rs/tests/consensus/upgrade/Cargo.toml index a0a09a3a0e4..1664b219522 100644 --- a/rs/tests/consensus/upgrade/Cargo.toml +++ b/rs/tests/consensus/upgrade/Cargo.toml @@ -15,7 +15,7 @@ ic-canister-client = { path = "../../../canister_client" } ic-nns-common = { path = "../../../nns/common" } ic-system-test-driver = { path = "../../driver" } ic-types = { path = "../../../types/types" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-nervous-system-common-test-keys = { path = "../../../nervous_system/common/test_keys" } ic-registry-nns-data-provider = { path = "../../../registry/nns_data_provider" } ic-registry-subnet-features = { path = "../../../registry/subnet_features" } diff --git a/rs/tests/consensus/upgrade/common.rs b/rs/tests/consensus/upgrade/common.rs index 8d946e7c3ac..dafd4c4fdef 100644 --- a/rs/tests/consensus/upgrade/common.rs +++ b/rs/tests/consensus/upgrade/common.rs @@ -23,7 +23,7 @@ use ic_consensus_system_test_utils::upgrade::{ UpdateImageType, }; use ic_consensus_threshold_sig_system_test_utils::run_chain_key_signature_test; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::{ driver::{test_env::TestEnv, test_env_api::*}, diff --git a/rs/tests/consensus/utils/Cargo.toml b/rs/tests/consensus/utils/Cargo.toml index 533884c22d2..6df1a1c6f3c 100644 --- a/rs/tests/consensus/utils/Cargo.toml +++ b/rs/tests/consensus/utils/Cargo.toml @@ -17,7 +17,7 @@ ic-base-types = { path = "../../../types/base_types" } ic-canister-client = { path = "../../../canister_client" } ic-config = { path = "../../../config" } ic-http-utils = { path = "../../../http_utils" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-nervous-system-common-test-keys = { path = "../../../nervous_system/common/test_keys" } ic-nns-common = { path = "../../../nns/common" } ic-nns-constants = { path = "../../../nns/constants" } diff --git a/rs/tests/consensus/utils/src/subnet.rs b/rs/tests/consensus/utils/src/subnet.rs index ea2daaebf4d..622e0010072 100644 --- a/rs/tests/consensus/utils/src/subnet.rs +++ b/rs/tests/consensus/utils/src/subnet.rs @@ -9,7 +9,7 @@ use ic_consensus_threshold_sig_system_test_utils::{ add_chain_keys_with_timeout_and_rotation_period, empty_subnet_update, execute_update_subnet_proposal, get_master_public_key, get_signature_with_logger, }; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_system_test_driver::util::*; use ic_system_test_driver::{driver::test_env_api::*, util::runtime_from_url}; diff --git a/rs/tests/consensus/vetkd/Cargo.toml b/rs/tests/consensus/vetkd/Cargo.toml index dec10d17542..b1cafa89280 100644 --- a/rs/tests/consensus/vetkd/Cargo.toml +++ b/rs/tests/consensus/vetkd/Cargo.toml @@ -9,7 +9,7 @@ documentation.workspace = true [dependencies] anyhow = { workspace = true } canister-test = { path = "../../../rust_canisters/canister_test" } -ic-management-canister-types = { path = "../../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../../types/management_canister_types" } ic-nns-constants = { path = "../../../nns/constants" } ic-registry-subnet-type = { path = "../../../registry/subnet_type" } ic-system-test-driver = { path = "../../driver" } diff --git a/rs/tests/consensus/vetkd/vetkd_key_life_cycle_test.rs b/rs/tests/consensus/vetkd/vetkd_key_life_cycle_test.rs index 9ea6e9fb7ce..60843325754 100644 --- a/rs/tests/consensus/vetkd/vetkd_key_life_cycle_test.rs +++ b/rs/tests/consensus/vetkd/vetkd_key_life_cycle_test.rs @@ -20,7 +20,7 @@ use ic_consensus_system_test_utils::node::await_node_certified_height; use ic_consensus_threshold_sig_system_test_utils::{ add_chain_keys_with_timeout_and_rotation_period, DKG_INTERVAL, }; -use ic_management_canister_types::{MasterPublicKeyId, VetKdCurve, VetKdKeyId}; +use ic_management_canister_types_private::{MasterPublicKeyId, VetKdCurve, VetKdKeyId}; use ic_nns_constants::GOVERNANCE_CANISTER_ID; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::{ diff --git a/rs/tests/cross_chain/Cargo.toml b/rs/tests/cross_chain/Cargo.toml index 25155229474..967d46b3829 100644 --- a/rs/tests/cross_chain/Cargo.toml +++ b/rs/tests/cross_chain/Cargo.toml @@ -11,18 +11,18 @@ anyhow = { workspace = true } candid = { workspace = true } canister-test = { path = "../../rust_canisters/canister_test" } dfn_candid = { path = "../../rust_canisters/dfn_candid" } -futures = {workspace = true} +futures = { workspace = true } hex-literal = "0.4.1" ic-base-types = { path = "../../types/base_types" } ic-canister-client = { path = "../../canister_client" } ic_consensus_system_test_utils = { path = "../consensus/utils" } -ic_consensus_threshold_sig_system_test_utils = { path = "../consensus/tecdsa/utils"} -ic-ethereum-types = { path = "../../../packages/ic-ethereum-types"} +ic_consensus_threshold_sig_system_test_utils = { path = "../consensus/tecdsa/utils" } +ic-ethereum-types = { path = "../../../packages/ic-ethereum-types" } ic-icrc1-index-ng = { path = "../../ledger_suite/icrc1/index-ng" } ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } ic-ledger-suite-orchestrator = { path = "../../ethereum/ledger-suite-orchestrator" } ic-cketh-minter = { path = "../../ethereum/cketh/minter" } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common-test-keys = { path = "../../nervous_system/common/test_keys" } ic-nervous-system-root = { path = "../../nervous_system/root" } diff --git a/rs/tests/cross_chain/ic_xc_cketh_test.rs b/rs/tests/cross_chain/ic_xc_cketh_test.rs index 4f0d3ee2436..6c9f8d423dc 100644 --- a/rs/tests/cross_chain/ic_xc_cketh_test.rs +++ b/rs/tests/cross_chain/ic_xc_cketh_test.rs @@ -18,7 +18,7 @@ use ic_ledger_suite_orchestrator::candid::{ AddErc20Arg, Erc20Contract, InitArg, LedgerInitArg, ManagedCanisterIds, OrchestratorArg, UpgradeArg as LedgerSuiteOrchestratorUpgradeArg, }; -use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId}; +use ic_management_canister_types_private::{EcdsaKeyId, MasterPublicKeyId}; use ic_nns_constants::{GOVERNANCE_CANISTER_ID, ROOT_CANISTER_ID}; use ic_registry_subnet_type::SubnetType; use ic_system_test_driver::driver::test_env_api::SubnetSnapshot; diff --git a/rs/tests/cross_chain/ic_xc_ledger_suite_orchestrator_test.rs b/rs/tests/cross_chain/ic_xc_ledger_suite_orchestrator_test.rs index 3f70b6c63bb..55fc4745393 100644 --- a/rs/tests/cross_chain/ic_xc_ledger_suite_orchestrator_test.rs +++ b/rs/tests/cross_chain/ic_xc_ledger_suite_orchestrator_test.rs @@ -10,7 +10,7 @@ use ic_ledger_suite_orchestrator::candid::{ AddErc20Arg, Erc20Contract, InitArg, LedgerInitArg, ManagedCanisterIds, OrchestratorArg, UpgradeArg, }; -use ic_management_canister_types::CanisterInstallMode; +use ic_management_canister_types_private::CanisterInstallMode; use ic_nervous_system_clients::canister_status::CanisterStatusResult; use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR}; use ic_nervous_system_root::change_canister::ChangeCanisterRequest; diff --git a/rs/tests/driver/Cargo.toml b/rs/tests/driver/Cargo.toml index 1bff4dabfb5..7aaaec723eb 100644 --- a/rs/tests/driver/Cargo.toml +++ b/rs/tests/driver/Cargo.toml @@ -51,7 +51,7 @@ ic-icrc1-ledger = { path = "../../ledger_suite/icrc1/ledger" } ic-interfaces = { path = "../../interfaces" } ic-interfaces-registry = { path = "../../interfaces/registry" } 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-message = { path = "../test_canisters/message" } ic-nervous-system-clients = { path = "../../nervous_system/clients" } ic-nervous-system-common = { path = "../../nervous_system/common" } diff --git a/rs/tests/driver/src/types.rs b/rs/tests/driver/src/types.rs index fbe3b2727e6..301fe95a67f 100644 --- a/rs/tests/driver/src/types.rs +++ b/rs/tests/driver/src/types.rs @@ -1,6 +1,6 @@ use candid::CandidType; use ic_agent::export::Principal; -use ic_management_canister_types::{CanisterStatusType, DefiniteCanisterSettingsArgs}; +use ic_management_canister_types_private::{CanisterStatusType, DefiniteCanisterSettingsArgs}; pub use ic_utils::interfaces::management_canister::builders::InstallMode; use serde::Deserialize; diff --git a/rs/tests/driver/src/util.rs b/rs/tests/driver/src/util.rs index 5df338cf51e..9bad46628f1 100644 --- a/rs/tests/driver/src/util.rs +++ b/rs/tests/driver/src/util.rs @@ -29,7 +29,7 @@ use ic_agent::{ use ic_canister_client::{Agent as DeprecatedAgent, Sender}; use ic_config::ConfigOptional; use ic_limits::MAX_INGRESS_TTL; -use ic_management_canister_types::{CanisterStatusResultV2, EmptyBlob, Payload}; +use ic_management_canister_types_private::{CanisterStatusResultV2, EmptyBlob, Payload}; use ic_message::ForwardParams; use ic_nervous_system_proto::pb::v1::GlobalTimeOfDay; use ic_nns_constants::{GOVERNANCE_CANISTER_ID, ROOT_CANISTER_ID}; diff --git a/rs/tests/execution/Cargo.toml b/rs/tests/execution/Cargo.toml index 5c3ede82769..34991f85f96 100644 --- a/rs/tests/execution/Cargo.toml +++ b/rs/tests/execution/Cargo.toml @@ -12,7 +12,7 @@ bitcoincore-rpc = { workspace = true } candid = { workspace = true } futures = { workspace = true } ic-agent = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-registry-subnet-type = { path = "../../registry/subnet_type" } ic-system-test-driver = { path = "../driver" } ic-universal-canister = { path = "../../universal_canister/lib" } diff --git a/rs/tests/execution/general_execution_tests/api_tests.rs b/rs/tests/execution/general_execution_tests/api_tests.rs index 8e08b432238..b6cbd11fbb5 100644 --- a/rs/tests/execution/general_execution_tests/api_tests.rs +++ b/rs/tests/execution/general_execution_tests/api_tests.rs @@ -3,7 +3,7 @@ end::catalog[] */ use ic_agent::{agent::RejectCode, Agent}; use ic_base_types::PrincipalId; -use ic_management_canister_types::{self as ic00, EmptyBlob, Method, Payload}; +use ic_management_canister_types_private::{self as ic00, EmptyBlob, Method, Payload}; use ic_system_test_driver::driver::test_env::TestEnv; use ic_system_test_driver::driver::test_env_api::GetFirstHealthyNodeSnapshot; use ic_system_test_driver::driver::test_env_api::HasPublicApiUrl; diff --git a/rs/tests/execution/general_execution_tests/canister_lifecycle.rs b/rs/tests/execution/general_execution_tests/canister_lifecycle.rs index 90f68b082ad..b9ddfedc237 100644 --- a/rs/tests/execution/general_execution_tests/canister_lifecycle.rs +++ b/rs/tests/execution/general_execution_tests/canister_lifecycle.rs @@ -30,7 +30,7 @@ end::catalog[] */ use candid::{Decode, Encode}; use ic_agent::{agent::RejectCode, export::Principal, identity::Identity}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusResultV2, CreateCanisterArgs, EmptyBlob, Payload, }; diff --git a/rs/tests/execution/general_execution_tests/nns_shielding.rs b/rs/tests/execution/general_execution_tests/nns_shielding.rs index f2c1cb01719..f298cb70abd 100644 --- a/rs/tests/execution/general_execution_tests/nns_shielding.rs +++ b/rs/tests/execution/general_execution_tests/nns_shielding.rs @@ -7,7 +7,7 @@ use ic_agent::{ AgentError, }; use ic_base_types::RegistryVersion; -use ic_management_canister_types::SetupInitialDKGArgs; +use ic_management_canister_types_private::SetupInitialDKGArgs; use ic_nns_constants::CYCLES_MINTING_CANISTER_ID; use ic_system_test_driver::driver::test_env_api::{GetFirstHealthyNodeSnapshot, HasPublicApiUrl}; use ic_system_test_driver::driver::{test_env::TestEnv, test_env_api::IcNodeSnapshot}; diff --git a/rs/tests/execution/general_execution_tests/wasm_chunk_store.rs b/rs/tests/execution/general_execution_tests/wasm_chunk_store.rs index a4ee00f238a..46653ba7625 100644 --- a/rs/tests/execution/general_execution_tests/wasm_chunk_store.rs +++ b/rs/tests/execution/general_execution_tests/wasm_chunk_store.rs @@ -4,7 +4,7 @@ use ic_agent::{ AgentError, }; use ic_base_types::CanisterId; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterInstallModeV2, InstallChunkedCodeArgs, Payload, UploadChunkArgs, UploadChunkReply, }; use ic_registry_subnet_type::SubnetType; @@ -54,7 +54,7 @@ pub fn install_large_wasm(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::UploadChunk, + ic_management_canister_types_private::Method::UploadChunk, call_args() .other_side( UploadChunkArgs { @@ -77,7 +77,7 @@ pub fn install_large_wasm(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::UploadChunk, + ic_management_canister_types_private::Method::UploadChunk, call_args() .other_side( UploadChunkArgs { @@ -100,7 +100,7 @@ pub fn install_large_wasm(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::InstallChunkedCode, + ic_management_canister_types_private::Method::InstallChunkedCode, call_args() .other_side( InstallChunkedCodeArgs::new( @@ -164,7 +164,7 @@ pub fn install_large_wasm_with_other_store(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::UploadChunk, + ic_management_canister_types_private::Method::UploadChunk, call_args() .other_side( UploadChunkArgs { @@ -187,7 +187,7 @@ pub fn install_large_wasm_with_other_store(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::InstallChunkedCode, + ic_management_canister_types_private::Method::InstallChunkedCode, call_args() .other_side( InstallChunkedCodeArgs::new( @@ -263,7 +263,7 @@ pub fn install_large_wasm_with_other_store_fails_cross_subnet(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::UploadChunk, + ic_management_canister_types_private::Method::UploadChunk, call_args() .other_side( UploadChunkArgs { @@ -286,7 +286,7 @@ pub fn install_large_wasm_with_other_store_fails_cross_subnet(env: TestEnv) { .update( wasm().call_with_cycles( CanisterId::ic_00(), - ic_management_canister_types::Method::InstallChunkedCode, + ic_management_canister_types_private::Method::InstallChunkedCode, call_args() .other_side( InstallChunkedCodeArgs::new( diff --git a/rs/tests/networking/Cargo.toml b/rs/tests/networking/Cargo.toml index 295e85713eb..8cd2f46866b 100644 --- a/rs/tests/networking/Cargo.toml +++ b/rs/tests/networking/Cargo.toml @@ -18,8 +18,8 @@ ic-agent = { workspace = true } ic-base-types = { path = "../../types/base_types" } ic-cdk = { workspace = true } ic-limits = { path = "../../limits" } -ic-management-canister-types = { path = "../../types/management_canister_types" } -ic-networking-subnet-update-workload = { path = "./subnet_update_workload" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } +ic-networking-subnet-update-workload = { path = "./subnet_update_workload" } ic-nns-governance-api = { path = "../../nns/governance/api" } ic-prep = { path = "../../prep" } ic-protobuf = { path = "../../protobuf" } @@ -34,7 +34,7 @@ ic-utils = { workspace = true } proxy_canister = { path = "../../rust_canisters/proxy_canister" } rand = { workspace = true } rand_chacha = { workspace = true } -registry-canister = {path = "../../registry/canister"} +registry-canister = { path = "../../registry/canister" } reqwest = { workspace = true } slog = { workspace = true } tokio = { workspace = true } diff --git a/rs/tests/networking/canister_http_correctness_test.rs b/rs/tests/networking/canister_http_correctness_test.rs index b8efdabcdf0..c8e5314871c 100644 --- a/rs/tests/networking/canister_http_correctness_test.rs +++ b/rs/tests/networking/canister_http_correctness_test.rs @@ -22,7 +22,7 @@ use canister_test::{Canister, Runtime}; use dfn_candid::candid_one; use ic_base_types::{CanisterId, NumBytes}; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedHttpHeaders, CanisterHttpRequestArgs, HttpHeader, HttpMethod, TransformContext, TransformFunc, }; diff --git a/rs/tests/networking/canister_http_fault_tolerance_test.rs b/rs/tests/networking/canister_http_fault_tolerance_test.rs index 62eb1f04eb5..adaca8fdde6 100644 --- a/rs/tests/networking/canister_http_fault_tolerance_test.rs +++ b/rs/tests/networking/canister_http_fault_tolerance_test.rs @@ -23,7 +23,7 @@ use canister_http::*; use canister_test::Canister; use dfn_candid::candid_one; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedHttpHeaders, CanisterHttpRequestArgs, HttpMethod, TransformContext, TransformFunc, }; use ic_registry_subnet_type::SubnetType; diff --git a/rs/tests/networking/canister_http_socks_test.rs b/rs/tests/networking/canister_http_socks_test.rs index 5e3af452cbc..42924d5913d 100644 --- a/rs/tests/networking/canister_http_socks_test.rs +++ b/rs/tests/networking/canister_http_socks_test.rs @@ -21,7 +21,7 @@ use anyhow::Result; use canister_http::*; use dfn_candid::candid_one; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedHttpHeaders, CanisterHttpRequestArgs, HttpMethod, TransformContext, TransformFunc, }; use ic_registry_subnet_features::SubnetFeatures; diff --git a/rs/tests/networking/canister_http_test.rs b/rs/tests/networking/canister_http_test.rs index 9c07c1e087c..70cc2be152b 100644 --- a/rs/tests/networking/canister_http_test.rs +++ b/rs/tests/networking/canister_http_test.rs @@ -21,7 +21,7 @@ use canister_http::*; use canister_test::Canister; use dfn_candid::candid_one; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedHttpHeaders, CanisterHttpRequestArgs, HttpMethod, TransformContext, TransformFunc, }; use ic_system_test_driver::driver::group::SystemTestGroup; diff --git a/rs/tests/networking/canister_http_time_out_test.rs b/rs/tests/networking/canister_http_time_out_test.rs index 5c828e575e0..dcad47c07c9 100644 --- a/rs/tests/networking/canister_http_time_out_test.rs +++ b/rs/tests/networking/canister_http_time_out_test.rs @@ -21,7 +21,7 @@ use anyhow::Result; use canister_http::*; use dfn_candid::candid_one; use ic_cdk::api::call::RejectionCode; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ BoundedHttpHeaders, CanisterHttpRequestArgs, HttpMethod, TransformContext, TransformFunc, }; use ic_system_test_driver::driver::group::SystemTestGroup; diff --git a/rs/tests/nns/Cargo.toml b/rs/tests/nns/Cargo.toml index 51b38100833..05a460fa00c 100644 --- a/rs/tests/nns/Cargo.toml +++ b/rs/tests/nns/Cargo.toml @@ -41,7 +41,7 @@ wat = { workspace = true } serde_cbor = { workspace = true } on_wire = { path = "../../rust_canisters/on_wire" } num-traits = { workspace = true } -ic-management-canister-types = { path = "../../types/management_canister_types" } +ic-management-canister-types-private = { path = "../../types/management_canister_types" } ic-nns-common = { path = "../../nns/common" } ic-certification = { path = "../../certification" } ic-crypto-tree-hash = { path = "../../crypto/tree_hash" } diff --git a/rs/tests/nns/nns_cycles_minting_multi_app_subnets_test.rs b/rs/tests/nns/nns_cycles_minting_multi_app_subnets_test.rs index 997a094e8fd..108e3b545b6 100644 --- a/rs/tests/nns/nns_cycles_minting_multi_app_subnets_test.rs +++ b/rs/tests/nns/nns_cycles_minting_multi_app_subnets_test.rs @@ -3,7 +3,7 @@ use cycles_minting::{make_user_ed25519, TestAgent, UserHandle}; use cycles_minting_canister::{SubnetFilter, SubnetSelection, CREATE_CANISTER_REFUND_FEE}; use dfn_candid::candid_one; use ic_canister_client::{HttpClient, Sender}; -use ic_management_canister_types::{CanisterIdRecord, CanisterStatusResultV2}; +use ic_management_canister_types_private::{CanisterIdRecord, CanisterStatusResultV2}; use ic_nervous_system_common_test_keys::{TEST_USER1_KEYPAIR, TEST_USER1_PRINCIPAL}; use ic_nns_constants::{CYCLES_MINTING_CANISTER_ID, LEDGER_CANISTER_ID}; use ic_registry_subnet_type::SubnetType; diff --git a/rs/tests/nns/nns_cycles_minting_test.rs b/rs/tests/nns/nns_cycles_minting_test.rs index a09b507be27..5d99de3f5ce 100644 --- a/rs/tests/nns/nns_cycles_minting_test.rs +++ b/rs/tests/nns/nns_cycles_minting_test.rs @@ -13,7 +13,7 @@ use ic_crypto_tree_hash::MixedHashTree; use ic_crypto_utils_threshold_sig_der::threshold_sig_public_key_from_der; use ic_ledger_core::tokens::CheckedAdd; use ic_limits::SMALL_APP_SUBNET_MAX_SIZE; -use ic_management_canister_types::{CanisterIdRecord, CanisterStatusResultV2}; +use ic_management_canister_types_private::{CanisterIdRecord, CanisterStatusResultV2}; use ic_nervous_system_clients::canister_status::CanisterStatusResult as RootCanisterStatusResult; use ic_nervous_system_common_test_keys::{ TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_USER1_KEYPAIR, TEST_USER1_PRINCIPAL, diff --git a/rs/types/README.adoc b/rs/types/README.adoc index 823e6ad5874..0698e3ef205 100644 --- a/rs/types/README.adoc +++ b/rs/types/README.adoc @@ -17,7 +17,7 @@ This package contains definitions of error types that the user of the IC can obs Avoid adding component-specific error types to this package. -== `ic-management-canister-types` +== `ic-management-canister-types-private` This package contains types specified in the https://github.com/dfinity/interface-spec/blob/master/spec/ic.did[ic00 management canister interface]. diff --git a/rs/types/management_canister_types/BUILD.bazel b/rs/types/management_canister_types/BUILD.bazel index 39e3c90bd16..ffb8e1304ee 100644 --- a/rs/types/management_canister_types/BUILD.bazel +++ b/rs/types/management_canister_types/BUILD.bazel @@ -66,7 +66,7 @@ rust_library( "//bazel:fuzzing_code_enabled": ["fuzzing_code"], "//conditions:default": [], }), - crate_name = "ic_management_canister_types", + crate_name = "ic_management_canister_types_private", proc_macro_deps = [ # Keep sorted. "@crate_index//:strum_macros", diff --git a/rs/types/management_canister_types/Cargo.toml b/rs/types/management_canister_types/Cargo.toml index a673704d173..656ce99404e 100644 --- a/rs/types/management_canister_types/Cargo.toml +++ b/rs/types/management_canister_types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ic-management-canister-types" +name = "ic-management-canister-types-private" version.workspace = true authors.workspace = true edition.workspace = true diff --git a/rs/types/management_canister_types/fuzz/Cargo.toml b/rs/types/management_canister_types/fuzz/Cargo.toml index 41e8bbc32fe..0372b2ad58b 100644 --- a/rs/types/management_canister_types/fuzz/Cargo.toml +++ b/rs/types/management_canister_types/fuzz/Cargo.toml @@ -11,7 +11,7 @@ cargo-fuzz = true [dependencies] candid = { workspace = true } -ic-management-canister-types = {path = ".."} +ic-management-canister-types-private = { path = ".." } libfuzzer-sys = "0.4" # Prevent this from interfering with workspaces diff --git a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_canister_http_request_args.rs b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_canister_http_request_args.rs index eb8cedabdb8..e5c23d714b2 100644 --- a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_canister_http_request_args.rs +++ b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_canister_http_request_args.rs @@ -1,6 +1,6 @@ #![no_main] -use ic_management_canister_types::CanisterHttpRequestArgs; -use ic_management_canister_types::Payload; +use ic_management_canister_types_private::CanisterHttpRequestArgs; +use ic_management_canister_types_private::Payload; use libfuzzer_sys::fuzz_target; // This fuzz test feeds binary data to Candid's `Decode!` macro for CanisterHttpRequestArgs with the goal of exposing panics diff --git a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_ecdsa_public_key_args.rs b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_ecdsa_public_key_args.rs index cad1da36149..58c1cd71789 100644 --- a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_ecdsa_public_key_args.rs +++ b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_ecdsa_public_key_args.rs @@ -1,6 +1,6 @@ #![no_main] -use ic_management_canister_types::ECDSAPublicKeyArgs; -use ic_management_canister_types::Payload; +use ic_management_canister_types_private::ECDSAPublicKeyArgs; +use ic_management_canister_types_private::Payload; use libfuzzer_sys::fuzz_target; // This fuzz test feeds binary data to Candid's `Decode!` macro for ECDSAPublicKeyArgs with the goal of exposing panics diff --git a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_install_code_args.rs b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_install_code_args.rs index 70aeb2ae65d..1b2969c8a4e 100644 --- a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_install_code_args.rs +++ b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_install_code_args.rs @@ -1,6 +1,6 @@ #![no_main] -use ic_management_canister_types::InstallCodeArgs; -use ic_management_canister_types::Payload; +use ic_management_canister_types_private::InstallCodeArgs; +use ic_management_canister_types_private::Payload; use libfuzzer_sys::fuzz_target; // This fuzz test feeds binary data to Candid's `Decode!` macro for InstallCodeArgs with the goal of exposing panics diff --git a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_sign_with_ecdsa_args.rs b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_sign_with_ecdsa_args.rs index 48dfafa1412..e1c47df8cf2 100644 --- a/rs/types/management_canister_types/fuzz/fuzz_targets/decode_sign_with_ecdsa_args.rs +++ b/rs/types/management_canister_types/fuzz/fuzz_targets/decode_sign_with_ecdsa_args.rs @@ -1,6 +1,6 @@ #![no_main] -use ic_management_canister_types::Payload; -use ic_management_canister_types::SignWithECDSAArgs; +use ic_management_canister_types_private::Payload; +use ic_management_canister_types_private::SignWithECDSAArgs; use libfuzzer_sys::fuzz_target; // This fuzz test feeds binary data to Candid's `Decode!` macro for SignWithECDSAArgs with the goal of exposing panics diff --git a/rs/types/types/Cargo.toml b/rs/types/types/Cargo.toml index 053688c9dff..6ecb1f1f525 100644 --- a/rs/types/types/Cargo.toml +++ b/rs/types/types/Cargo.toml @@ -18,7 +18,7 @@ ic-crypto-internal-types = { path = "../../crypto/internal/crypto_lib/types" } ic-crypto-sha2 = { path = "../../crypto/sha2" } ic-crypto-tree-hash = { path = "../../crypto/tree_hash" } ic-error-types = { path = "../error_types" } -ic-management-canister-types = { path = "../management_canister_types" } +ic-management-canister-types-private = { path = "../management_canister_types" } ic-protobuf = { path = "../../protobuf" } ic-validate-eq = { path = "../../utils/validate_eq" } ic-validate-eq-derive = { path = "../../utils/validate_eq_derive" } @@ -54,4 +54,4 @@ rusty-fork = "0.3.0" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] proptest = { workspace = true } -proptest-derive = { workspace = true } \ No newline at end of file +proptest-derive = { workspace = true } diff --git a/rs/types/types/src/batch.rs b/rs/types/types/src/batch.rs index f3d36f20637..2fa8a162b8d 100644 --- a/rs/types/types/src/batch.rs +++ b/rs/types/types/src/batch.rs @@ -33,7 +33,7 @@ use ic_base_types::{NodeId, NumBytes}; use ic_btc_replica_types::BitcoinAdapterResponse; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::{proxy::ProxyDecodeError, types::v1 as pb}; use prost::{bytes::BufMut, DecodeError, Message}; use serde::{Deserialize, Serialize}; diff --git a/rs/types/types/src/batch/canister_http.rs b/rs/types/types/src/batch/canister_http.rs index 88b3c10f87f..c9938713547 100644 --- a/rs/types/types/src/batch/canister_http.rs +++ b/rs/types/types/src/batch/canister_http.rs @@ -258,14 +258,16 @@ mod tests { timeout: Time::from_nanos_since_unix_epoch(1234), canister_id: crate::CanisterId::from(1), content: CanisterHttpResponseContent::Success( - Encode!(&ic_management_canister_types::CanisterHttpResponsePayload { - status: 200, - headers: vec![ic_management_canister_types::HttpHeader { - name: "test_header1".to_string(), - value: "value1".to_string() - }], - body: b"Test data in body".to_vec(), - }) + Encode!( + &ic_management_canister_types_private::CanisterHttpResponsePayload { + status: 200, + headers: vec![ic_management_canister_types_private::HttpHeader { + name: "test_header1".to_string(), + value: "value1".to_string() + }], + body: b"Test data in body".to_vec(), + } + ) .unwrap(), ), }, diff --git a/rs/types/types/src/canister_http.rs b/rs/types/types/src/canister_http.rs index 0b2eeb52b63..945d97e7346 100644 --- a/rs/types/types/src/canister_http.rs +++ b/rs/types/types/src/canister_http.rs @@ -52,7 +52,7 @@ use ic_base_types::{NumBytes, PrincipalId}; use ic_error_types::{ErrorCode, RejectCode, UserError}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterHttpRequestArgs, DataSize, HttpHeader, HttpMethod, TransformContext, }; use ic_protobuf::{ diff --git a/rs/types/types/src/canister_log.rs b/rs/types/types/src/canister_log.rs index 480aff7804a..f50bba227ed 100644 --- a/rs/types/types/src/canister_log.rs +++ b/rs/types/types/src/canister_log.rs @@ -1,5 +1,5 @@ use candid::Deserialize; -use ic_management_canister_types::{CanisterLogRecord, DataSize}; +use ic_management_canister_types_private::{CanisterLogRecord, DataSize}; use ic_validate_eq::ValidateEq; use ic_validate_eq_derive::ValidateEq; use serde::Serialize; @@ -179,7 +179,7 @@ impl CanisterLog { #[cfg(test)] mod tests { use super::*; - use ic_management_canister_types::CanisterLogRecord; + use ic_management_canister_types_private::CanisterLogRecord; const TEST_MAX_ALLOWED_SIZE: usize = 4 * 1024; const BIGGER_THAN_LIMIT_MESSAGE: &[u8] = &[b'a'; 2 * TEST_MAX_ALLOWED_SIZE]; diff --git a/rs/types/types/src/consensus/dkg.rs b/rs/types/types/src/consensus/dkg.rs index a0d829bc5d7..d611a09c0cf 100644 --- a/rs/types/types/src/consensus/dkg.rs +++ b/rs/types/types/src/consensus/dkg.rs @@ -634,7 +634,7 @@ impl TryFrom for Payload { mod tests { use super::*; - use ic_management_canister_types::{VetKdCurve, VetKdKeyId}; + use ic_management_canister_types_private::{VetKdCurve, VetKdKeyId}; use strum::EnumCount; use strum::IntoEnumIterator; diff --git a/rs/types/types/src/consensus/idkg.rs b/rs/types/types/src/consensus/idkg.rs index e5908ea7968..7eae551049f 100644 --- a/rs/types/types/src/consensus/idkg.rs +++ b/rs/types/types/src/consensus/idkg.rs @@ -32,7 +32,7 @@ use ic_base_types::{subnet_id_into_protobuf, subnet_id_try_from_protobuf}; use ic_crypto_sha2::Sha256; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::MasterPublicKeyId; +use ic_management_canister_types_private::MasterPublicKeyId; use ic_protobuf::types::v1 as pb_types; use ic_protobuf::{ proxy::{try_from_option_field, ProxyDecodeError}, diff --git a/rs/types/types/src/consensus/idkg/ecdsa.rs b/rs/types/types/src/consensus/idkg/ecdsa.rs index c8598f5243f..6ea345b7d17 100644 --- a/rs/types/types/src/consensus/idkg/ecdsa.rs +++ b/rs/types/types/src/consensus/idkg/ecdsa.rs @@ -9,7 +9,7 @@ use crate::crypto::{ use crate::{Height, Randomness}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::EcdsaKeyId; +use ic_management_canister_types_private::EcdsaKeyId; use ic_protobuf::proxy::{try_from_option_field, ProxyDecodeError}; use ic_protobuf::types::v1 as pb; use serde::{Deserialize, Serialize}; diff --git a/rs/types/types/src/consensus/idkg/schnorr.rs b/rs/types/types/src/consensus/idkg/schnorr.rs index d3e3cbb18a8..eec2cba2198 100644 --- a/rs/types/types/src/consensus/idkg/schnorr.rs +++ b/rs/types/types/src/consensus/idkg/schnorr.rs @@ -6,7 +6,7 @@ use crate::crypto::ExtendedDerivationPath; use crate::{Height, Randomness}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::SchnorrKeyId; +use ic_management_canister_types_private::SchnorrKeyId; use ic_protobuf::proxy::{try_from_option_field, ProxyDecodeError}; use ic_protobuf::types::v1 as pb; use serde::{Deserialize, Serialize}; diff --git a/rs/types/types/src/crypto/threshold_sig/ni_dkg.rs b/rs/types/types/src/crypto/threshold_sig/ni_dkg.rs index 4e38f984305..66bec9aee28 100644 --- a/rs/types/types/src/crypto/threshold_sig/ni_dkg.rs +++ b/rs/types/types/src/crypto/threshold_sig/ni_dkg.rs @@ -9,7 +9,7 @@ use core::fmt; use ic_crypto_internal_types::sign::threshold_sig::ni_dkg::{CspNiDkgDealing, CspNiDkgTranscript}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::{MasterPublicKeyId, VetKdKeyId}; +use ic_management_canister_types_private::{MasterPublicKeyId, VetKdKeyId}; use ic_protobuf::proxy::ProxyDecodeError; use ic_protobuf::types::v1 as pb; use ic_protobuf::types::v1::NiDkgId as NiDkgIdProto; diff --git a/rs/types/types/src/crypto/threshold_sig/ni_dkg/id/tests.rs b/rs/types/types/src/crypto/threshold_sig/ni_dkg/id/tests.rs index 2e6992b1400..929b1f862fc 100644 --- a/rs/types/types/src/crypto/threshold_sig/ni_dkg/id/tests.rs +++ b/rs/types/types/src/crypto/threshold_sig/ni_dkg/id/tests.rs @@ -1,5 +1,5 @@ use assert_matches::assert_matches; -use ic_management_canister_types::{EcdsaCurve, EcdsaKeyId, VetKdCurve}; +use ic_management_canister_types_private::{EcdsaCurve, EcdsaKeyId, VetKdCurve}; use super::*; diff --git a/rs/types/types/src/crypto/threshold_sig/ni_dkg/tests.rs b/rs/types/types/src/crypto/threshold_sig/ni_dkg/tests.rs index f25b6762da3..8b4a96fc7de 100644 --- a/rs/types/types/src/crypto/threshold_sig/ni_dkg/tests.rs +++ b/rs/types/types/src/crypto/threshold_sig/ni_dkg/tests.rs @@ -7,7 +7,7 @@ use ic_crypto_internal_types::sign::threshold_sig::ni_dkg::ni_dkg_groth20_bls12_ Dealing, EncryptedShares, PublicCoefficientsBytes, ZKProofDec, ZKProofShare, NUM_CHUNKS, NUM_ZK_REPETITIONS, }; -use ic_management_canister_types::VetKdCurve; +use ic_management_canister_types_private::VetKdCurve; use std::str::FromStr; #[test] diff --git a/rs/types/types/src/exhaustive.rs b/rs/types/types/src/exhaustive.rs index 7fc8a99538f..f1e8544a820 100644 --- a/rs/types/types/src/exhaustive.rs +++ b/rs/types/types/src/exhaustive.rs @@ -45,7 +45,7 @@ use ic_btc_replica_types::{ use ic_crypto_internal_types::NodeIndex; use ic_error_types::RejectCode; use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ EcdsaCurve, EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, VetKdCurve, VetKdKeyId, }; diff --git a/rs/types/types/src/messages.rs b/rs/types/types/src/messages.rs index 14ccd0cae04..9eff1d8f658 100644 --- a/rs/types/types/src/messages.rs +++ b/rs/types/types/src/messages.rs @@ -23,7 +23,7 @@ pub use blob::Blob; use ic_base_types::{CanisterId, PrincipalId}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::CanisterChangeOrigin; +use ic_management_canister_types_private::CanisterChangeOrigin; use ic_protobuf::proxy::{try_from_option_field, ProxyDecodeError}; use ic_protobuf::state::canister_state_bits::v1 as pb; use ic_protobuf::types::v1 as pb_types; diff --git a/rs/types/types/src/messages/ingress_messages.rs b/rs/types/types/src/messages/ingress_messages.rs index a4c3184e5f8..d4f86d33126 100644 --- a/rs/types/types/src/messages/ingress_messages.rs +++ b/rs/types/types/src/messages/ingress_messages.rs @@ -11,7 +11,7 @@ use crate::{ CanisterId, CountBytes, PrincipalId, SubnetId, Time, UserId, }; use ic_error_types::{ErrorCode, UserError}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInfoRequest, ClearChunkStoreArgs, DeleteCanisterSnapshotArgs, InstallChunkedCodeArgs, InstallCodeArgsV2, ListCanisterSnapshotArgs, LoadCanisterSnapshotArgs, Method, Payload, StoredChunksArgs, TakeCanisterSnapshotArgs, UpdateSettingsArgs, @@ -594,7 +594,7 @@ mod test { }; use crate::{CanisterId, SubnetId, UserId}; use ic_base_types::PrincipalId; - use ic_management_canister_types::IC_00; + use ic_management_canister_types_private::IC_00; use std::convert::From; #[test] diff --git a/rs/types/types/src/messages/inter_canister.rs b/rs/types/types/src/messages/inter_canister.rs index ac565c41a6b..c1fdea09c3a 100644 --- a/rs/types/types/src/messages/inter_canister.rs +++ b/rs/types/types/src/messages/inter_canister.rs @@ -6,7 +6,7 @@ use crate::{ use ic_error_types::{RejectCode, UserError}; #[cfg(test)] use ic_exhaustive_derive::ExhaustiveSet; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInfoRequest, ClearChunkStoreArgs, DeleteCanisterSnapshotArgs, InstallChunkedCodeArgs, InstallCodeArgsV2, ListCanisterSnapshotArgs, LoadCanisterSnapshotArgs, Method, Payload as _, ProvisionalTopUpCanisterArgs, StoredChunksArgs, TakeCanisterSnapshotArgs, diff --git a/rs/types/types/src/messages/query.rs b/rs/types/types/src/messages/query.rs index 4dabdb9eb22..85f36f33cb8 100644 --- a/rs/types/types/src/messages/query.rs +++ b/rs/types/types/src/messages/query.rs @@ -5,7 +5,7 @@ use crate::{ }, CanisterId, PrincipalId, UserId, }; -use ic_management_canister_types::IC_00; +use ic_management_canister_types_private::IC_00; use std::convert::TryFrom; /// Represents the source of a query that is sent to a canister. diff --git a/rs/workload_generator/Cargo.toml b/rs/workload_generator/Cargo.toml index 592b9de6b07..66a7792f15a 100644 --- a/rs/workload_generator/Cargo.toml +++ b/rs/workload_generator/Cargo.toml @@ -20,7 +20,7 @@ ic-canister-client-sender = { path = "../canister_client/sender" } ic-config = { path = "../config" } ic-crypto-sha2 = { path = "../crypto/sha2" } ic-http-endpoints-metrics = { path = "../http_endpoints/metrics" } -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-test-identity = { path = "../test_utilities/identity" } ic-types = { path = "../types/types" } diff --git a/rs/workload_generator/src/canister.rs b/rs/workload_generator/src/canister.rs index 03d2cf70f29..2d4485c2576 100644 --- a/rs/workload_generator/src/canister.rs +++ b/rs/workload_generator/src/canister.rs @@ -1,7 +1,7 @@ //! Module for managing the canisters in test. use ic_canister_client::{Agent, HttpClient, Sender as AgentSender}; -use ic_management_canister_types::{ +use ic_management_canister_types_private::{ CanisterIdRecord, CanisterInstallMode, InstallCodeArgs, Payload, ProvisionalCreateCanisterWithCyclesArgs, IC_00, }; @@ -72,7 +72,7 @@ pub(crate) async fn create_canister( .execute_update( &IC_00, // TODO(RUN-496): replace with a proper effective canister id &IC_00, - ic_management_canister_types::Method::ProvisionalCreateCanisterWithCycles, + ic_management_canister_types_private::Method::ProvisionalCreateCanisterWithCycles, ProvisionalCreateCanisterWithCyclesArgs::new(Some(u64::MAX as u128), None).encode(), vec![], )