diff --git a/Cargo.lock b/Cargo.lock index af7121baa3..5efcd56579 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1117,6 +1117,17 @@ dependencies = [ "rayon", ] +[[package]] +name = "dashmap" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", + "parking_lot 0.12.1", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -4277,10 +4288,11 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eec42e7232e5ca56aa59d63af3c7f991fe71ee6a3ddd2d3480834cf3902b007" +checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" dependencies = [ + "dashmap 5.2.0", "futures 0.3.21", "lazy_static", "log", @@ -4290,14 +4302,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b95bb2f4f624565e8fe8140c789af7e2082c0e0561b5a82a1b678baa9703dc" +checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" dependencies = [ "proc-macro-error", "proc-macro2 1.0.41", "quote 1.0.18", - "rustversion", "syn 1.0.98", ] @@ -5037,7 +5048,7 @@ dependencies = [ "bs58", "chrono", "crossbeam-channel", - "dashmap", + "dashmap 4.0.2", "eager", "etcd-client", "fs_extra", @@ -5435,7 +5446,7 @@ dependencies = [ "chrono", "chrono-humanize", "crossbeam-channel", - "dashmap", + "dashmap 4.0.2", "fs_extra", "futures 0.3.21", "itertools", @@ -5495,7 +5506,7 @@ dependencies = [ "clap 2.33.3", "crossbeam-channel", "csv", - "dashmap", + "dashmap 4.0.2", "histogram", "itertools", "log", @@ -5909,7 +5920,7 @@ dependencies = [ "bincode", "bs58", "crossbeam-channel", - "dashmap", + "dashmap 4.0.2", "itertools", "jsonrpc-core", "jsonrpc-core-client", @@ -5992,7 +6003,7 @@ dependencies = [ "byteorder", "bzip2", "crossbeam-channel", - "dashmap", + "dashmap 4.0.2", "dir-diff", "ed25519-dalek", "flate2", diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 6810dc2384..f0c71fcb6e 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -35,7 +35,7 @@ solana-version = { path = "../version", version = "=1.12.0" } thiserror = "1.0" [dev-dependencies] -serial_test = "0.8.0" +serial_test = "0.9.0" solana-local-cluster = { path = "../local-cluster", version = "=1.12.0" } solana-test-validator = { path = "../test-validator", version = "=1.12.0" } diff --git a/client-test/Cargo.toml b/client-test/Cargo.toml index 7bc589bf08..e7727cefcd 100644 --- a/client-test/Cargo.toml +++ b/client-test/Cargo.toml @@ -13,7 +13,7 @@ publish = false [dependencies] futures-util = "0.3.21" serde_json = "1.0.83" -serial_test = "0.8.0" +serial_test = "0.9.0" solana-client = { path = "../client", version = "=1.12.0" } solana-ledger = { path = "../ledger", version = "=1.12.0" } solana-measure = { path = "../measure", version = "=1.12.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 78c9c90c9a..63185dee1e 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -69,7 +69,7 @@ trees = "0.4.2" matches = "0.1.9" raptorq = "1.7.0" serde_json = "1.0.83" -serial_test = "0.8.0" +serial_test = "0.9.0" solana-logger = { path = "../logger", version = "=1.12.0" } solana-program-runtime = { path = "../program-runtime", version = "=1.12.0" } solana-stake-program = { path = "../programs/stake", version = "=1.12.0" } diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 349fffbf22..edbeea1dae 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -35,5 +35,5 @@ solana-version = { path = "../version", version = "=1.12.0" } targets = ["x86_64-unknown-linux-gnu"] [dev-dependencies] -serial_test = "0.8.0" +serial_test = "0.9.0" solana-local-cluster = { path = "../local-cluster", version = "=1.12.0" } diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 8cf1074872..74e01fcfae 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -50,7 +50,7 @@ thiserror = "1.0" [dev-dependencies] num_cpus = "1.13.1" regex = "1" -serial_test = "0.8.0" +serial_test = "0.9.0" [build-dependencies] rustc_version = "0.4" diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index 9a7a72ad8a..fadf50500f 100644 --- a/local-cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -32,7 +32,7 @@ tempfile = "3.3.0" [dev-dependencies] assert_matches = "1.5.0" gag = "1.0.0" -serial_test = "0.8.0" +serial_test = "0.9.0" solana-download-utils = { path = "../download-utils", version = "=1.12.0" } solana-logger = { path = "../logger", version = "=1.12.0" } diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 8e815408d2..ac14099d8c 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -20,7 +20,7 @@ solana-sdk = { path = "../sdk", version = "=1.12.0" } [dev-dependencies] env_logger = "0.9.0" rand = "0.7.0" -serial_test = "0.8.0" +serial_test = "0.9.0" [lib] name = "solana_metrics" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index e4c0ec1c90..00a059d2dc 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -57,7 +57,7 @@ tokio = { version = "~1.14.1", features = ["full"] } tokio-util = { version = "0.6", features = ["codec", "compat"] } [dev-dependencies] -serial_test = "0.8.0" +serial_test = "0.9.0" solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.12.0" } solana-net-utils = { path = "../net-utils", version = "=1.12.0" } solana-stake-program = { path = "../programs/stake", version = "=1.12.0" }