feat(MR): [MR-638] Use both guaranteed and best-effort calls in all XNet tests

Cargo.Bazel.json.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "ac36051bb3fd1c488e3c6fdbdfc95fff29f3760abf119cb1fa2e1d829f1251f8",
+  "checksum": "3f10fe866380ffcf94872915ab98dc48eb140f9fd8fb8be016d15092561ee5f4",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -7373,7 +7373,7 @@
               "target": "hex_lit"
             },
             {
-              "id": "secp256k1 0.29.1",
+              "id": "secp256k1 0.29.0",
               "target": "secp256k1"
             },
             {
@@ -18933,7 +18933,7 @@
               "target": "ic_agent"
             },
             {
-              "id": "ic-identity-hsm 0.39.2",
+              "id": "ic-identity-hsm 0.39.3",
               "target": "ic_identity_hsm"
             },
             {
@@ -33370,14 +33370,14 @@
       ],
       "license_file": "LICENSE"
     },
-    "ic-identity-hsm 0.39.2": {
+    "ic-identity-hsm 0.39.3": {
       "name": "ic-identity-hsm",
-      "version": "0.39.2",
+      "version": "0.39.3",
       "package_url": "https://github.com/dfinity/agent-rs",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/ic-identity-hsm/0.39.2/download",
-          "sha256": "0ebb94d7cb5be09bed47655008f0c2968a3a3253dcf680297f3e8475e4b317c4"
+          "url": "https://static.crates.io/crates/ic-identity-hsm/0.39.3/download",
+          "sha256": "e294ee038eb647cd9cce78b5961533be7f883494e6ea1faece52459bce2d29e9"
         }
       },
       "targets": [
@@ -33429,7 +33429,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "0.39.2"
+        "version": "0.39.3"
       },
       "license": "Apache-2.0",
       "license_ids": [
@@ -38055,7 +38055,7 @@
               "target": "base64"
             },
             {
-              "id": "minreq 2.13.0",
+              "id": "minreq 2.13.2",
               "target": "minreq"
             },
             {
@@ -44133,14 +44133,14 @@
       ],
       "license_file": "LICENSE"
     },
-    "minreq 2.13.0": {
+    "minreq 2.13.2": {
       "name": "minreq",
-      "version": "2.13.0",
+      "version": "2.13.2",
       "package_url": "https://github.com/neonmoe/minreq",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/minreq/2.13.0/download",
-          "sha256": "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
+          "url": "https://static.crates.io/crates/minreq/2.13.2/download",
+          "sha256": "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
         }
       },
       "targets": [
@@ -44189,7 +44189,7 @@
               "target": "log"
             },
             {
-              "id": "minreq 2.13.0",
+              "id": "minreq 2.13.2",
               "target": "build_script_build"
             },
             {
@@ -44204,7 +44204,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "2.13.0"
+        "version": "2.13.2"
       },
       "build_script_attrs": {
         "compile_data_glob": [
@@ -67049,14 +67049,14 @@
       ],
       "license_file": "LICENSE"
     },
-    "secp256k1 0.29.1": {
+    "secp256k1 0.29.0": {
       "name": "secp256k1",
-      "version": "0.29.1",
+      "version": "0.29.0",
       "package_url": "https://github.com/rust-bitcoin/rust-secp256k1/",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/secp256k1/0.29.1/download",
-          "sha256": "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+          "url": "https://static.crates.io/crates/secp256k1/0.29.0/download",
+          "sha256": "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
         }
       },
       "targets": [
@@ -67113,7 +67113,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "0.29.1"
+        "version": "0.29.0"
       },
       "license": "CC0-1.0",
       "license_ids": [

Cargo.Bazel.toml.lock

@@ -1279,7 +1279,7 @@ dependencies = [
  "bitcoin_hashes 0.14.0",
  "hex-conservative",
  "hex_lit",
- "secp256k1 0.29.1",
+ "secp256k1 0.29.0",
  "serde",
 ]
 
@@ -5613,9 +5613,9 @@ dependencies = [
 
 [[package]]
 name = "ic-identity-hsm"
-version = "0.39.2"
+version = "0.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebb94d7cb5be09bed47655008f0c2968a3a3253dcf680297f3e8475e4b317c4"
+checksum = "e294ee038eb647cd9cce78b5961533be7f883494e6ea1faece52459bce2d29e9"
 dependencies = [
  "hex",
  "ic-agent",
@@ -7315,9 +7315,9 @@ dependencies = [
 
 [[package]]
 name = "minreq"
-version = "2.13.0"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
+checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
 dependencies = [
  "log",
  "serde",
@@ -10520,9 +10520,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.29.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
 dependencies = [
  "bitcoin_hashes 0.14.0",
  "rand 0.8.5",

rs/messaging/tests/queue_tests.rs

@@ -15,8 +15,8 @@ use ic_types::{
     Cycles,
 };
 use maplit::btreemap;
-use std::collections::BTreeSet;
 use std::sync::Arc;
+use std::{collections::BTreeSet, vec};
 use xnet_test::{Metrics, StartArgs};
 
 const MAX_TICKS: u64 = 100;
@@ -33,6 +33,7 @@ struct SubnetPairProxy {
     pub local_canister_id: CanisterId,
     pub remote_env: Arc<StateMachine>,
     pub remote_canister_id: CanisterId,
+    call_timeouts_seconds: Vec<Option<u32>>,
 }
 
 impl SubnetPairProxy {
@@ -73,9 +74,17 @@ impl SubnetPairProxy {
             local_canister_id,
             remote_env: Arc::from(remote_env),
             remote_canister_id,
+            // Default to a mix of guaranteed response and best-effort calls.
+            call_timeouts_seconds: vec![None, Some(u32::MAX)],
         }
     }
 
+    /// Sets the desired call timeouts.
+    fn with_call_timeouts(mut self, call_timeouts_seconds: &[Option<u32>]) -> Self {
+        self.call_timeouts_seconds = call_timeouts_seconds.to_vec();
+        self
+    }
+
     /// Generates a routing table with canister ranges for 3 subnets.
     fn make_routing_table() -> RoutingTable {
         let mut routing_table = RoutingTable::new();
@@ -102,7 +111,9 @@ impl SubnetPairProxy {
         Encode!(&StartArgs {
             network_topology,
             canister_to_subnet_rate,
-            payload_size_bytes,
+            request_payload_size_bytes: payload_size_bytes,
+            call_timeouts_seconds: self.call_timeouts_seconds.clone(),
+            response_payload_size_bytes: payload_size_bytes,
         })
     }
 
@@ -261,6 +272,7 @@ impl SubnetPairProxy {
             local_canister_id: self.local_canister_id,
             remote_env: Arc::new(destination_env),
             remote_canister_id: self.remote_canister_id,
+            call_timeouts_seconds: self.call_timeouts_seconds.clone(),
         })
     }
 }
@@ -418,7 +430,8 @@ fn test_timeout_removes_requests_from_output_queues() {
 /// an empty output queue.
 #[test]
 fn test_response_in_output_queue_causes_backpressure() {
-    let subnets = SubnetPairProxy::with_new_subnets();
+    // Guaranteed response calls only.
+    let subnets = SubnetPairProxy::with_new_subnets().with_call_timeouts(&[None]);
 
     let canister_to_subnet_rate = 10;
     let payload_size_bytes = 1024 * 1024;

rs/rust_canisters/xnet_test/BUILD.bazel

@@ -7,7 +7,7 @@ DEPENDENCIES = [
     # Keep sorted.
     "@crate_index//:candid",
     "@crate_index//:futures",
-    "@crate_index//:ic-cdk",
+    "@crate_index//:ic_cdk_next",
     "@crate_index//:rand",
     "@crate_index//:rand_pcg",
     "@crate_index//:serde",
@@ -16,7 +16,7 @@ DEPENDENCIES = [
 
 MACRO_DEPENDENCIES = [
     # Keep sorted.
-    "@crate_index//:ic-cdk-macros",
+    "@crate_index//:ic_cdk_macros_next",
 ]
 
 rust_library(

rs/rust_canisters/xnet_test/Cargo.toml

@@ -13,8 +13,8 @@ path = "src/main.rs"
 [dependencies]
 candid = { workspace = true }
 futures = { workspace = true }
-ic-cdk = { workspace = true }
-ic-cdk-macros = { workspace = true }
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs", rev = "4e287ce51636b0e70768c193da38d2fc5324ea15" }
+ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs", rev = "4e287ce51636b0e70768c193da38d2fc5324ea15" }
 rand = { workspace = true }
 rand_pcg = "0.3"
 serde = { workspace = true }

rs/rust_canisters/xnet_test/src/lib.rs

@@ -14,7 +14,9 @@ pub type NetworkTopology = Vec<Vec<CanisterId>>;
 pub struct StartArgs {
     pub network_topology: NetworkTopology,
     pub canister_to_subnet_rate: u64,
-    pub payload_size_bytes: u64,
+    pub request_payload_size_bytes: u64,
+    pub call_timeouts_seconds: Vec<Option<u32>>,
+    pub response_payload_size_bytes: u64,
 }
 
 /// Metrics observed by this canister.