Merge branch 'msum/move_test_neuron_ids_to_common' into 'master'

chore(nns): Move TEST_NEURON_*_ID out of governance crate Detangling dependency trees to improve build and test times. See merge request dfinity-lab/public/ic!20288
dfinity · Jul 6, 2024 · be47f18 · be47f18
2 parents de9b74c + 4b18950
commit be47f18
Show file tree

Hide file tree

Showing 46 changed files with 253 additions and 329 deletions.
diff --git a/rs/nervous_system/common/test_keys/src/lib.rs b/rs/nervous_system/common/test_keys/src/lib.rs
@@ -5,6 +5,10 @@ use lazy_static::lazy_static;
 use rand::SeedableRng;
 use rand_chacha::ChaChaRng;
 
+pub const TEST_NEURON_1_ID: u64 = 449479075714955186;
+pub const TEST_NEURON_2_ID: u64 = 4368585614685248742;
+pub const TEST_NEURON_3_ID: u64 = 4884056990215423907;
+
 lazy_static! {
     // A set of keys/principals to be used in tests.
     // Note that we use multiple rng's because declaring a single one an reusing it causes conflicts

diff --git a/rs/nervous_system/integration_tests/src/pocket_ic_helpers.rs b/rs/nervous_system/integration_tests/src/pocket_ic_helpers.rs
@@ -3,21 +3,18 @@ use canister_test::{CanisterInstallMode, Wasm};
 use ic_base_types::{CanisterId, PrincipalId, SubnetId};
 use ic_ledger_core::Tokens;
 use ic_nervous_system_common::{E8, ONE_DAY_SECONDS};
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_PRINCIPAL;
+use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL};
 use ic_nervous_system_root::change_canister::ChangeCanisterRequest;
 use ic_nns_common::pb::v1::{NeuronId, ProposalId};
 use ic_nns_constants::{
     self, ALL_NNS_CANISTER_IDS, GOVERNANCE_CANISTER_ID, LEDGER_CANISTER_ID, LIFELINE_CANISTER_ID,
     REGISTRY_CANISTER_ID, ROOT_CANISTER_ID, SNS_WASM_CANISTER_ID,
 };
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{
-        manage_neuron, manage_neuron_response, proposal, CreateServiceNervousSystem,
-        ExecuteNnsFunction, GetNeuronsFundAuditInfoRequest, GetNeuronsFundAuditInfoResponse,
-        ListNeurons, ListNeuronsResponse, ManageNeuron, ManageNeuronResponse, NetworkEconomics,
-        NnsFunction, Proposal, ProposalInfo, Topic,
-    },
+use ic_nns_governance::pb::v1::{
+    manage_neuron, manage_neuron_response, proposal, CreateServiceNervousSystem,
+    ExecuteNnsFunction, GetNeuronsFundAuditInfoRequest, GetNeuronsFundAuditInfoResponse,
+    ListNeurons, ListNeuronsResponse, ManageNeuron, ManageNeuronResponse, NetworkEconomics,
+    NnsFunction, Proposal, ProposalInfo, Topic,
 };
 use ic_nns_test_utils::{
     common::{

diff --git a/rs/nns/governance/src/init.rs b/rs/nns/governance/src/init.rs
@@ -19,13 +19,6 @@ use ic_nns_common::types::NeuronId;
 
 // To update or add more, add print statements to `with_test_neurons` to print
 // the generated neuron IDs and copy the printed IDs here.
-pub const TEST_NEURON_1_ID: u64 = 449479075714955186;
-pub const TEST_NEURON_2_ID: u64 = 4368585614685248742;
-pub const TEST_NEURON_3_ID: u64 = 4884056990215423907;
-
-/// The sum of the total ICP staked in test neurons.
-pub const TEST_NEURON_TOTAL_STAKE_DOMS: u64 = 1_110_000_000;
-
 #[allow(dead_code)]
 pub struct GovernanceCanisterInitPayloadBuilder {
     pub proto: Governance,
@@ -101,8 +94,8 @@ impl GovernanceCanisterInitPayloadBuilder {
 
         const TWELVE_MONTHS_SECONDS: u64 = 30 * 12 * 24 * 60 * 60;
         use ic_nervous_system_common_test_keys::{
-            TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_OWNER_PRINCIPAL,
-            TEST_NEURON_3_OWNER_PRINCIPAL,
+            TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_ID,
+            TEST_NEURON_2_OWNER_PRINCIPAL, TEST_NEURON_3_ID, TEST_NEURON_3_OWNER_PRINCIPAL,
         };
 
         let mut neuron1 = {

diff --git a/rs/nns/integration_tests/src/add_canister.rs b/rs/nns/integration_tests/src/add_canister.rs
@@ -5,13 +5,10 @@ use ic_nervous_system_clients::{
     canister_id_record::CanisterIdRecord,
     canister_status::{CanisterStatusResult, CanisterStatusType::Running},
 };
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_KEYPAIR;
+use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR};
 use ic_nervous_system_root::change_canister::AddCanisterRequest;
 use ic_nns_common::types::NeuronId;
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{NnsFunction, ProposalStatus},
-};
+use ic_nns_governance::pb::v1::{NnsFunction, ProposalStatus};
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,
     governance::{get_pending_proposals, submit_external_update_proposal, wait_for_final_state},

diff --git a/rs/nns/integration_tests/src/add_or_remove_data_centers.rs b/rs/nns/integration_tests/src/add_or_remove_data_centers.rs
@@ -1,13 +1,10 @@
 use assert_matches::assert_matches;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_2_OWNER_KEYPAIR,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_2_ID, TEST_NEURON_2_OWNER_KEYPAIR,
 };
 use ic_nns_common::types::{NeuronId, ProposalId};
-use ic_nns_governance::{
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID},
-    pb::v1::{GovernanceError, NnsFunction, ProposalStatus},
-};
+use ic_nns_governance::pb::v1::{GovernanceError, NnsFunction, ProposalStatus};
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,
     governance::{

diff --git a/rs/nns/integration_tests/src/clear_provisional_whitelist.rs b/rs/nns/integration_tests/src/clear_provisional_whitelist.rs
@@ -2,13 +2,10 @@ use dfn_candid::candid;
 use ic_base_types::PrincipalId;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_2_OWNER_KEYPAIR,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_2_ID, TEST_NEURON_2_OWNER_KEYPAIR,
 };
 use ic_nns_common::types::{NeuronId, ProposalId};
-use ic_nns_governance::{
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID},
-    pb::v1::{ManageNeuronResponse, NnsFunction, ProposalStatus, Vote},
-};
+use ic_nns_governance::pb::v1::{ManageNeuronResponse, NnsFunction, ProposalStatus, Vote};
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,
     governance::{get_pending_proposals, submit_external_update_proposal, wait_for_final_state},

diff --git a/rs/nns/integration_tests/src/create_service_nervous_system.rs b/rs/nns/integration_tests/src/create_service_nervous_system.rs
@@ -1,13 +1,13 @@
 use candid::Encode;
 use ic_base_types::{PrincipalId, SubnetId};
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_OWNER_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_ID,
+    TEST_NEURON_2_OWNER_PRINCIPAL,
 };
 use ic_nns_common::pb::v1::{self as nns_common_pb, ProposalId};
 use ic_nns_constants::{GOVERNANCE_CANISTER_ID, ROOT_CANISTER_ID, SNS_WASM_CANISTER_ID};
 use ic_nns_governance::{
     governance::test_data::CREATE_SERVICE_NERVOUS_SYSTEM_WITH_MATCHED_FUNDING,
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID},
     pb::v1::{
         governance_error::ErrorType,
         manage_neuron::{self, RegisterVote},

diff --git a/rs/nns/integration_tests/src/cycles_minting_canister.rs b/rs/nns/integration_tests/src/cycles_minting_canister.rs
@@ -15,17 +15,14 @@ use ic_management_canister_types::{
     CanisterIdRecord, CanisterSettingsArgs, CanisterSettingsArgsBuilder, CanisterStatusResultV2,
 };
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_USER1_KEYPAIR, TEST_USER1_PRINCIPAL, TEST_USER2_PRINCIPAL,
-    TEST_USER3_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_USER1_KEYPAIR, TEST_USER1_PRINCIPAL,
+    TEST_USER2_PRINCIPAL, TEST_USER3_PRINCIPAL,
 };
 use ic_nns_common::types::{NeuronId, ProposalId, UpdateIcpXdrConversionRatePayload};
 use ic_nns_constants::{
     CYCLES_MINTING_CANISTER_ID, GOVERNANCE_CANISTER_ID, LEDGER_CANISTER_INDEX_IN_NNS_SUBNET,
 };
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{NnsFunction, ProposalStatus},
-};
+use ic_nns_governance::pb::v1::{NnsFunction, ProposalStatus};
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,
     governance::{submit_external_update_proposal, wait_for_final_state},

diff --git a/rs/nns/integration_tests/src/cycles_minting_canister_with_exchange_rate_canister.rs b/rs/nns/integration_tests/src/cycles_minting_canister_with_exchange_rate_canister.rs
@@ -1,15 +1,14 @@
 use candid::Encode;
 use canister_test::Wasm;
 use ic_base_types::CanisterId;
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_PRINCIPAL;
+use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL};
 use ic_nns_common::{
     pb::v1::NeuronId,
     types::{UpdateIcpXdrConversionRatePayload, UpdateIcpXdrConversionRatePayloadReason},
 };
 use ic_nns_constants::{EXCHANGE_RATE_CANISTER_ID, EXCHANGE_RATE_CANISTER_INDEX};
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{manage_neuron_response, proposal::Action, ExecuteNnsFunction, NnsFunction, Proposal},
+use ic_nns_governance::pb::v1::{
+    manage_neuron_response, proposal::Action, ExecuteNnsFunction, NnsFunction, Proposal,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/governance_mem_test.rs b/rs/nns/integration_tests/src/governance_mem_test.rs
@@ -4,15 +4,12 @@ use candid::{Decode, Encode};
 use canister_test::Project;
 use ic_base_types::PrincipalId;
 use ic_management_canister_types::{CanisterInstallMode, CanisterSettingsArgsBuilder};
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_PRINCIPAL;
+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::{
     GOVERNANCE_CANISTER_ID, GOVERNANCE_CANISTER_INDEX_IN_NNS_SUBNET, ROOT_CANISTER_ID,
 };
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{ListProposalInfo, ListProposalInfoResponse},
-};
+use ic_nns_governance::pb::v1::{ListProposalInfo, ListProposalInfoResponse};
 use ic_nns_handler_root::init::RootCanisterInitPayload;
 use ic_nns_test_utils::state_test_helpers::{
     create_canister_id_at_position, nns_governance_get_proposal_info,

diff --git a/rs/nns/integration_tests/src/governance_neurons.rs b/rs/nns/integration_tests/src/governance_neurons.rs
@@ -6,20 +6,18 @@ use dfn_protobuf::protobuf;
 use ic_base_types::PrincipalId;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_OWNER_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_ID,
+    TEST_NEURON_2_OWNER_PRINCIPAL,
 };
 use ic_nns_common::pb::v1::NeuronId as NeuronIdProto;
-use ic_nns_governance::{
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID},
-    pb::v1::{
-        governance_error::ErrorType,
-        manage_neuron::{Command, Merge, NeuronIdOrSubaccount, Spawn},
-        manage_neuron_response::{
-            Command as CommandResponse, {self},
-        },
-        neuron::DissolveState,
-        GovernanceError, ListNeurons, ManageNeuron, ManageNeuronResponse, Neuron, NeuronState,
+use ic_nns_governance::pb::v1::{
+    governance_error::ErrorType,
+    manage_neuron::{Command, Merge, NeuronIdOrSubaccount, Spawn},
+    manage_neuron_response::{
+        Command as CommandResponse, {self},
     },
+    neuron::DissolveState,
+    GovernanceError, ListNeurons, ManageNeuron, ManageNeuronResponse, Neuron, NeuronState,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/governance_upgrade.rs b/rs/nns/integration_tests/src/governance_upgrade.rs
@@ -12,14 +12,14 @@ use ic_management_canister_types::{
     CanisterIdRecord, CanisterInstallMode, CanisterSettingsArgsBuilder,
 };
 use ic_nervous_system_clients::canister_status::{CanisterStatusResult, CanisterStatusType};
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_KEYPAIR;
+use ic_nervous_system_common_test_keys::{TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR};
 use ic_nervous_system_root::change_canister::ChangeCanisterRequest;
 use ic_nns_common::pb::v1::NeuronId as NeuronIdProto;
 use ic_nns_constants::{
     GOVERNANCE_CANISTER_ID, GOVERNANCE_CANISTER_INDEX_IN_NNS_SUBNET, ROOT_CANISTER_ID,
 };
 use ic_nns_governance::{
-    init::{GovernanceCanisterInitPayloadBuilder, TEST_NEURON_1_ID},
+    init::GovernanceCanisterInitPayloadBuilder,
     pb::v1::{
         manage_neuron::{configure, Command, Configure, NeuronIdOrSubaccount, RemoveHotKey},
         ManageNeuron, ManageNeuronResponse,

diff --git a/rs/nns/integration_tests/src/known_neurons.rs b/rs/nns/integration_tests/src/known_neurons.rs
@@ -1,16 +1,15 @@
 use dfn_candid::{candid, candid_one};
 use ic_canister_client_sender::Sender;
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_KEYPAIR;
+use ic_nervous_system_common_test_keys::{
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_2_ID, TEST_NEURON_3_ID,
+};
 use ic_nns_common::{pb::v1::NeuronId, types::ProposalId};
-use ic_nns_governance::{
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID, TEST_NEURON_3_ID},
-    pb::v1::{
-        manage_neuron::{Command, NeuronIdOrSubaccount},
-        manage_neuron_response::Command as CommandResponse,
-        proposal::Action,
-        GovernanceError, KnownNeuron, KnownNeuronData, ListKnownNeuronsResponse, ManageNeuron,
-        ManageNeuronResponse, NeuronInfo, Proposal, ProposalStatus,
-    },
+use ic_nns_governance::pb::v1::{
+    manage_neuron::{Command, NeuronIdOrSubaccount},
+    manage_neuron_response::Command as CommandResponse,
+    proposal::Action,
+    GovernanceError, KnownNeuron, KnownNeuronData, ListKnownNeuronsResponse, ManageNeuron,
+    ManageNeuronResponse, NeuronInfo, Proposal, ProposalStatus,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/lifeline.rs b/rs/nns/integration_tests/src/lifeline.rs
@@ -4,12 +4,12 @@ use ic_base_types::CanisterId;
 use ic_management_canister_types::{CanisterInstallMode, CanisterStatusType};
 use ic_nervous_system_clients::canister_id_record::CanisterIdRecord;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_OWNER_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_ID,
+    TEST_NEURON_2_OWNER_PRINCIPAL,
 };
 use ic_nns_common::pb::v1::NeuronId;
 use ic_nns_constants::{LIFELINE_CANISTER_ID, ROOT_CANISTER_ID};
 use ic_nns_governance::{
-    init::{TEST_NEURON_1_ID, TEST_NEURON_2_ID},
     pb::v1::{
         manage_neuron_response::Command as CommandResponse, NnsFunction, ProposalStatus, Vote,
     },

diff --git a/rs/nns/integration_tests/src/node_assignment.rs b/rs/nns/integration_tests/src/node_assignment.rs
@@ -2,19 +2,16 @@ use dfn_candid::candid_one;
 use ic_base_types::NodeId;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL,
 };
 use ic_nns_common::types::{NeuronId, ProposalId};
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{
-        add_or_remove_node_provider::Change,
-        manage_neuron::{Command, NeuronIdOrSubaccount},
-        manage_neuron_response::Command as CommandResponse,
-        proposal::Action,
-        AddOrRemoveNodeProvider, ManageNeuron, ManageNeuronResponse, NnsFunction, NodeProvider,
-        Proposal, ProposalStatus,
-    },
+use ic_nns_governance::pb::v1::{
+    add_or_remove_node_provider::Change,
+    manage_neuron::{Command, NeuronIdOrSubaccount},
+    manage_neuron_response::Command as CommandResponse,
+    proposal::Action,
+    AddOrRemoveNodeProvider, ManageNeuron, ManageNeuronResponse, NnsFunction, NodeProvider,
+    Proposal, ProposalStatus,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/node_operator_handler.rs b/rs/nns/integration_tests/src/node_operator_handler.rs
@@ -3,19 +3,17 @@ use dfn_candid::candid_one;
 use ic_base_types::NodeId;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_NEURON_2_OWNER_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL,
+    TEST_NEURON_2_OWNER_PRINCIPAL,
 };
 use ic_nns_common::types::{NeuronId, ProposalId};
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{
-        add_or_remove_node_provider::Change,
-        manage_neuron::{Command, NeuronIdOrSubaccount},
-        manage_neuron_response::Command as CommandResponse,
-        proposal::Action,
-        AddOrRemoveNodeProvider, ManageNeuron, ManageNeuronResponse, NnsFunction, NodeProvider,
-        Proposal, ProposalStatus,
-    },
+use ic_nns_governance::pb::v1::{
+    add_or_remove_node_provider::Change,
+    manage_neuron::{Command, NeuronIdOrSubaccount},
+    manage_neuron_response::Command as CommandResponse,
+    proposal::Action,
+    AddOrRemoveNodeProvider, ManageNeuron, ManageNeuronResponse, NnsFunction, NodeProvider,
+    Proposal, ProposalStatus,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/node_provider_remuneration.rs b/rs/nns/integration_tests/src/node_provider_remuneration.rs
@@ -4,21 +4,19 @@ use dfn_candid::candid_one;
 use ic_canister_client_sender::Sender;
 use ic_nervous_system_common::{ONE_DAY_SECONDS, ONE_MONTH_SECONDS};
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_1_OWNER_KEYPAIR, TEST_USER1_PRINCIPAL, TEST_USER2_PRINCIPAL, TEST_USER3_PRINCIPAL,
-    TEST_USER4_PRINCIPAL, TEST_USER5_PRINCIPAL, TEST_USER6_PRINCIPAL, TEST_USER7_PRINCIPAL,
+    TEST_NEURON_1_ID, TEST_NEURON_1_OWNER_KEYPAIR, TEST_USER1_PRINCIPAL, TEST_USER2_PRINCIPAL,
+    TEST_USER3_PRINCIPAL, TEST_USER4_PRINCIPAL, TEST_USER5_PRINCIPAL, TEST_USER6_PRINCIPAL,
+    TEST_USER7_PRINCIPAL,
 };
 use ic_nns_common::{pb::v1::NeuronId as ProtoNeuronId, types::UpdateIcpXdrConversionRatePayload};
 use ic_nns_constants::{CYCLES_MINTING_CANISTER_ID, GOVERNANCE_CANISTER_ID, LEDGER_CANISTER_ID};
-use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
-    pb::v1::{
-        add_or_remove_node_provider::Change,
-        manage_neuron_response::Command as CommandResponse,
-        proposal::Action,
-        reward_node_provider::{RewardMode, RewardToAccount},
-        AddOrRemoveNodeProvider, ExecuteNnsFunction, GovernanceError, NetworkEconomics,
-        NnsFunction, NodeProvider, Proposal, RewardNodeProvider, RewardNodeProviders,
-    },
+use ic_nns_governance::pb::v1::{
+    add_or_remove_node_provider::Change,
+    manage_neuron_response::Command as CommandResponse,
+    proposal::Action,
+    reward_node_provider::{RewardMode, RewardToAccount},
+    AddOrRemoveNodeProvider, ExecuteNnsFunction, GovernanceError, NetworkEconomics, NnsFunction,
+    NodeProvider, Proposal, RewardNodeProvider, RewardNodeProviders,
 };
 use ic_nns_test_utils::{
     common::NnsInitPayloadsBuilder,

diff --git a/rs/nns/integration_tests/src/reinstall_and_upgrade.rs b/rs/nns/integration_tests/src/reinstall_and_upgrade.rs
@@ -4,14 +4,11 @@ use dfn_candid::candid_one;
 use ic_canister_client_sender::Sender;
 use ic_management_canister_types::CanisterInstallMode;
 use ic_nervous_system_common_test_keys::{
-    TEST_NEURON_2_OWNER_KEYPAIR, TEST_NEURON_2_OWNER_PRINCIPAL,
+    TEST_NEURON_2_ID, TEST_NEURON_2_OWNER_KEYPAIR, TEST_NEURON_2_OWNER_PRINCIPAL,
 };
 use ic_nns_common::types::{NeuronId, UpdateIcpXdrConversionRatePayload};
 use ic_nns_constants::{GOVERNANCE_CANISTER_ID, LIFELINE_CANISTER_ID};
-use ic_nns_governance::{
-    init::TEST_NEURON_2_ID,
-    pb::v1::{Governance as GovernanceProto, NnsFunction},
-};
+use ic_nns_governance::pb::v1::{Governance as GovernanceProto, NnsFunction};
 use ic_nns_gtc::{
     der_encode,
     pb::v1::{AccountState, Gtc as GtcProto},

diff --git a/rs/nns/integration_tests/src/reset_root.rs b/rs/nns/integration_tests/src/reset_root.rs
@@ -1,10 +1,9 @@
 use dfn_candid::candid_one;
 use ic_crypto_sha2::Sha256;
-use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_PRINCIPAL;
+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::{LIFELINE_CANISTER_ID, ROOT_CANISTER_ID};
 use ic_nns_governance::{
-    init::TEST_NEURON_1_ID,
     pb::v1::{manage_neuron_response::Command, NnsFunction},
     proposals::proposal_submission::create_external_update_proposal_candid,
 };