chore: Split the user ingress artifacts and the artifacts coming from…

… P2P (#3419) The PR improves the API of the abortable broadcast crate. ``` ubuntu@devenv-container:/ic/rs/p2p/artifact_manager$ bazel test :all --runs_per_test=100 INFO: Invocation ID: ae9b1dd3-3e96-4a1a-955b-fa628bf3de14 INFO: Analyzed 2 targets (0 packages loaded, 19 targets configured). INFO: Found 1 target and 1 test target... INFO: Elapsed time: 2.290s, Critical Path: 1.12s INFO: 103 processes: 202 linux-sandbox. INFO: Build completed successfully, 103 total actions //rs/p2p/artifact_manager:artifact_manager_test PASSED in 0.1s Stats over 100 runs: max = 0.1s, min = 0.0s, avg = 0.0s, dev = 0.0s ``` --------- Co-authored-by: IDX GitHub Automation <infra+github-automation@dfinity.org>
dfinity · Jan 15, 2025 · 5cce4f5 · 5cce4f5
1 parent 145aff3
commit 5cce4f5
Show file tree

Hide file tree

Showing 16 changed files with 185 additions and 71 deletions.
diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "befed3db2258ef5e97774c44951feb5c8ca098af84913123d4a8945afeac827c",
+  "checksum": "ee07bd5cde20eb057c9baa703b47a96ece7ed32714378e3b62f6cb2a1bde2d94",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -19466,6 +19466,10 @@
               "id": "tokio-socks 0.5.2",
               "target": "tokio_socks"
             },
+            {
+              "id": "tokio-stream 0.1.17",
+              "target": "tokio_stream"
+            },
             {
               "id": "tokio-test 0.4.4",
               "target": "tokio_test"
@@ -46328,7 +46332,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -46443,7 +46447,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -73314,7 +73318,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -73680,14 +73684,14 @@
       ],
       "license_file": "LICENSE"
     },
-    "tokio-stream 0.1.16": {
+    "tokio-stream 0.1.17": {
       "name": "tokio-stream",
-      "version": "0.1.16",
+      "version": "0.1.17",
       "package_url": "https://github.com/tokio-rs/tokio",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/tokio-stream/0.1.16/download",
-          "sha256": "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+          "url": "https://static.crates.io/crates/tokio-stream/0.1.17/download",
+          "sha256": "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
         }
       },
       "targets": [
@@ -73735,7 +73739,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "0.1.16"
+        "version": "0.1.17"
       },
       "license": "MIT",
       "license_ids": [
@@ -73791,7 +73795,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -74294,7 +74298,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -76524,7 +76528,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -87593,6 +87597,7 @@
     "tokio-rustls 0.26.0",
     "tokio-serde 0.8.0",
     "tokio-socks 0.5.2",
+    "tokio-stream 0.1.17",
     "tokio-test 0.4.4",
     "tokio-util 0.7.13",
     "toml 0.5.11",

diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock
@@ -3262,6 +3262,7 @@ dependencies = [
  "tokio-rustls 0.26.0",
  "tokio-serde",
  "tokio-socks",
+ "tokio-stream",
  "tokio-test",
  "tokio-util",
  "toml",
@@ -11421,9 +11422,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",

diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "16c350a57ca08666035e4f0e31f17c9715860d84ed6755b026870a84de503a09",
+  "checksum": "af5e4debd1243293865e30a9b64a67f317d54d2087da3adf9fd816ffdd8b1262",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -19294,6 +19294,10 @@
               "id": "tokio-socks 0.5.2",
               "target": "tokio_socks"
             },
+            {
+              "id": "tokio-stream 0.1.17",
+              "target": "tokio_stream"
+            },
             {
               "id": "tokio-test 0.4.4",
               "target": "tokio_test"
@@ -46135,7 +46139,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -46250,7 +46254,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -73160,7 +73164,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -73526,14 +73530,14 @@
       ],
       "license_file": "LICENSE"
     },
-    "tokio-stream 0.1.16": {
+    "tokio-stream 0.1.17": {
       "name": "tokio-stream",
-      "version": "0.1.16",
+      "version": "0.1.17",
       "package_url": "https://github.com/tokio-rs/tokio",
       "repository": {
         "Http": {
-          "url": "https://static.crates.io/crates/tokio-stream/0.1.16/download",
-          "sha256": "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+          "url": "https://static.crates.io/crates/tokio-stream/0.1.17/download",
+          "sha256": "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
         }
       },
       "targets": [
@@ -73581,7 +73585,7 @@
           "selects": {}
         },
         "edition": "2021",
-        "version": "0.1.16"
+        "version": "0.1.17"
       },
       "license": "MIT",
       "license_ids": [
@@ -73637,7 +73641,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             }
           ],
@@ -74140,7 +74144,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -76370,7 +76374,7 @@
               "target": "tokio"
             },
             {
-              "id": "tokio-stream 0.1.16",
+              "id": "tokio-stream 0.1.17",
               "target": "tokio_stream"
             },
             {
@@ -87472,6 +87476,7 @@
     "tokio-rustls 0.26.0",
     "tokio-serde 0.8.0",
     "tokio-socks 0.5.2",
+    "tokio-stream 0.1.17",
     "tokio-test 0.4.4",
     "tokio-util 0.7.13",
     "toml 0.5.11",

diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock
@@ -3251,6 +3251,7 @@ dependencies = [
  "tokio-rustls 0.26.0",
  "tokio-serde",
  "tokio-socks",
+ "tokio-stream",
  "tokio-test",
  "tokio-util",
  "toml",
@@ -11417,9 +11418,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -712,6 +712,7 @@ tokio-metrics = "0.4.0"
 tokio-rustls = { version = "0.26.0", default-features = false, features = [
     "ring",
 ] }
+tokio-stream = "0.1.17"
 tokio-test = "0.4.4"
 tokio-util = { version = "0.7.13", features = ["full"] }
 tonic = "0.12.3"

diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
@@ -1296,6 +1296,9 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
                     "ring",
                 ],
             ),
+            "tokio-stream": crate.spec(
+                version = "^0.1.17",
+            ),
             "tokio-serde": crate.spec(
                 version = "^0.8",
                 features = [

diff --git a/rs/p2p/artifact_manager/BUILD.bazel b/rs/p2p/artifact_manager/BUILD.bazel
@@ -7,8 +7,10 @@ DEPENDENCIES = [
     "//rs/interfaces",
     "//rs/monitoring/metrics",
     "//rs/types/types",
+    "@crate_index//:futures",
     "@crate_index//:prometheus",
     "@crate_index//:tokio",
+    "@crate_index//:tokio-stream",
     "@crate_index//:tracing",
 ]
 

diff --git a/rs/p2p/artifact_manager/Cargo.toml b/rs/p2p/artifact_manager/Cargo.toml
@@ -10,8 +10,10 @@ documentation.workspace = true
 ic-interfaces = { path = "../../interfaces" }
 ic-metrics = { path = "../../monitoring/metrics" }
 ic-types = { path = "../../types/types" }
+futures = { workspace = true }
 prometheus = { workspace = true }
 tokio = { workspace = true }
+tokio-stream = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]