diff --git a/Cargo.lock b/Cargo.lock index 9e707fce08..ae9a7b2b18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3862,7 +3862,6 @@ dependencies = [ "serde_json", "serde_yaml", "serial_test", - "serial_test_derive", "solana-clap-utils", "solana-client", "solana-core", @@ -4112,7 +4111,6 @@ dependencies = [ "serde_derive", "serde_json", "serial_test", - "serial_test_derive", "solana-account-decoder", "solana-banks-server", "solana-clap-utils", @@ -4502,7 +4500,6 @@ dependencies = [ "log 0.4.11", "rand 0.7.3", "serial_test", - "serial_test_derive", "solana-client", "solana-config-program", "solana-core", @@ -4597,7 +4594,6 @@ dependencies = [ "rand 0.7.3", "reqwest", "serial_test", - "serial_test_derive", "solana-sdk", ] @@ -4992,7 +4988,6 @@ dependencies = [ "serde", "serde_yaml", "serial_test", - "serial_test_derive", "solana-clap-utils", "solana-cli-config", "solana-client", diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index e18656b0ef..01f60cfc9d 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -30,7 +30,6 @@ solana-version = { path = "../version", version = "1.6.0" } [dev-dependencies] serial_test = "0.4.0" -serial_test_derive = "0.4.0" solana-local-cluster = { path = "../local-cluster", version = "1.6.0" } [package.metadata.docs.rs] diff --git a/bench-tps/tests/bench_tps.rs b/bench-tps/tests/bench_tps.rs index a97cb29016..e86624032d 100644 --- a/bench-tps/tests/bench_tps.rs +++ b/bench-tps/tests/bench_tps.rs @@ -1,4 +1,4 @@ -use serial_test_derive::serial; +use serial_test::serial; use solana_bench_tps::bench::{do_bench_tps, generate_and_fund_keypairs}; use solana_bench_tps::cli::Config; use solana_client::thin_client::create_client; diff --git a/core/Cargo.toml b/core/Cargo.toml index 0611159fa2..c59a5770be 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -90,7 +90,6 @@ matches = "0.1.6" num_cpus = "1.13.0" reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } serial_test = "0.4.0" -serial_test_derive = "0.4.0" systemstat = "0.1.5" [build-dependencies] diff --git a/core/src/rpc_pubsub.rs b/core/src/rpc_pubsub.rs index 877116a4f9..2ac5e54460 100644 --- a/core/src/rpc_pubsub.rs +++ b/core/src/rpc_pubsub.rs @@ -490,7 +490,7 @@ mod tests { use crossbeam_channel::unbounded; use jsonrpc_core::{futures::sync::mpsc, Response}; use jsonrpc_pubsub::{PubSubHandler, Session}; - use serial_test_derive::serial; + use serial_test::serial; use solana_account_decoder::{parse_account_data::parse_account_data, UiAccountEncoding}; use solana_client::rpc_response::{ProcessedSignatureResult, ReceivedSignatureResult}; use solana_runtime::{ diff --git a/core/src/rpc_subscriptions.rs b/core/src/rpc_subscriptions.rs index 34587bbeb3..3619dfb6d6 100644 --- a/core/src/rpc_subscriptions.rs +++ b/core/src/rpc_subscriptions.rs @@ -1296,7 +1296,7 @@ pub(crate) mod tests { }; use jsonrpc_core::futures::{self, stream::Stream}; use jsonrpc_pubsub::typed::Subscriber; - use serial_test_derive::serial; + use serial_test::serial; use solana_runtime::{ commitment::BlockCommitment, genesis_utils::{create_genesis_config, GenesisConfigInfo}, diff --git a/core/src/tvu.rs b/core/src/tvu.rs index 55a5dcd244..a39e54586e 100644 --- a/core/src/tvu.rs +++ b/core/src/tvu.rs @@ -309,7 +309,7 @@ pub mod tests { cluster_info::{ClusterInfo, Node}, optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank, }; - use serial_test_derive::serial; + use serial_test::serial; use solana_ledger::{ blockstore::BlockstoreSignals, create_new_tmp_ledger, diff --git a/core/tests/cluster_info.rs b/core/tests/cluster_info.rs index fcd40e6fbc..0e3cd3206d 100644 --- a/core/tests/cluster_info.rs +++ b/core/tests/cluster_info.rs @@ -1,6 +1,6 @@ use rayon::iter::ParallelIterator; use rayon::prelude::*; -use serial_test_derive::serial; +use serial_test::serial; use solana_core::cluster_info::{compute_retransmit_peers, ClusterInfo}; use solana_core::contact_info::ContactInfo; use solana_sdk::pubkey::Pubkey; diff --git a/core/tests/crds_gossip.rs b/core/tests/crds_gossip.rs index 6577982f41..f7658c7ac9 100644 --- a/core/tests/crds_gossip.rs +++ b/core/tests/crds_gossip.rs @@ -2,7 +2,7 @@ use bincode::serialized_size; use log::*; use rayon::prelude::*; use rayon::{ThreadPool, ThreadPoolBuilder}; -use serial_test_derive::serial; +use serial_test::serial; use solana_core::cluster_info; use solana_core::contact_info::ContactInfo; use solana_core::crds_gossip::*; diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index 5404938005..74ad326221 100644 --- a/local-cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -34,7 +34,6 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.6.0" } [dev-dependencies] assert_matches = "1.3.0" serial_test = "0.4.0" -serial_test_derive = "0.4.0" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs index a5fc9c57a9..96d37eb4aa 100644 --- a/local-cluster/tests/local_cluster.rs +++ b/local-cluster/tests/local_cluster.rs @@ -2,7 +2,7 @@ use assert_matches::assert_matches; use crossbeam_channel::{unbounded, Receiver}; use gag::BufferRedirect; use log::*; -use serial_test_derive::serial; +use serial_test::serial; use solana_client::{ pubsub_client::PubsubClient, rpc_client::RpcClient, diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 80fa5864f6..64535026d8 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -19,7 +19,6 @@ solana-sdk = { path = "../sdk", version = "1.6.0" } [dev-dependencies] rand = "0.7.0" serial_test = "0.4.0" -serial_test_derive = "0.4.0" [lib] name = "solana_metrics" diff --git a/metrics/src/counter.rs b/metrics/src/counter.rs index 787cc8f386..c580b433a2 100644 --- a/metrics/src/counter.rs +++ b/metrics/src/counter.rs @@ -209,7 +209,7 @@ mod tests { use crate::counter::{Counter, DEFAULT_LOG_RATE, DEFAULT_METRICS_RATE}; use log::Level; use log::*; - use serial_test_derive::serial; + use serial_test::serial; use std::env; use std::sync::atomic::Ordering; use std::sync::{Once, RwLock}; diff --git a/stake-monitor/Cargo.toml b/stake-monitor/Cargo.toml index 78598dd8cd..59833e5afa 100644 --- a/stake-monitor/Cargo.toml +++ b/stake-monitor/Cargo.toml @@ -26,7 +26,6 @@ solana-version = { path = "../version", version = "1.6.0" } [dev-dependencies] serial_test = "0.4.0" -serial_test_derive = "0.4.0" solana-local-cluster = { path = "../local-cluster", version = "1.6.0" } solana-core = { path = "../core", version = "1.6.0" } tempfile = "3.1.0" diff --git a/stake-monitor/src/lib.rs b/stake-monitor/src/lib.rs index 387ad15698..1a92888374 100644 --- a/stake-monitor/src/lib.rs +++ b/stake-monitor/src/lib.rs @@ -357,7 +357,7 @@ pub fn process_slots(rpc_client: &RpcClient, accounts_info: &mut AccountsInfo, b #[cfg(test)] mod test { use super::*; - use serial_test_derive::serial; + use serial_test::serial; use solana_client::rpc_config::RpcSendTransactionConfig; use solana_core::{rpc::JsonRpcConfig, validator::ValidatorConfig}; use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};