refactor: Remove ReplicaVersion::default()

packages/pocket-ic/BUILD.bazel

@@ -147,6 +147,7 @@ rust_test(
         "//rs/registry/helpers",
         "//rs/registry/proto_data_provider",
         "//rs/registry/transport",
+        "//rs/test_utilities/types",
         "//rs/types/base_types",
         "//rs/types/types",
         "//rs/universal_canister/lib",

packages/pocket-ic/Cargo.toml

@@ -83,6 +83,7 @@ ic-registry-client = { path = "../../rs/registry/client" }
 ic-registry-client-helpers = { path = "../../rs/registry/helpers" }
 ic-registry-proto-data-provider = { path = "../../rs/registry/proto_data_provider" }
 ic-registry-transport = { path = "../../rs/registry/transport" }
+ic-test-utilities-types = { path = "../../rs/test_utilities/types" }
 ic-types = { path = "../../rs/types/types" }
 ic-universal-canister = { path = "../../rs/universal_canister/lib" }
 maplit = { workspace = true }

packages/pocket-ic/tests/unix.rs

@@ -15,7 +15,7 @@ use ic_registry_client_helpers::node_operator::NodeOperatorRegistry;
 use ic_registry_client_helpers::subnet::SubnetRegistry;
 use ic_registry_proto_data_provider::ProtoRegistryDataProvider;
 use ic_registry_transport::pb::v1::RegistryGetLatestVersionResponse;
-use ic_types::ReplicaVersion;
+use ic_test_utilities_types::ids::test_replica_version;
 use ic_universal_canister::{UNIVERSAL_CANISTER_WASM, wasm};
 use maplit::btreemap;
 use pocket_ic::common::rest::{
@@ -753,7 +753,7 @@ fn create_subnet_in_registry_canister() {
     for node_id in [node_id_1, node_id_2] {
         let create_subnet_payload = CreateSubnetPayload {
             node_ids: vec![NodeId::new(PrincipalId(node_id))],
-            replica_version_id: ReplicaVersion::default().to_string(),
+            replica_version_id: test_replica_version().to_string(),
             ..Default::default()
         };
         update_candid_as::<_, (Result<NewSubnet, String>,)>(

rs/artifact_pool/benches/load_blocks.rs

@@ -13,7 +13,7 @@ use ic_interfaces::time_source::SysTimeSource;
 use ic_logger::replica_logger::no_op_logger;
 use ic_test_utilities_consensus::{fake::*, make_genesis};
 use ic_test_utilities_types::{
-    ids::{node_test_id, subnet_test_id},
+    ids::{node_test_id, subnet_test_id, test_replica_version},
     messages::SignedIngressBuilder,
 };
 use ic_types::consensus::dkg::{DkgDataPayload, DkgSummary};
@@ -36,6 +36,7 @@ where
         let mut consensus_pool = ConsensusPoolImpl::new(
             node_test_id(0),
             subnet_test_id(0),
+            &test_replica_version(),
             make_genesis(DkgSummary::fake()).into(),
             pool_config,
             ic_metrics::MetricsRegistry::new(),
@@ -158,6 +159,7 @@ fn add_validated_block(criterion: &mut Criterion) {
                         let mut pool = ConsensusPoolImpl::new(
                             node_test_id(0),
                             subnet_test_id(0),
+                            &test_replica_version(),
                             make_genesis(DkgSummary::fake()).into(),
                             pool_config.clone(),
                             ic_metrics::MetricsRegistry::new(),

rs/artifact_pool/src/backup.rs

@@ -632,7 +632,7 @@ impl BackupArtifact {
 mod tests {
     use super::*;
     use ic_test_utilities_consensus::fake::*;
-    use ic_test_utilities_types::ids::node_test_id;
+    use ic_test_utilities_types::ids::{node_test_id, test_replica_version};
     use ic_types::{
         RegistryVersion,
         batch::*,
@@ -643,7 +643,10 @@ mod tests {
 
     #[test]
     fn test_random_tape_conversion() {
-        let artifact = RandomTape::fake(RandomTapeContent::new(Height::from(22)));
+        let artifact = RandomTape::fake(RandomTapeContent::new(
+            Height::from(22),
+            test_replica_version(),
+        ));
         let mut buf = Vec::new();
         pb::RandomTape::from(artifact.clone())
             .encode(&mut buf)
@@ -659,6 +662,7 @@ mod tests {
         let artifact = Finalization::fake(FinalizationContent::new(
             Height::from(22),
             CryptoHashOf::from(CryptoHash(vec![1, 2, 3])),
+            test_replica_version(),
         ));
         let mut buf = Vec::new();
         pb::Finalization::from(artifact.clone())
@@ -675,6 +679,7 @@ mod tests {
         let artifact = Notarization::fake(NotarizationContent::new(
             Height::from(22),
             CryptoHashOf::from(CryptoHash(vec![1, 2, 3])),
+            test_replica_version(),
         ));
         let mut buf = Vec::new();
         pb::Notarization::from(artifact.clone())
@@ -702,6 +707,7 @@ mod tests {
                     certified_height: Height::from(42),
                     time: UNIX_EPOCH,
                 },
+                test_replica_version(),
             ),
             node_test_id(333),
         );

rs/artifact_pool/src/canister_http_pool.rs

@@ -269,7 +269,7 @@ mod tests {
     use ic_test_utilities_consensus::fake::FakeSigner;
     use ic_test_utilities_types::ids::node_test_id;
     use ic_types::{
-        CanisterId, ReplicaVersion,
+        CanisterId,
         artifact::IdentifiableArtifact,
         canister_http::{
             CanisterHttpPaymentReceipt, CanisterHttpResponseContent, CanisterHttpResponseMetadata,
@@ -305,7 +305,7 @@ mod tests {
                     content_hash: CryptoHashOf::from(CryptoHash(vec![1, 2, 3])),
                     content_size: 42,
                     is_reject: false,
-                    replica_version: ReplicaVersion::default(),
+                    replica_version: ic_test_utilities_types::ids::test_replica_version(),
                 },
                 payment_receipt: CanisterHttpPaymentReceipt::default(),
             },
@@ -330,7 +330,7 @@ mod tests {
                     content_hash: ic_types::crypto::crypto_hash(response),
                     content_size: 42,
                     is_reject: false,
-                    replica_version: ReplicaVersion::default(),
+                    replica_version: ic_test_utilities_types::ids::test_replica_version(),
                 },
                 payment_receipt: CanisterHttpPaymentReceipt::default(),
             },