From fc4e6f6db89b3c308cc542a216fde317b3a95a0d Mon Sep 17 00:00:00 2001 From: ilbertt Date: Tue, 17 Jun 2025 22:38:10 +0200 Subject: [PATCH] chore: update deps --- Cargo.lock | 347 ++++++++++++++++----- Cargo.toml | 10 +- rustfmt.toml | 2 +- tests/src/test_canister_rs/Cargo.toml | 4 +- tests/src/test_canister_rs/src/canister.rs | 18 +- 5 files changed, 279 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cde5d94..65141988 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -59,6 +59,12 @@ version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "arrayvec" version = "0.5.2" @@ -75,13 +81,24 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-lock" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -94,7 +111,16 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "async-watch" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a078faf4e27c0c6cc0efb20e5da59dcccc04968ebf2801d8e0b2195124cdcdb2" +dependencies = [ + "event-listener 2.5.3", ] [[package]] @@ -289,7 +315,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.85", + "syn 2.0.87", "which", ] @@ -411,14 +437,14 @@ dependencies = [ "hashbrown 0.14.5", "instant", "once_cell", - "thiserror", + "thiserror 1.0.65", ] [[package]] name = "candid" -version = "0.10.10" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c30ee7f886f296b6422c0ff017e89dd4f831521dfdcc76f3f71aae1ce817222" +checksum = "f9d90f5a1426d0489283a0bd5da9ed406fb3e69597e0d823dcb88a1965bb58d2" dependencies = [ "anyhow", "binread", @@ -434,7 +460,7 @@ dependencies = [ "serde", "serde_bytes", "stacker", - "thiserror", + "thiserror 1.0.65", ] [[package]] @@ -446,7 +472,7 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -513,7 +539,7 @@ dependencies = [ "ansi_term", "atty", "bitflags 1.3.2", - "strsim", + "strsim 0.8.0", "textwrap", "unicode-width", "vec_map", @@ -666,6 +692,41 @@ dependencies = [ "zeroize", ] +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.87", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.87", +] + [[package]] name = "dashmap" version = "6.1.0" @@ -767,7 +828,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.65", "zeroize", ] @@ -828,6 +889,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "event-listener" version = "5.3.1" @@ -845,7 +912,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener", + "event-listener 5.3.1", "pin-project-lite", ] @@ -991,7 +1058,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -1031,7 +1098,7 @@ dependencies = [ "canister-utils", "dashmap", "ic-agent", - "metrics", + "metrics 0.24.2", "tokio", "tracing", ] @@ -1165,6 +1232,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1405,12 +1478,15 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.39.1" +version = "0.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158138fcb769fe6288e63d5db221c904e472cfb7d376aba13a38c060f2984e63" +checksum = "820d65a05258f2fdff326c65561b1ddc7ec54e5d43a4b1203b25eb83075c83d4" dependencies = [ + "arc-swap", + "async-channel", "async-lock", "async-trait", + "async-watch", "backoff", "cached", "candid", @@ -1441,7 +1517,8 @@ dependencies = [ "serde_repr", "sha2 0.10.8", "simple_asn1", - "thiserror", + "stop-token", + "thiserror 2.0.12", "time 0.3.36", "tokio", "tower-service", @@ -1450,37 +1527,51 @@ dependencies = [ [[package]] name = "ic-cdk" -version = "0.16.0" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8ecacd682fa05a985253592963306cb9799622d7b1cce4b1edb89c6ec85be1" +checksum = "6d5997f241642ba53f7249618f8a05cfa1cd77f67ac4dbbab66f2611769d447b" dependencies = [ "candid", + "ic-cdk-executor", "ic-cdk-macros", + "ic-error-types", + "ic-management-canister-types", "ic0", "serde", "serde_bytes", + "slotmap", + "thiserror 2.0.12", +] + +[[package]] +name = "ic-cdk-executor" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3586c51b6b3809b69c79e97de172b4649f56094e8c8bc1ce2e41a29f20ed5f" +dependencies = [ + "slotmap", ] [[package]] name = "ic-cdk-macros" -version = "0.16.0" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4d857135deef20cc7ea8f3869a30cd9cfeb1392b3a81043790b2cd82adc3e0" +checksum = "f1c52b98db56a0f885915f250744d0d74da9e6d008ede6f5dde8dcde80bbcf56" dependencies = [ "candid", + "darling", "proc-macro2", "quote", - "serde", - "serde_tokenstream", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] name = "ic-cdk-timers" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7c528bbb3d4d934b43a364855995d318649217c7510f40f92ad52eba3ff7be" +checksum = "06eca8e4f5077b92b192ff74a4d6066f3651eb2cc60c00c5d390d022332827a3" dependencies = [ + "candid", "futures 0.3.31", "ic-cdk", "ic0", @@ -1491,9 +1582,9 @@ dependencies = [ [[package]] name = "ic-certification" -version = "2.6.0" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64ee3d8b6e81b51f245716d3e0badb63c283c00f3c9fb5d5219afc30b5bf821" +checksum = "ffb40d73f9f8273dc6569a68859003bbd467c9dc6d53c6fd7d174742f857209d" dependencies = [ "hex", "serde", @@ -1501,6 +1592,17 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "ic-error-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbeeb3d91aa179d6496d7293becdacedfc413c825cac79fd54ea1906f003ee55" +dependencies = [ + "serde", + "strum", + "strum_macros", +] + [[package]] name = "ic-identity" version = "0.1.0" @@ -1509,11 +1611,22 @@ dependencies = [ "ring", ] +[[package]] +name = "ic-management-canister-types" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98554c2d8a30c00b6bfda18062fdcef21215cad07a52d8b8b1eb3130e51bfe71" +dependencies = [ + "candid", + "serde", + "serde_bytes", +] + [[package]] name = "ic-transport-types" -version = "0.39.1" +version = "0.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8789a5c176bb1b925fa58ca97c651a3995d504e76101e93d2a17f558bdcf66" +checksum = "979ee7bee5a67150a4c090fb012c93c294a528b4a867bad9a15cc6d01cb4227f" dependencies = [ "candid", "hex", @@ -1524,7 +1637,7 @@ dependencies = [ "serde_cbor", "serde_repr", "sha2 0.10.8", - "thiserror", + "thiserror 2.0.12", ] [[package]] @@ -1543,9 +1656,9 @@ dependencies = [ [[package]] name = "ic-websocket-cdk" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51382714c27fd20a79336694b34309ba23999c5696696e865a3526cc219d8e95" +checksum = "9c15f4056dfae98da0fa7503b40be3a4925ad60206747ff6b37ebfb0d9dbd0ea" dependencies = [ "base64 0.22.1", "candid", @@ -1560,9 +1673,9 @@ dependencies = [ [[package]] name = "ic0" -version = "0.23.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" +checksum = "39a4ced1c92f952a12e554742ffa7d21752a02450930c3b76bea78a2f1b7ab16" [[package]] name = "ic_bls12_381" @@ -1588,7 +1701,7 @@ dependencies = [ "data-encoding", "serde", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.65", ] [[package]] @@ -1603,7 +1716,7 @@ dependencies = [ "ic-agent", "ic-identity", "lazy_static", - "metrics", + "metrics 0.24.2", "metrics-exporter-prometheus", "metrics-util", "mockito", @@ -1627,6 +1740,12 @@ dependencies = [ "websocket", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.1.5" @@ -1784,9 +1903,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libloading" @@ -1881,6 +2000,16 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "metrics" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5" +dependencies = [ + "ahash", + "portable-atomic", +] + [[package]] name = "metrics-exporter-prometheus" version = "0.15.3" @@ -1894,10 +2023,10 @@ dependencies = [ "hyper-util", "indexmap 2.6.0", "ipnet", - "metrics", + "metrics 0.23.0", "metrics-util", "quanta", - "thiserror", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -1913,7 +2042,7 @@ dependencies = [ "crossbeam-utils 0.8.20", "hashbrown 0.14.5", "indexmap 2.6.0", - "metrics", + "metrics 0.23.0", "num_cpus", "ordered-float", "quanta", @@ -2176,7 +2305,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2209,7 +2338,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.65", "urlencoding", ] @@ -2227,7 +2356,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", - "thiserror", + "thiserror 1.0.65", "tokio", "tonic", ] @@ -2270,7 +2399,7 @@ dependencies = [ "ordered-float", "percent-encoding 2.3.1", "rand 0.8.5", - "thiserror", + "thiserror 1.0.65", "tokio", "tokio-stream", ] @@ -2420,7 +2549,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2490,7 +2619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -2595,7 +2724,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "socket2", - "thiserror", + "thiserror 1.0.65", "tokio", "tracing", ] @@ -2612,7 +2741,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "slab", - "thiserror", + "thiserror 1.0.65", "tinyvec", "tracing", ] @@ -3134,9 +3263,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -3162,13 +3291,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3191,19 +3320,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", -] - -[[package]] -name = "serde_tokenstream" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3313,7 +3430,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.65", "time 0.3.36", ] @@ -3395,12 +3512,30 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "stop-token" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" +dependencies = [ + "async-channel", + "cfg-if 1.0.0", + "futures-core", + "pin-project-lite", +] + [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "structopt" version = "0.3.26" @@ -3418,13 +3553,35 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.87", +] + [[package]] name = "subtle" version = "2.6.1" @@ -3450,9 +3607,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.85" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3533,7 +3690,16 @@ version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.65", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -3544,7 +3710,18 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -3616,9 +3793,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.0" +version = "1.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" dependencies = [ "backtrace", "bytes 1.8.0", @@ -3676,13 +3853,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3874,7 +4051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.65", "time 0.3.36", "tracing-subscriber", ] @@ -3887,7 +4064,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] @@ -3986,7 +4163,7 @@ dependencies = [ "log 0.4.22", "rand 0.8.5", "sha1", - "thiserror", + "thiserror 1.0.65", "utf-8", ] @@ -4163,7 +4340,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -4197,7 +4374,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4543,7 +4720,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.85", + "syn 2.0.87", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a08c3b13..7d1b065c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,24 +12,24 @@ default-members = ["src/ic-websocket-gateway"] resolver = "2" [workspace.package] -edition = "2021" -rust-version = "1.79" +edition = "2024" +rust-version = "1.85" repository = "https://github.com/omnia-network/ic-websocket-gateway" description = "IC Websocket Gateway workspace" license = "MIT" [workspace.dependencies] candid = "0.10" -ic-cdk = "0.16" +ic-cdk = "0.18" ic-agent = "0.39" serde = "1.0" serde_bytes = "0.11" reqwest = "0.12" -tokio = { version = "1.38", features = ["full"] } +tokio = { version = "1.45", features = ["full"] } tracing = "0.1" -metrics = "0.23" +metrics = "0.24" canister-utils = { path = "src/canister-utils" } ic-identity = { path = "src/ic-identity" } diff --git a/rustfmt.toml b/rustfmt.toml index ee3fd2a5..ac023dc4 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,3 @@ max_width = 100 match_block_trailing_comma = true -edition = "2021" \ No newline at end of file +edition = "2024" diff --git a/tests/src/test_canister_rs/Cargo.toml b/tests/src/test_canister_rs/Cargo.toml index af1a5659..bbe51a5a 100644 --- a/tests/src/test_canister_rs/Cargo.toml +++ b/tests/src/test_canister_rs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "test_canister_rs" version = "0.1.0" -edition = "2021" +edition.workspace = true [lib] crate-type = ["cdylib"] @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [dependencies] candid = { workspace = true } ic-cdk = { workspace = true } -ic-websocket-cdk = "0.4.1" +ic-websocket-cdk = "0.4.2" serde = { workspace = true } diff --git a/tests/src/test_canister_rs/src/canister.rs b/tests/src/test_canister_rs/src/canister.rs index 961e40fc..a1633aae 100644 --- a/tests/src/test_canister_rs/src/canister.rs +++ b/tests/src/test_canister_rs/src/canister.rs @@ -1,5 +1,5 @@ use candid::{decode_one, encode_one, CandidType}; -use ic_cdk::{api::time, print}; +use ic_cdk::{api::time, println}; use ic_websocket_cdk::{ send, ClientPrincipal, OnCloseCallbackArgs, OnMessageCallbackArgs, OnOpenCallbackArgs, }; @@ -25,10 +25,10 @@ pub fn on_open(args: OnOpenCallbackArgs) { CLIENTS_CONNECTED.with(|clients_connected| { clients_connected.borrow_mut().insert(args.client_principal); - print(format!( + println!( "[on_open] # clients connected: {}", clients_connected.borrow().len() - )); + ); }); let msg = AppMessage { @@ -44,16 +44,16 @@ pub fn on_message(args: OnMessageCallbackArgs) { text: app_msg.clone().text + " ping", timestamp: time(), }; - print("[on_message] Received message"); + println!("[on_message] Received message"); send_app_message(args.client_principal, new_msg) } fn send_app_message(client_key: ClientPrincipal, msg: AppMessage) { - print("Sending message"); + println!("Sending message"); if let Err(e) = send(client_key, msg.candid_serialize()) { - print(format!("Could not send message: {}", e)); + println!("Could not send message: {}", e); } - print("Message sent"); + println!("Message sent"); } pub fn on_close(args: OnCloseCallbackArgs) { @@ -63,9 +63,9 @@ pub fn on_close(args: OnCloseCallbackArgs) { .borrow_mut() .remove(&args.client_principal); - print(format!( + println!( "[on_close] # clients connected: {}", clients_connected.borrow().len() - )); + ); }); }