From f905a92080087d2352a9216b59bc92f27ef3626c Mon Sep 17 00:00:00 2001 From: Igor Novgorodov Date: Tue, 4 Mar 2025 13:36:33 +0100 Subject: [PATCH] ic-bn-lib ver, test log --- Cargo.Bazel.Fuzzing.json.lock | 6 +- Cargo.Bazel.Fuzzing.toml.lock | 69 +++++++++++++++++- Cargo.Bazel.json.lock | 6 +- Cargo.Bazel.toml.lock | 69 +++++++++++++++++- Cargo.lock | 73 ++++++++++++++++++- Cargo.toml | 2 +- bazel/external_crates.bzl | 2 +- .../integration_test_common/src/lib.rs | 2 +- 8 files changed, 208 insertions(+), 21 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 5eb20073926..2988322ebef 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "55d5ed60555b4766266675695a8b1cb2029d4ea2242b1313f01b1937b8da4d11", + "checksum": "00ab8a02d6d7cfca8c5ffb0d97e49f2c24ad97fac36be0e8906942fb078c7cae", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -32288,10 +32288,6 @@ "id": "strum 0.26.3", "target": "strum" }, - { - "id": "sync_wrapper 1.0.1", - "target": "sync_wrapper" - }, { "id": "systemstat 0.2.3", "target": "systemstat" diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index 50be765d415..3cbff09240b 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -3349,7 +3349,7 @@ dependencies = [ "hyper-socks2", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923)", "ic-btc-interface", "ic-canister-log", "ic-canister-sig-creation", @@ -5449,6 +5449,71 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ic-bn-lib" +version = "0.1.0" +source = "git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923#d74a6527fbaf8a2c1a7076983cc84f5c5a727923" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "arc-swap", + "async-trait", + "axum", + "backoff", + "base64 0.22.1", + "bytes", + "chacha20poly1305", + "clap 4.5.20", + "clap_derive 4.5.18", + "cloudflare 0.12.0 (git+https://github.com/cloudflare/cloudflare-rs.git?rev=f14720e42184ee176a97676e85ef2d2d85bc3aae)", + "derive-new", + "fqdn 0.4.5", + "futures", + "futures-util", + "hickory-proto", + "hickory-resolver", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "humantime", + "hyper 1.5.1", + "hyper-util", + "instant-acme", + "moka", + "parse-size", + "prometheus", + "prost 0.13.3", + "prost-types 0.13.3", + "rand 0.8.5", + "rcgen", + "reqwest 0.12.9", + "rustls 0.23.18", + "rustls-acme", + "rustls-pemfile 2.2.0", + "rustls-platform-verifier", + "scopeguard", + "serde", + "serde_json", + "sha1", + "strum 0.26.3", + "strum_macros 0.26.4", + "systemstat", + "thiserror 2.0.11", + "tokio", + "tokio-io-timeout", + "tokio-rustls 0.26.0", + "tokio-util", + "tower 0.5.1", + "tower-service", + "tracing", + "url", + "uuid", + "vrl", + "webpki-root-certs", + "x509-parser", + "zeroize", +] + [[package]] name = "ic-btc-interface" version = "0.2.2" @@ -5682,7 +5747,7 @@ dependencies = [ "humantime", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=1e733b13ad9458a792012e7824d458570569cb6e)", "ic-http-gateway", "ic-transport-types 0.39.3", "itertools 0.13.0", diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index c144a489712..a72fb198590 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "a2f3f509b1c70a917ebbb3ef2b013199b668c3669a751723feaea312b95b27b6", + "checksum": "037dd2d1f57d709d043f8f53e56b4a491cb4191b044e28f17b373dcf7fb3ccf9", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -32143,10 +32143,6 @@ "id": "strum 0.26.3", "target": "strum" }, - { - "id": "sync_wrapper 1.0.1", - "target": "sync_wrapper" - }, { "id": "systemstat 0.2.3", "target": "systemstat" diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 0e6ff422c49..24cca6bc58e 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -3338,7 +3338,7 @@ dependencies = [ "hyper-socks2", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923)", "ic-btc-interface", "ic-canister-log", "ic-canister-sig-creation", @@ -5439,6 +5439,71 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ic-bn-lib" +version = "0.1.0" +source = "git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923#d74a6527fbaf8a2c1a7076983cc84f5c5a727923" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "arc-swap", + "async-trait", + "axum", + "backoff", + "base64 0.22.1", + "bytes", + "chacha20poly1305", + "clap 4.5.20", + "clap_derive 4.5.18", + "cloudflare 0.12.0 (git+https://github.com/cloudflare/cloudflare-rs.git?rev=f14720e42184ee176a97676e85ef2d2d85bc3aae)", + "derive-new", + "fqdn 0.4.5", + "futures", + "futures-util", + "hickory-proto", + "hickory-resolver", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "humantime", + "hyper 1.5.1", + "hyper-util", + "instant-acme", + "moka", + "parse-size", + "prometheus", + "prost 0.13.3", + "prost-types 0.13.3", + "rand 0.8.5", + "rcgen", + "reqwest 0.12.9", + "rustls 0.23.18", + "rustls-acme", + "rustls-pemfile 2.2.0", + "rustls-platform-verifier", + "scopeguard", + "serde", + "serde_json", + "sha1", + "strum 0.26.3", + "strum_macros 0.26.4", + "systemstat", + "thiserror 2.0.11", + "tokio", + "tokio-io-timeout", + "tokio-rustls 0.26.0", + "tokio-util", + "tower 0.5.1", + "tower-service", + "tracing", + "url", + "uuid", + "vrl", + "webpki-root-certs", + "x509-parser", + "zeroize", +] + [[package]] name = "ic-btc-interface" version = "0.2.2" @@ -5672,7 +5737,7 @@ dependencies = [ "humantime", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=1e733b13ad9458a792012e7824d458570569cb6e)", "ic-http-gateway", "ic-transport-types 0.39.3", "itertools 0.13.0", diff --git a/Cargo.lock b/Cargo.lock index 7ea650d76bc..2ef896774c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6071,6 +6071,71 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ic-bn-lib" +version = "0.1.0" +source = "git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923#d74a6527fbaf8a2c1a7076983cc84f5c5a727923" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "arc-swap", + "async-trait", + "axum", + "backoff", + "base64 0.22.1", + "bytes", + "chacha20poly1305", + "clap 4.5.27", + "clap_derive 4.5.24", + "cloudflare 0.12.0 (git+https://github.com/cloudflare/cloudflare-rs.git?rev=f14720e42184ee176a97676e85ef2d2d85bc3aae)", + "derive-new", + "fqdn 0.4.5", + "futures", + "futures-util", + "hickory-proto", + "hickory-resolver", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "humantime", + "hyper 1.6.0", + "hyper-util", + "instant-acme", + "moka", + "parse-size", + "prometheus", + "prost 0.13.4", + "prost-types 0.13.4", + "rand 0.8.5", + "rcgen", + "reqwest 0.12.12", + "rustls 0.23.22", + "rustls-acme", + "rustls-pemfile 2.2.0", + "rustls-platform-verifier", + "scopeguard", + "serde", + "serde_json", + "sha1", + "strum", + "strum_macros", + "systemstat", + "thiserror 2.0.11", + "tokio", + "tokio-io-timeout", + "tokio-rustls 0.26.1", + "tokio-util", + "tower 0.5.2", + "tower-service", + "tracing", + "url", + "uuid", + "vrl", + "webpki-root-certs", + "x509-parser", + "zeroize", +] + [[package]] name = "ic-boundary" version = "0.9.0" @@ -6095,7 +6160,7 @@ dependencies = [ "humantime", "ic-agent", "ic-base-types", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923)", "ic-canister-client", "ic-canister-client-sender", "ic-certification-test-utils", @@ -8841,7 +8906,7 @@ dependencies = [ "humantime", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=1e733b13ad9458a792012e7824d458570569cb6e)", "ic-http-gateway", "ic-transport-types", "itertools 0.13.0", @@ -18087,7 +18152,7 @@ dependencies = [ "hyper 1.6.0", "hyper-util", "ic-agent", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923)", "ic-boundary", "ic-btc-adapter", "ic-btc-interface", @@ -19126,7 +19191,7 @@ version = "0.9.0" dependencies = [ "candid", "humantime", - "ic-bn-lib", + "ic-bn-lib 0.1.0 (git+https://github.com/dfinity/ic-bn-lib?rev=d74a6527fbaf8a2c1a7076983cc84f5c5a727923)", "indoc", "ipnet", "regex", diff --git a/Cargo.toml b/Cargo.toml index bbc9f11f5d5..05a4d78fe68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -564,7 +564,7 @@ hyper-rustls = { version = "0.27.3", default-features = false, features = [ hyper-socks2 = { version = "0.9.1", default-features = false } hyper-util = { version = "0.1.10", features = ["full"] } ic-agent = { version = "0.39.2", features = ["pem", "ring"] } -ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "1e733b13ad9458a792012e7824d458570569cb6e" } +ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "d74a6527fbaf8a2c1a7076983cc84f5c5a727923" } ic-btc-interface = "0.2.2" ic-canister-sig-creation = { git = "https://github.com/dfinity/ic-canister-sig-creation", rev = "7f9e931954637526295269155881207f6c832d6d" } ic-cbor = "3" diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index bd7ac55035d..32bbbc5205b 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -580,7 +580,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable ), "ic-bn-lib": crate.spec( git = "https://github.com/dfinity/ic-bn-lib", - rev = "1e733b13ad9458a792012e7824d458570569cb6e", + rev = "d74a6527fbaf8a2c1a7076983cc84f5c5a727923", ), "ic-btc-interface": crate.spec( version = "^0.2.2", diff --git a/rs/tests/boundary_nodes/integration_test_common/src/lib.rs b/rs/tests/boundary_nodes/integration_test_common/src/lib.rs index 8fa41a71e8a..8228b38f71c 100644 --- a/rs/tests/boundary_nodes/integration_test_common/src/lib.rs +++ b/rs/tests/boundary_nodes/integration_test_common/src/lib.rs @@ -453,7 +453,7 @@ pub fn legacy_asset_canister_test(env: TestEnv) { .to_vec(); if res != hello_world_gzip { - bail!("gzipped hello world response did not match uploaded content") + bail!("gzipped hello world response did not match uploaded content (got {res:?}, expected {hello_world_gzip:?}") } Ok(())