Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions rs/registry/canister/tests/add_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ic_nervous_system_common_test_keys::{
TEST_NEURON_1_OWNER_KEYPAIR, TEST_NEURON_1_OWNER_PRINCIPAL, TEST_USER1_KEYPAIR,
};
use ic_nns_test_utils::{
itest_helpers::{local_test_on_nns_subnet, set_up_registry_canister},
itest_helpers::{set_up_registry_canister, state_machine_test_on_nns_subnet},
registry::{
get_committee_signing_key, get_dkg_dealing_key, get_node_operator_record, get_node_record,
get_node_signing_key, get_transport_tls_certificate,
Expand All @@ -24,7 +24,7 @@ use std::collections::BTreeMap;

#[test]
fn node_is_created_on_receiving_the_request() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a Node Operator record and make it callable
// by anyone
let registry = set_up_registry_canister(
Expand Down Expand Up @@ -107,7 +107,7 @@ fn node_is_created_on_receiving_the_request() {

#[test]
fn node_is_not_created_with_invalid_type() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a Node Operator record and make it callable
// by anyone
let registry = set_up_registry_canister(
Expand Down Expand Up @@ -155,7 +155,7 @@ fn node_is_not_created_with_invalid_type() {

#[test]
fn node_is_not_created_on_wrong_principal() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a Node Operator record and make it callable
// by anyone
let registry = set_up_registry_canister(
Expand Down Expand Up @@ -197,7 +197,7 @@ fn node_is_not_created_on_wrong_principal() {

#[test]
fn node_is_not_created_when_above_capacity() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a DC record and make it callable by anyone
let registry = set_up_registry_canister(
&runtime,
Expand Down Expand Up @@ -257,7 +257,7 @@ fn node_is_not_created_when_above_capacity() {

#[test]
fn duplicated_nodes_are_removed_on_join() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a DC record.
let registry = set_up_registry_canister(
&runtime,
Expand Down Expand Up @@ -323,7 +323,7 @@ fn duplicated_nodes_are_removed_on_join() {

#[test]
fn join_with_duplicate_is_allowed_when_at_capacity() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// First prepare the registry with a DC record.
let registry = set_up_registry_canister(
&runtime,
Expand Down
10 changes: 5 additions & 5 deletions rs/registry/canister/tests/add_node_operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use ic_nervous_system_common_test_keys::TEST_NEURON_1_OWNER_PRINCIPAL;
use ic_nns_test_utils::registry::{get_value, invariant_compliant_mutation_as_atomic_req};
use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
forward_call_via_universal_canister, set_up_registry_canister, set_up_universal_canister,
state_machine_test_on_nns_subnet,
},
registry::get_value_or_panic,
};
Expand All @@ -23,7 +23,7 @@ use std::collections::BTreeMap;

#[test]
fn test_the_anonymous_user_cannot_add_a_node_operator() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let registry =
set_up_registry_canister(&runtime, RegistryCanisterInitPayload::default()).await;

Expand Down Expand Up @@ -60,7 +60,7 @@ fn test_the_anonymous_user_cannot_add_a_node_operator() {

#[test]
fn test_a_canister_other_than_the_governance_canister_cannot_add_a_node_operator() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// An attacker got a canister that is trying to pass for the proposals
// canister...
let attacker_canister = set_up_universal_canister(&runtime).await;
Expand Down Expand Up @@ -110,7 +110,7 @@ fn test_a_canister_other_than_the_governance_canister_cannot_add_a_node_operator

#[test]
fn test_accepted_proposal_mutates_the_registry() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let registry = set_up_registry_canister(
&runtime,
RegistryCanisterInitPayloadBuilder::new()
Expand Down
12 changes: 6 additions & 6 deletions rs/registry/canister/tests/add_nodes_to_subnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use dfn_candid::candid;

use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
forward_call_via_universal_canister, set_up_registry_canister, set_up_universal_canister,
state_machine_test_on_nns_subnet,
},
registry::{get_value_or_panic, prepare_registry, prepare_registry_with_two_node_sets},
};
Expand All @@ -19,7 +19,7 @@ use assert_matches::assert_matches;

#[test]
fn test_the_anonymous_user_cannot_add_nodes_to_subnet() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let num_nodes_in_subnet = 4_usize;
let (init_mutate, subnet_id, unassigned_node_ids, _) =
Expand Down Expand Up @@ -97,7 +97,7 @@ fn test_the_anonymous_user_cannot_add_nodes_to_subnet() {

#[test]
fn test_a_canister_other_than_the_governance_canister_cannot_add_nodes_to_subnet() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
// An attacker got a canister that is trying to pass for the governance
// canister...
Expand Down Expand Up @@ -161,7 +161,7 @@ fn test_a_canister_other_than_the_governance_canister_cannot_add_nodes_to_subnet

#[test]
fn test_add_nodes_to_subnet_succeeds() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let num_nodes_in_subnet = 4_usize;
let num_unassigned_nodes = 4_usize;
Expand Down Expand Up @@ -255,7 +255,7 @@ fn test_add_nodes_to_subnet_succeeds() {
/// added to the other Subnet
#[test]
fn test_adding_nodes_to_another_subnet_fails() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let num_nodes_in_subnet = 2_usize;
let num_unassigned_nodes = 2_usize;
Expand Down
10 changes: 5 additions & 5 deletions rs/registry/canister/tests/add_or_remove_data_centers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use canister_test::Canister;
use dfn_candid::candid_one;
use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
forward_call_via_universal_canister, set_up_registry_canister, set_up_universal_canister,
state_machine_test_on_nns_subnet,
},
registry::{get_value_or_panic, invariant_compliant_mutation_as_atomic_req},
};
Expand Down Expand Up @@ -40,7 +40,7 @@ async fn get_value_and_unwrap_error(registry: &Canister<'_>, key: &str) -> Error

#[test]
fn test_the_anonymous_user_cannot_add_or_remove_data_centers() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let mut registry = set_up_registry_canister(
&runtime,
RegistryCanisterInitPayloadBuilder::new()
Expand Down Expand Up @@ -96,7 +96,7 @@ fn test_the_anonymous_user_cannot_add_or_remove_data_centers() {

#[test]
fn test_a_canister_other_than_the_governance_canister_cannot_add_or_remove_data_centers() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// An attacker got a canister that is trying to pass for the Governance
// canister...
let attacker_canister = set_up_universal_canister(&runtime).await;
Expand Down Expand Up @@ -148,7 +148,7 @@ fn test_a_canister_other_than_the_governance_canister_cannot_add_or_remove_data_

#[test]
fn test_the_governance_canister_can_add_or_remove_data_centers() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let registry = set_up_registry_canister(
&runtime,
RegistryCanisterInitPayloadBuilder::new()
Expand Down
12 changes: 6 additions & 6 deletions rs/registry/canister/tests/change_subnet_membership.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use dfn_candid::candid;
use ic_base_types::NodeId;
use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
forward_call_via_universal_canister, set_up_registry_canister, set_up_universal_canister,
state_machine_test_on_nns_subnet,
},
registry::{get_value_or_panic, prepare_registry, prepare_registry_with_two_node_sets},
};
Expand All @@ -23,7 +23,7 @@ use registry_canister::{

#[test]
fn test_the_anonymous_user_cannot_change_subnet_membership() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let num_nodes_in_subnet = 4_usize;
let (init_mutate, subnet_id, unassigned_node_ids, _) =
Expand Down Expand Up @@ -105,7 +105,7 @@ fn test_the_anonymous_user_cannot_change_subnet_membership() {

#[test]
fn test_a_canister_other_than_the_governance_canister_cannot_change_subnet_membership() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
// An attacker got a canister that is trying to pass for the governance
// canister...
Expand Down Expand Up @@ -177,7 +177,7 @@ fn test_a_canister_other_than_the_governance_canister_cannot_change_subnet_membe

#[test]
fn test_change_subnet_membership_succeeds() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let num_nodes_in_subnet = 4_usize;
let (init_mutate, subnet_id, unassigned_node_ids, _) =
Expand Down Expand Up @@ -285,7 +285,7 @@ fn test_change_subnet_membership_succeeds() {

#[test]
fn test_change_subnet_membership_duplicate_nodes() {
local_test_on_nns_subnet(|runtime| {
state_machine_test_on_nns_subnet(|runtime| {
async move {
let (init_mutate, subnet_1, subnet_2, _nodes, _) =
prepare_registry_with_two_node_sets(3, 1, true);
Expand Down
10 changes: 5 additions & 5 deletions rs/registry/canister/tests/clear_provisional_whitelist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use ic_base_types::PrincipalId;
use ic_nns_test_utils::registry::invariant_compliant_mutation_as_atomic_req;
use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
forward_call_via_universal_canister, set_up_registry_canister, set_up_universal_canister,
state_machine_test_on_nns_subnet,
},
registry::get_value_or_panic,
};
Expand All @@ -22,7 +22,7 @@ use std::str::FromStr;

#[test]
fn anonymous_user_cannot_clear_the_provisional_whitelist() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let principal_id = PrincipalId::from_str(
"5o66h-77qch-43oup-7aaui-kz5ty-tww4j-t2wmx-e3lym-cbtct-l3gpw-wae",
)
Expand Down Expand Up @@ -71,7 +71,7 @@ fn anonymous_user_cannot_clear_the_provisional_whitelist() {

#[test]
fn a_canister_other_than_the_governance_canister_cannot_change_the_provisional_whitelist() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// An attacker got a canister that is trying to pass for the governance
// canister...
let attacker_canister = set_up_universal_canister(&runtime).await;
Expand Down Expand Up @@ -132,7 +132,7 @@ fn a_canister_other_than_the_governance_canister_cannot_change_the_provisional_w

#[test]
fn clear_provisional_whitelist_succeeds() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let principal_id = PrincipalId::from_str(
"5o66h-77qch-43oup-7aaui-kz5ty-tww4j-t2wmx-e3lym-cbtct-l3gpw-wae",
)
Expand Down
6 changes: 3 additions & 3 deletions rs/registry/canister/tests/create_subnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use ic_nns_test_utils::itest_helpers::try_call_via_universal_canister;
use ic_nns_test_utils::{
itest_helpers::{
forward_call_via_universal_canister, local_test_on_nns_subnet, set_up_registry_canister,
set_up_universal_canister,
set_up_universal_canister, state_machine_test_on_nns_subnet,
},
registry::{INITIAL_MUTATION_ID, invariant_compliant_mutation_as_atomic_req},
};
Expand Down Expand Up @@ -49,7 +49,7 @@ mod common;

#[test]
fn test_the_anonymous_user_cannot_create_a_subnet() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
let (init_mutate, node_ids) = prepare_registry_with_nodes(4, INITIAL_MUTATION_ID);
let mut registry = set_up_registry_canister(
&runtime,
Expand Down Expand Up @@ -97,7 +97,7 @@ fn test_the_anonymous_user_cannot_create_a_subnet() {

#[test]
fn test_a_canister_other_than_the_governance_canister_cannot_create_a_subnet() {
local_test_on_nns_subnet(|runtime| async move {
state_machine_test_on_nns_subnet(|runtime| async move {
// An attacker got a canister that is trying to pass for the governance
// canister...
let attacker_canister = set_up_universal_canister(&runtime).await;
Expand Down
Loading