From c71602e88c8a20c6ecc7c18fe1f5b5cf570d3b11 Mon Sep 17 00:00:00 2001 From: Elena Frank Date: Tue, 4 Oct 2022 13:42:33 +0200 Subject: [PATCH] ping/rust: Update rust-sdk patch, remove unused dependencies (#42) * ping/rust: remove unused dependencies * README: fix import instructions * ping/rust: set channel capacity to # of instances * ping/rust: use testground-v0.4.0 from crates.io --- README.md | 2 +- ping/rust/Cargo.lock | 507 +++++++++++++++++++++--------------------- ping/rust/Cargo.toml | 6 +- ping/rust/src/main.rs | 9 +- 4 files changed, 261 insertions(+), 263 deletions(-) diff --git a/README.md b/README.md index 99627c4..4327656 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ When a new version of libp2p is released, we want to make it permanent in the `p - update the `go-libp2p` version, go version, and update the code if needed. - then `go get -tags v$B && go mod tidy` 3. Run the test on your machine - - Do once, from the test-plans root: import the test-plans with `testground plan import ./ --name libp2p` + - Do once, from the test-plans root: import the test-plans with `testground plan import --from ./ --name libp2p` - Run the test with `testground run composition -f ping/_compositions/go-cross-versions.toml --wait` ## How to add a new version to ping/rust diff --git a/ping/rust/Cargo.lock b/ping/rust/Cargo.lock index 6762018..4d3eaf4 100644 --- a/ping/rust/Cargo.lock +++ b/ping/rust/Cargo.lock @@ -45,18 +45,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.62" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arrayref" @@ -107,9 +107,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" +checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" dependencies = [ "async-channel", "async-executor", @@ -117,16 +117,15 @@ dependencies = [ "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", "tokio", ] [[package]] name = "async-io" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab006897723d9352f63e2b13047177c3982d8d79709d713ce7747a8f19fd1b0" +checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" dependencies = [ "autocfg", "concurrent-queue", @@ -153,11 +152,12 @@ dependencies = [ [[package]] name = "async-process" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" +checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" dependencies = [ "async-io", + "autocfg", "blocking", "cfg-if", "event-listener", @@ -291,7 +291,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.17" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "bitflags", "clap_derive", @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.17" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -494,9 +494,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1079fb8528d9f9c888b1e8aa651e6e079ade467323d58f75faf1d30b1808f540" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -512,12 +512,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -569,8 +568,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12dc3116fe595d7847c701796ac1b189bd86b81f4f593c6f775f9d80fb2e29f4" dependencies = [ "byteorder", - "digest 0.10.3", - "rand_core 0.6.3", + "digest 0.10.5", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -627,11 +626,11 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.3", "crypto-common", "subtle", ] @@ -694,9 +693,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -745,19 +744,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "futures" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" +checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" dependencies = [ "futures-channel", "futures-core", @@ -770,9 +768,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" dependencies = [ "futures-core", "futures-sink", @@ -780,15 +778,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" [[package]] name = "futures-executor" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" dependencies = [ "futures-core", "futures-task", @@ -798,9 +796,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" [[package]] name = "futures-lite" @@ -819,9 +817,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", @@ -841,15 +839,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" [[package]] name = "futures-task" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" [[package]] name = "futures-timer" @@ -859,9 +857,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" dependencies = [ "futures-channel", "futures-core", @@ -1013,9 +1011,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1070,6 +1068,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if-addrs" version = "0.7.0" @@ -1182,15 +1190,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -[[package]] -name = "ipnetwork" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f84f1612606f3753f205a4e9a2efd6fe5b4c573a6269b2cc6c3003d44a0d127" -dependencies = [ - "serde", -] - [[package]] name = "ipnetwork" version = "0.20.0" @@ -1202,9 +1201,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1217,9 +1216,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -1241,9 +1240,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" [[package]] name = "libp2p" @@ -1378,17 +1377,17 @@ dependencies = [ "getrandom 0.2.7", "instant", "lazy_static", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-dns 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-metrics 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-mplex 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-noise 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-ping 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-swarm 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-swarm-derive 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", + "libp2p-dns 0.36.0", + "libp2p-metrics 0.9.0", + "libp2p-mplex 0.36.0", + "libp2p-noise 0.39.0", + "libp2p-ping 0.39.0", + "libp2p-swarm 0.39.0", + "libp2p-swarm-derive 0.30.0", "libp2p-tcp 0.36.0", - "libp2p-websocket 0.38.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-yamux 0.40.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-websocket 0.38.0", + "libp2p-yamux 0.40.0", "multiaddr", "parking_lot", "pin-project 1.0.12", @@ -1399,7 +1398,7 @@ dependencies = [ [[package]] name = "libp2p" version = "0.49.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "bytes", "futures", @@ -1407,21 +1406,20 @@ dependencies = [ "getrandom 0.2.7", "instant", "lazy_static", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-dns 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-metrics 0.9.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-mplex 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-noise 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-ping 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-swarm 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-swarm-derive 0.30.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", + "libp2p-dns 0.37.0", + "libp2p-metrics 0.10.0", + "libp2p-mplex 0.37.1", + "libp2p-noise 0.40.0", + "libp2p-ping 0.40.1", + "libp2p-swarm 0.40.1", + "libp2p-swarm-derive 0.30.1", "libp2p-tcp 0.37.0", - "libp2p-websocket 0.38.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-yamux 0.40.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-websocket 0.39.0", + "libp2p-yamux 0.41.0", "multiaddr", "parking_lot", "pin-project 1.0.12", - "rand 0.7.3", "smallvec", ] @@ -1443,7 +1441,7 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.11.0", "parking_lot", "pin-project 1.0.12", "prost 0.9.0", @@ -1451,7 +1449,7 @@ dependencies = [ "rand 0.8.5", "ring", "rw-stream-sink 0.2.1", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1477,7 +1475,7 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.11.0", "parking_lot", "pin-project 1.0.12", "prost 0.10.4", @@ -1485,7 +1483,7 @@ dependencies = [ "rand 0.8.5", "ring", "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1511,7 +1509,7 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.11.0", "parking_lot", "pin-project 1.0.12", "prost 0.10.4", @@ -1519,7 +1517,7 @@ dependencies = [ "rand 0.8.5", "ring", "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1545,7 +1543,7 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.11.0", "parking_lot", "pin-project 1.0.12", "prost 0.11.0", @@ -1553,7 +1551,7 @@ dependencies = [ "rand 0.8.5", "ring", "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1579,14 +1577,15 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "multistream-select 0.11.0", "parking_lot", "pin-project 1.0.12", "prost 0.11.0", "prost-build 0.11.1", "rand 0.8.5", + "ring", "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1596,8 +1595,8 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.36.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.37.1" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "asn1_der", "bs58", @@ -1611,14 +1610,15 @@ dependencies = [ "log", "multiaddr", "multihash", - "multistream-select 0.11.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "multistream-select 0.12.0", "parking_lot", "pin-project 1.0.12", "prost 0.11.0", "prost-build 0.11.1", "rand 0.8.5", + "ring", "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "sha2 0.10.2", + "sha2 0.10.6", "smallvec", "thiserror", "unsigned-varint", @@ -1693,7 +1693,7 @@ checksum = "6cb3c16e3bb2f76c751ae12f0f26e788c89d353babdded40411e7923f01fc978" dependencies = [ "async-std-resolver", "futures", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "parking_lot", "smallvec", @@ -1702,12 +1702,12 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.36.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.37.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "async-std-resolver", "futures", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "parking_lot", "smallvec", @@ -1768,20 +1768,20 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a74ab339e8b5d989e8c1000a78adb5c064a6319245bb22d1e70b415ec18c39b8" dependencies = [ - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-ping 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-swarm 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", + "libp2p-ping 0.39.0", + "libp2p-swarm 0.39.0", "prometheus-client 0.18.0", ] [[package]] name = "libp2p-metrics" -version = "0.9.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.10.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-ping 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-swarm 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", + "libp2p-ping 0.40.1", + "libp2p-swarm 0.40.1", "prometheus-client 0.18.0", ] @@ -1866,7 +1866,7 @@ dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "nohash-hasher", "parking_lot", @@ -1877,17 +1877,17 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.36.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.37.1" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "nohash-hasher", "parking_lot", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] @@ -1907,7 +1907,7 @@ dependencies = [ "prost 0.9.0", "prost-build 0.9.0", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -1929,7 +1929,7 @@ dependencies = [ "prost 0.10.4", "prost-build 0.10.4", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -1951,7 +1951,7 @@ dependencies = [ "prost 0.10.4", "prost-build 0.10.4", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -1973,7 +1973,7 @@ dependencies = [ "prost 0.11.0", "prost-build 0.11.1", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -1990,12 +1990,12 @@ dependencies = [ "curve25519-dalek 3.2.1", "futures", "lazy_static", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "prost 0.11.0", "prost-build 0.11.1", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -2004,19 +2004,19 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.40.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "bytes", "curve25519-dalek 3.2.1", "futures", "lazy_static", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "prost 0.11.0", "prost-build 0.11.1", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.6", "snow", "static_assertions", "x25519-dalek", @@ -2096,8 +2096,8 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libp2p-swarm 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", + "libp2p-swarm 0.39.0", "log", "rand 0.7.3", "void", @@ -2105,16 +2105,16 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.40.1" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", - "libp2p-swarm 0.39.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", + "libp2p-swarm 0.40.1", "log", - "rand 0.7.3", + "rand 0.8.5", "void", ] @@ -2209,7 +2209,7 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "pin-project 1.0.12", "rand 0.7.3", @@ -2220,18 +2220,18 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.39.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.40.1" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "pin-project 1.0.12", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", "void", @@ -2281,8 +2281,8 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.30.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.30.1" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "heck 0.4.0", "quote", @@ -2369,7 +2369,7 @@ dependencies = [ "if-watch 1.1.1", "ipnet", "libc", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "socket2", ] @@ -2377,14 +2377,14 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.37.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "async-io", "futures", "futures-timer", "if-watch 2.0.0", "libc", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "socket2", ] @@ -2473,7 +2473,7 @@ dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "log", "parking_lot", "quicksink", @@ -2485,13 +2485,13 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.38.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.39.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", "log", "parking_lot", "quicksink", @@ -2560,7 +2560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b74ec8dc042b583f0b2b93d52917f3b374c1e4b1cfa79ee74c7672c41257694c" dependencies = [ "futures", - "libp2p-core 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libp2p-core 0.36.0", "parking_lot", "thiserror", "yamux", @@ -2568,11 +2568,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.40.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.41.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "futures", - "libp2p-core 0.36.0 (git+https://github.com/libp2p/rust-libp2p?branch=master)", + "libp2p-core 0.37.1", + "log", "parking_lot", "thiserror", "yamux", @@ -2597,9 +2598,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2650,9 +2651,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" dependencies = [ "adler", ] @@ -2694,9 +2695,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" dependencies = [ "core2", - "digest 0.10.3", + "digest 0.10.5", "multihash-derive", - "sha2 0.10.2", + "sha2 0.10.6", "unsigned-varint", ] @@ -2736,8 +2737,8 @@ dependencies = [ [[package]] name = "multistream-select" -version = "0.11.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +version = "0.12.0" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "bytes", "futures", @@ -2861,9 +2862,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "opaque-debug" @@ -2917,15 +2918,15 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" @@ -3003,10 +3004,11 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "polling" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" dependencies = [ + "autocfg", "cfg-if", "libc", "log", @@ -3080,9 +3082,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -3353,7 +3355,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3373,7 +3375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3387,9 +3389,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.7", ] @@ -3440,9 +3442,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" dependencies = [ "base64", "bytes", @@ -3455,9 +3457,9 @@ dependencies = [ "hyper", "ipnet", "js-sys", - "lazy_static", "log", "mime", + "once_cell", "percent-encoding", "pin-project-lite 0.2.9", "serde", @@ -3558,7 +3560,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p?branch=master#457fb51ee0001bdd99dc8fbc9b275e71b4420d13" +source = "git+https://github.com/libp2p/rust-libp2p?branch=master#1da75b2b253f7073166b0aa532bf05a6d2158187" dependencies = [ "futures", "pin-project 1.0.12", @@ -3589,24 +3591,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -3615,9 +3617,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -3649,9 +3651,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89df7a26519371a3cce44fbb914c2819c84d9b897890987fa3ab096491cc0ea8" +checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7" dependencies = [ "serde", "serde_with_macros", @@ -3659,9 +3661,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de337f322382fcdfbb21a014f7c224ee041a23785651db67b9827403178f698f" +checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93" dependencies = [ "darling", "proc-macro2", @@ -3697,13 +3699,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -3727,9 +3729,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.0" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a" +checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" [[package]] name = "slab" @@ -3756,18 +3758,18 @@ dependencies = [ "blake2", "chacha20poly1305", "curve25519-dalek 4.0.0-pre.2", - "rand_core 0.6.3", + "rand_core 0.6.4", "ring", "rustc_version", - "sha2 0.10.2", + "sha2 0.10.6", "subtle", ] [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -3821,9 +3823,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", @@ -3889,13 +3891,14 @@ dependencies = [ [[package]] name = "testground" version = "0.4.0" -source = "git+https://github.com/testground/sdk-rust?rev=94a9a72796f94cc7ca786a5f019d07f328c76d4b#94a9a72796f94cc7ca786a5f019d07f328c76d4b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a83adf43990b4ebb757e826cba56b0bc6a09132f960dc981978cd5a011b7697f" dependencies = [ "clap", "futures", "if-addrs", "influxdb", - "ipnetwork 0.20.0", + "ipnetwork", "log", "serde", "serde_json", @@ -3916,7 +3919,6 @@ dependencies = [ "env_logger", "futures", "if-addrs", - "ipnetwork 0.19.0", "libp2p 0.44.0", "libp2p 0.45.1", "libp2p 0.46.1", @@ -3925,7 +3927,6 @@ dependencies = [ "libp2p 0.49.0", "log", "rand 0.8.5", - "serde", "serde_json", "soketto", "testground", @@ -3937,24 +3938,24 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -3978,9 +3979,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ "autocfg", "bytes", @@ -3988,7 +3989,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "pin-project-lite 0.2.9", "socket2", "tokio-macros", @@ -4008,9 +4008,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" dependencies = [ "futures-core", "pin-project-lite 0.2.9", @@ -4019,9 +4019,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes", "futures-core", @@ -4080,7 +4080,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.2.3", "ipnet", "lazy_static", "log", @@ -4130,30 +4130,30 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "unicode-xid" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -4183,13 +4183,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", ] @@ -4251,9 +4250,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4261,9 +4260,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", @@ -4276,9 +4275,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -4288,9 +4287,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4298,9 +4297,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -4311,15 +4310,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4337,9 +4336,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" dependencies = [ "webpki", ] @@ -4355,13 +4354,13 @@ dependencies = [ [[package]] name = "which" -version = "4.2.5" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] diff --git a/ping/rust/Cargo.toml b/ping/rust/Cargo.toml index 75e4568..b79722f 100644 --- a/ping/rust/Cargo.toml +++ b/ping/rust/Cargo.toml @@ -7,13 +7,11 @@ version = "0.1.0" async-std = {version = "1.10", features = ["attributes", "tokio1"]} env_logger = "0.9.0" if-addrs = "0.7.0" -ipnetwork = {version = "0.19.0", default-features = false, features = ["serde"]} log = "0.4" rand = "0.8" -serde = {version = "1", features = ["derive"]} serde_json = "1" soketto = "0.7.1" -testground = {git = "https://github.com/testground/sdk-rust", rev = "94a9a72796f94cc7ca786a5f019d07f328c76d4b", version = "0.4.0"} +testground = "0.4.0" thiserror = "1" tokio = { version = "1", default-features = false, features = ["sync", "rt-multi-thread", "macros", "net"] } tokio-stream = { version = "0.1", default-features = false, features = [] } @@ -26,4 +24,4 @@ libp2pv0460 = {package = "libp2p", default_features = false, features = [ "webso libp2pv0470 = {package = "libp2p", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "0.47.0", optional = true} libp2pv0480 = {package = "libp2p", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std", "rsa" ], version = "0.48.0", optional = true} -libp2pmaster = {package = "libp2p", git = "https://github.com/libp2p/rust-libp2p", branch = "master", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std", "rsa" ], optional = true} \ No newline at end of file +libp2pmaster = {package = "libp2p", git = "https://github.com/libp2p/rust-libp2p", branch = "master", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std", "rsa" ], optional = true} diff --git a/ping/rust/src/main.rs b/ping/rust/src/main.rs index dff75d0..d9387f7 100644 --- a/ping/rust/src/main.rs +++ b/ping/rust/src/main.rs @@ -87,10 +87,11 @@ async fn main() -> Result<(), Box> { e => panic!("Unexpected event {:?}", e), } + let test_instance_count = client.run_parameters().test_instance_count as usize; let mut address_stream = client - .subscribe("peers") + .subscribe("peers", test_instance_count) .await - .take(client.run_parameters().test_instance_count as usize) + .take(test_instance_count) .map(|a| { let value = a.unwrap(); let addr = value["Addrs"][0].as_str().unwrap(); @@ -199,9 +200,9 @@ async fn ping( info!("Wait to receive ping from each peer."); let mut pinged = HashSet::new(); while pinged.len() < client.run_parameters().test_instance_count as usize - 1 { - if let SwarmEvent::Behaviour(ping::PingEvent { + if let SwarmEvent::Behaviour(ping::Event { peer, - result: Ok(ping::PingSuccess::Ping { .. }), + result: Ok(ping::Success::Ping { .. }), }) = swarm.next().await.unwrap() { if pinged.insert(peer) {