test(registry): Set up sharded routing table in registry tests (#5810)

Routing table format is being changed from a single value to sharded
values. This PR sets up the sharded routing table in addition to the
single routing table.

---------

Co-authored-by: Max Summe <maximilian.summe@dfinity.org>

Author: jasonz-dfinity

rs/nns/integration_tests/src/registry_get_changes_since.rs

@@ -38,7 +38,7 @@ fn test_allow_opaque_caller() {
     assert_eq!(error, None);
     // The important thing is that deltas is not empty. The exact number of
     // elements is not so important.
-    assert_eq!(deltas.len(), 13);
+    assert_eq!(deltas.len(), 14);
     assert_eq!(version, 1);
 }
 
@@ -70,6 +70,6 @@ fn test_allow_self_authenticating_caller() {
     assert_eq!(error, None);
     // The important thing is that deltas is not empty. The exact number of
     // elements is not so important.
-    assert_eq!(deltas.len(), 13);
+    assert_eq!(deltas.len(), 14);
     assert_eq!(version, 1);
 }

rs/nns/test_utils/src/registry.rs

@@ -286,17 +286,29 @@ pub async fn insert_value<T: Message + Default>(registry: &Canister<'_>, key: &[
     );
 }
 
-pub fn routing_table_mutation(rt: &RoutingTable) -> RegistryMutation {
+/// Returns a list of mutations that set the initial state of the routing table.
+///
+/// Note that it's undefined behavior if they are used to modify an existing
+/// routing table.
+pub fn initial_routing_table_mutations(rt: &RoutingTable) -> Vec<RegistryMutation> {
     use ic_protobuf::registry::routing_table::v1 as pb;
 
     let rt_pb = pb::RoutingTable::from(rt);
     let mut buf = vec![];
     rt_pb.encode(&mut buf).unwrap();
-    RegistryMutation {
-        mutation_type: Type::Upsert as i32,
-        key: make_routing_table_record_key().into_bytes(),
-        value: buf,
-    }
+    vec![
+        // TODO(NNS1-3781): Remove this once routing_table is no longer used by clients.
+        RegistryMutation {
+            mutation_type: Type::Upsert as i32,
+            key: make_routing_table_record_key().into_bytes(),
+            value: buf.clone(),
+        },
+        RegistryMutation {
+            mutation_type: Type::Upsert as i32,
+            key: make_canister_ranges_key(CanisterId::from(0)).into_bytes(),
+            value: buf,
+        },
+    ]
 }
 
 /// Returns a mutation that sets the initial state of the registry to be
@@ -374,7 +386,6 @@ pub fn invariant_compliant_mutation_with_subnet_id(
             make_subnet_record_key(subnet_pid).as_bytes(),
             system_subnet.encode_to_vec(),
         ),
-        routing_table_mutation(&RoutingTable::default()),
         insert(
             make_replica_version_key(replica_version_id).as_bytes(),
             replica_version.encode_to_vec(),
@@ -390,6 +401,9 @@ pub fn invariant_compliant_mutation_with_subnet_id(
         valid_pks,
     ));
     mutations.append(&mut threshold_pk_and_cup_mutations);
+    mutations.append(&mut initial_routing_table_mutations(
+        &RoutingTable::default(),
+    ));
     mutations
 }
 

rs/registry/canister/src/mutations/routing_table.rs

@@ -489,57 +489,6 @@ mod tests {
         // GetSubnetForCanisterError::CanisterIdConversion currently not reachable - CanisterId::try_from() always succeeds
     }
 
-    #[test]
-    fn test_routing_table_saves_as_canister_range_records_on_first_invocation_correctly() {
-        let mut registry = invariant_compliant_registry(0);
-        let system_subnet =
-            PrincipalId::try_from(registry.get_subnet_list_record().subnets.first().unwrap())
-                .unwrap();
-
-        let mut original = RoutingTable::new();
-        original
-            .insert(
-                CanisterIdRange {
-                    start: CanisterId::from(5000),
-                    end: CanisterId::from(6000),
-                },
-                system_subnet.into(),
-            )
-            .unwrap();
-        original
-            .insert(
-                CanisterIdRange {
-                    start: CanisterId::from(6001),
-                    end: CanisterId::from(7000),
-                },
-                system_subnet.into(),
-            )
-            .unwrap();
-
-        let new_routing_table = pb::RoutingTable::from(original.clone());
-        let mutations = vec![upsert(
-            make_routing_table_record_key().as_bytes(),
-            new_routing_table.encode_to_vec(),
-        )];
-        registry.maybe_apply_mutation_internal(mutations);
-
-        let recovered = registry
-            .get_routing_table_from_canister_range_records_or_panic(registry.latest_version());
-
-        assert_eq!(recovered, RoutingTable::new());
-
-        // Now we are in a situation where there is no difference between what's stored under the
-        // `routing_table` key and what's being saved BUT we should still generate canister_ranges_*
-        // records b/c they're empty
-        let mutations = routing_table_into_registry_mutation(&registry, original.clone());
-        registry.maybe_apply_mutation_internal(mutations);
-
-        let recovered = registry
-            .get_routing_table_from_canister_range_records_or_panic(registry.latest_version());
-
-        assert_eq!(recovered, original);
-    }
-
     #[test]
     fn test_routing_table_updates_and_deletes_entries_as_expected() {
         let mut registry = invariant_compliant_registry(0);

rs/registry/canister/tests/modify_canister_migrations.rs

@@ -5,7 +5,9 @@ use ic_nns_test_utils::{
         local_test_on_nns_subnet, set_up_registry_canister, set_up_universal_canister,
         try_call_via_universal_canister,
     },
-    registry::{get_value_or_panic, prepare_registry_with_two_node_sets, routing_table_mutation},
+    registry::{
+        get_value_or_panic, initial_routing_table_mutations, prepare_registry_with_two_node_sets,
+    },
 };
 use ic_protobuf::registry::routing_table::v1 as pb;
 use ic_registry_routing_table::{CanisterIdRange, CanisterMigrations, RoutingTable};
@@ -55,7 +57,7 @@ fn test_modify_canister_migrations() {
                     .expect("failed to update the routing table");
 
                 RegistryAtomicMutateRequest {
-                    mutations: vec![routing_table_mutation(&rt)],
+                    mutations: initial_routing_table_mutations(&rt),
                     preconditions: vec![],
                 }
             };

rs/registry/canister/tests/reroute_canister_ranges.rs

@@ -4,7 +4,7 @@ use ic_nns_test_utils::{
         local_test_on_nns_subnet, set_up_registry_canister, set_up_universal_canister,
         try_call_via_universal_canister,
     },
-    registry::{prepare_registry_with_two_node_sets, routing_table_mutation},
+    registry::{initial_routing_table_mutations, prepare_registry_with_two_node_sets},
 };
 use ic_registry_routing_table::{CanisterIdRange, RoutingTable};
 use ic_registry_transport::pb::v1::RegistryAtomicMutateRequest;
@@ -45,7 +45,7 @@ fn test_reroute_canister_ranges() {
                     .expect("failed to update the routing table");
 
                 RegistryAtomicMutateRequest {
-                    mutations: vec![routing_table_mutation(&rt)],
+                    mutations: initial_routing_table_mutations(&rt),
                     preconditions: vec![],
                 }
             };

rs/registry/canister/tests/roll_back_canister_migration.rs

@@ -4,7 +4,7 @@ use ic_nns_test_utils::{
         local_test_on_nns_subnet, set_up_registry_canister, set_up_universal_canister,
         try_call_via_universal_canister,
     },
-    registry::{prepare_registry_with_two_node_sets, routing_table_mutation},
+    registry::{initial_routing_table_mutations, prepare_registry_with_two_node_sets},
 };
 use ic_registry_routing_table::{CanisterIdRange, RoutingTable};
 use ic_registry_transport::pb::v1::RegistryAtomicMutateRequest;
@@ -45,7 +45,7 @@ fn test_roll_back_canister_migration() {
                     .expect("failed to update the routing table");
 
                 RegistryAtomicMutateRequest {
-                    mutations: vec![routing_table_mutation(&rt)],
+                    mutations: initial_routing_table_mutations(&rt),
                     preconditions: vec![],
                 }
             };