Fix build

Author: max-dfinity

rs/nns/constants/src/lib.rs

@@ -147,7 +147,7 @@ pub const SNS_AGGREGATOR_CANISTER_ID: CanisterId =
 ///
 /// As of May 2024, it looks like this is only used by (a whole bunch of) tests, mostly as the
 /// argument to send_whitelist.
-pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 11] = [
+pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 17] = [
     &REGISTRY_CANISTER_ID,
     &GOVERNANCE_CANISTER_ID,
     &LEDGER_CANISTER_ID,
@@ -157,7 +157,13 @@ pub const ALL_NNS_CANISTER_IDS: [&CanisterId; 11] = [
     &GENESIS_TOKEN_CANISTER_ID,
     &IDENTITY_CANISTER_ID,
     &NNS_UI_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_CANISTER_ID,
     &SNS_WASM_CANISTER_ID,
+    &LEDGER_INDEX_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_1_CANISTER_ID,
+    &SUBNET_RENTAL_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_2_CANISTER_ID,
+    &ICP_LEDGER_ARCHIVE_3_CANISTER_ID,
     &NODE_REWARDS_CANISTER_ID,
 ];
 

rs/nns/test_utils/src/itest_helpers.rs

@@ -44,7 +44,9 @@ use prost::Message;
 use registry_canister::init::RegistryCanisterInitPayload;
 use std::{future::Future, path::Path, thread, time::SystemTime};
 
-/// All the NNS canisters that exist at genesis.
+/// All the NNS canisters that are use in tests, but not all canisters
+/// on NNS mainnet (there are 4 ledger archives, for example and a ledger index that aren't tested
+/// using this struct)
 #[derive(Clone)]
 pub struct NnsCanisters<'a> {
     // Canisters here are listed in creation order.
@@ -275,7 +277,7 @@ impl NnsCanisters<'_> {
         }
     }
 
-    pub fn all_canisters(&self) -> [&Canister<'_>; NUM_NNS_CANISTERS] {
+    pub fn all_canisters(&self) -> [&Canister<'_>; 11] {
         [
             &self.registry,
             &self.governance,
@@ -648,7 +650,10 @@ pub async fn install_sns_wasm_canister(
     install_rust_canister(canister, "sns-wasm-canister", &[], Some(encoded)).await;
 }
 
-pub async fn install_node_rewards_canister(canister: &mut Canister<'_>, init_payload: NodeRewardsInitArgs) {
+pub async fn install_node_rewards_canister(
+    canister: &mut Canister<'_>,
+    init_payload: NodeRewardsInitArgs,
+) {
     let encoded = Encode!(&init_payload).unwrap();
     install_rust_canister(canister, "node-rewards-canister", &[], Some(encoded)).await;
 }

rs/node_rewards/canister/src/main.rs

@@ -1,4 +1,6 @@
-use ic_cdk::{init, post_upgrade, pre_upgrade, query, spawn};
+#[cfg(any(test, feature = "test"))]
+use ic_cdk::query;
+use ic_cdk::{init, post_upgrade, pre_upgrade, spawn};
 use ic_nervous_system_canisters::registry::RegistryCanister;
 use ic_node_rewards_canister::canister::NodeRewardsCanister;
 use ic_node_rewards_canister::storage::RegistryStoreStableMemoryBorrower;