chore: Improve test coverage

Author: alin-at-dfinity

rs/replicated_state/src/canister_state.rs

@@ -336,18 +336,6 @@ impl CanisterState {
         )
     }
 
-    pub fn from_parts(
-        execution_state: Option<ExecutionState>,
-        system_state: SystemState,
-        scheduler_state: SchedulerState,
-    ) -> Self {
-        Self {
-            system_state,
-            execution_state,
-            scheduler_state,
-        }
-    }
-
     /// Checks the constraints that a canister should always respect.
     /// These invariants will be verified at the end of each execution round.
     pub fn check_invariants(&self, default_limit: NumBytes) -> Result<(), StateError> {
@@ -596,28 +584,4 @@ pub fn num_bytes_try_from(pages: NumWasmPages) -> Result<NumBytes, String> {
 
 pub mod testing {
     pub use super::queues::testing::{new_canister_queues_for_test, CanisterQueuesTesting};
-    use super::*;
-
-    /// Exposes `CanisterState` internals for use in other crates' unit tests.
-    pub trait CanisterStateTesting {
-        /// Testing only: Publicly exposes `CanisterState::push_input()`.
-        fn push_input(
-            &mut self,
-            msg: RequestOrResponse,
-        ) -> Result<(), (StateError, RequestOrResponse)>;
-    }
-
-    impl CanisterStateTesting for CanisterState {
-        fn push_input(
-            &mut self,
-            msg: RequestOrResponse,
-        ) -> Result<(), (StateError, RequestOrResponse)> {
-            (self as &mut CanisterState).push_input(
-                msg,
-                &mut (i64::MAX / 2),
-                SubnetType::Application,
-                InputQueueType::RemoteSubnet,
-            )
-        }
-    }
 }

rs/replicated_state/src/metadata_state.rs

@@ -275,13 +275,12 @@ impl TryFrom<pb_metadata::NetworkTopology> for NetworkTopology {
                 try_from_option_field(entry.subnet_topology, "NetworkTopology::subnets::V")?,
             );
         }
-        // NetworkTopology.nns_subnet_id will be removed in the following PR
-        // Currently, initialise nns_subnet_id with dummy value in case not found
-        let nns_subnet_id =
-            match try_from_option_field(item.nns_subnet_id, "NetworkTopology::nns_subnet_id") {
-                Ok(subnet_id) => subnet_id_try_from_protobuf(subnet_id)?,
-                Err(_) => SubnetId::new(PrincipalId::new_anonymous()),
-            };
+
+        let nns_subnet_id = subnet_id_try_from_protobuf(try_from_option_field(
+            item.nns_subnet_id,
+            "NetworkTopology::nns_subnet_id",
+        )?)?;
+
         let mut ecdsa_signing_subnets = BTreeMap::new();
         for entry in item.ecdsa_signing_subnets {
             let mut subnet_ids = vec![];

rs/replicated_state/src/metadata_state/tests.rs

@@ -456,6 +456,8 @@ fn roundtrip_encoding() {
     system_metadata.node_public_keys = btreemap! {
         node_test_id(1) => pk_der,
     };
+    system_metadata.bitcoin_get_successors_follow_up_responses =
+        btreemap! { 10.into() => vec![vec![1], vec![2]] };
 
     // Decoding a `SystemMetadata` with no `canister_allocation_ranges` succeeds.
     let mut proto = pb::SystemMetadata::from(&system_metadata);