Remove serial_test_derive dependency (#14891)
This commit is contained in:
parent
52326d53be
commit
01230a0105
|
@ -3862,7 +3862,6 @@ dependencies = [
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
"serial_test",
|
"serial_test",
|
||||||
"serial_test_derive",
|
|
||||||
"solana-clap-utils",
|
"solana-clap-utils",
|
||||||
"solana-client",
|
"solana-client",
|
||||||
"solana-core",
|
"solana-core",
|
||||||
|
@ -4112,7 +4111,6 @@ dependencies = [
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serial_test",
|
"serial_test",
|
||||||
"serial_test_derive",
|
|
||||||
"solana-account-decoder",
|
"solana-account-decoder",
|
||||||
"solana-banks-server",
|
"solana-banks-server",
|
||||||
"solana-clap-utils",
|
"solana-clap-utils",
|
||||||
|
@ -4502,7 +4500,6 @@ dependencies = [
|
||||||
"log 0.4.11",
|
"log 0.4.11",
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"serial_test",
|
"serial_test",
|
||||||
"serial_test_derive",
|
|
||||||
"solana-client",
|
"solana-client",
|
||||||
"solana-config-program",
|
"solana-config-program",
|
||||||
"solana-core",
|
"solana-core",
|
||||||
|
@ -4597,7 +4594,6 @@ dependencies = [
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serial_test",
|
"serial_test",
|
||||||
"serial_test_derive",
|
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -4992,7 +4988,6 @@ dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
"serial_test",
|
"serial_test",
|
||||||
"serial_test_derive",
|
|
||||||
"solana-clap-utils",
|
"solana-clap-utils",
|
||||||
"solana-cli-config",
|
"solana-cli-config",
|
||||||
"solana-client",
|
"solana-client",
|
||||||
|
|
|
@ -30,7 +30,6 @@ solana-version = { path = "../version", version = "1.6.0" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serial_test = "0.4.0"
|
serial_test = "0.4.0"
|
||||||
serial_test_derive = "0.4.0"
|
|
||||||
solana-local-cluster = { path = "../local-cluster", version = "1.6.0" }
|
solana-local-cluster = { path = "../local-cluster", version = "1.6.0" }
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.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::bench::{do_bench_tps, generate_and_fund_keypairs};
|
||||||
use solana_bench_tps::cli::Config;
|
use solana_bench_tps::cli::Config;
|
||||||
use solana_client::thin_client::create_client;
|
use solana_client::thin_client::create_client;
|
||||||
|
|
|
@ -90,7 +90,6 @@ matches = "0.1.6"
|
||||||
num_cpus = "1.13.0"
|
num_cpus = "1.13.0"
|
||||||
reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||||
serial_test = "0.4.0"
|
serial_test = "0.4.0"
|
||||||
serial_test_derive = "0.4.0"
|
|
||||||
systemstat = "0.1.5"
|
systemstat = "0.1.5"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|
|
@ -490,7 +490,7 @@ mod tests {
|
||||||
use crossbeam_channel::unbounded;
|
use crossbeam_channel::unbounded;
|
||||||
use jsonrpc_core::{futures::sync::mpsc, Response};
|
use jsonrpc_core::{futures::sync::mpsc, Response};
|
||||||
use jsonrpc_pubsub::{PubSubHandler, Session};
|
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_account_decoder::{parse_account_data::parse_account_data, UiAccountEncoding};
|
||||||
use solana_client::rpc_response::{ProcessedSignatureResult, ReceivedSignatureResult};
|
use solana_client::rpc_response::{ProcessedSignatureResult, ReceivedSignatureResult};
|
||||||
use solana_runtime::{
|
use solana_runtime::{
|
||||||
|
|
|
@ -1296,7 +1296,7 @@ pub(crate) mod tests {
|
||||||
};
|
};
|
||||||
use jsonrpc_core::futures::{self, stream::Stream};
|
use jsonrpc_core::futures::{self, stream::Stream};
|
||||||
use jsonrpc_pubsub::typed::Subscriber;
|
use jsonrpc_pubsub::typed::Subscriber;
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_runtime::{
|
use solana_runtime::{
|
||||||
commitment::BlockCommitment,
|
commitment::BlockCommitment,
|
||||||
genesis_utils::{create_genesis_config, GenesisConfigInfo},
|
genesis_utils::{create_genesis_config, GenesisConfigInfo},
|
||||||
|
|
|
@ -309,7 +309,7 @@ pub mod tests {
|
||||||
cluster_info::{ClusterInfo, Node},
|
cluster_info::{ClusterInfo, Node},
|
||||||
optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
|
optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
|
||||||
};
|
};
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_ledger::{
|
use solana_ledger::{
|
||||||
blockstore::BlockstoreSignals,
|
blockstore::BlockstoreSignals,
|
||||||
create_new_tmp_ledger,
|
create_new_tmp_ledger,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use rayon::iter::ParallelIterator;
|
use rayon::iter::ParallelIterator;
|
||||||
use rayon::prelude::*;
|
use rayon::prelude::*;
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_core::cluster_info::{compute_retransmit_peers, ClusterInfo};
|
use solana_core::cluster_info::{compute_retransmit_peers, ClusterInfo};
|
||||||
use solana_core::contact_info::ContactInfo;
|
use solana_core::contact_info::ContactInfo;
|
||||||
use solana_sdk::pubkey::Pubkey;
|
use solana_sdk::pubkey::Pubkey;
|
||||||
|
|
|
@ -2,7 +2,7 @@ use bincode::serialized_size;
|
||||||
use log::*;
|
use log::*;
|
||||||
use rayon::prelude::*;
|
use rayon::prelude::*;
|
||||||
use rayon::{ThreadPool, ThreadPoolBuilder};
|
use rayon::{ThreadPool, ThreadPoolBuilder};
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_core::cluster_info;
|
use solana_core::cluster_info;
|
||||||
use solana_core::contact_info::ContactInfo;
|
use solana_core::contact_info::ContactInfo;
|
||||||
use solana_core::crds_gossip::*;
|
use solana_core::crds_gossip::*;
|
||||||
|
|
|
@ -34,7 +34,6 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.6.0" }
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
assert_matches = "1.3.0"
|
assert_matches = "1.3.0"
|
||||||
serial_test = "0.4.0"
|
serial_test = "0.4.0"
|
||||||
serial_test_derive = "0.4.0"
|
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
targets = ["x86_64-unknown-linux-gnu"]
|
targets = ["x86_64-unknown-linux-gnu"]
|
||||||
|
|
|
@ -2,7 +2,7 @@ use assert_matches::assert_matches;
|
||||||
use crossbeam_channel::{unbounded, Receiver};
|
use crossbeam_channel::{unbounded, Receiver};
|
||||||
use gag::BufferRedirect;
|
use gag::BufferRedirect;
|
||||||
use log::*;
|
use log::*;
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_client::{
|
use solana_client::{
|
||||||
pubsub_client::PubsubClient,
|
pubsub_client::PubsubClient,
|
||||||
rpc_client::RpcClient,
|
rpc_client::RpcClient,
|
||||||
|
|
|
@ -19,7 +19,6 @@ solana-sdk = { path = "../sdk", version = "1.6.0" }
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rand = "0.7.0"
|
rand = "0.7.0"
|
||||||
serial_test = "0.4.0"
|
serial_test = "0.4.0"
|
||||||
serial_test_derive = "0.4.0"
|
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "solana_metrics"
|
name = "solana_metrics"
|
||||||
|
|
|
@ -209,7 +209,7 @@ mod tests {
|
||||||
use crate::counter::{Counter, DEFAULT_LOG_RATE, DEFAULT_METRICS_RATE};
|
use crate::counter::{Counter, DEFAULT_LOG_RATE, DEFAULT_METRICS_RATE};
|
||||||
use log::Level;
|
use log::Level;
|
||||||
use log::*;
|
use log::*;
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::sync::atomic::Ordering;
|
use std::sync::atomic::Ordering;
|
||||||
use std::sync::{Once, RwLock};
|
use std::sync::{Once, RwLock};
|
||||||
|
|
|
@ -26,7 +26,6 @@ solana-version = { path = "../version", version = "1.6.0" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serial_test = "0.4.0"
|
serial_test = "0.4.0"
|
||||||
serial_test_derive = "0.4.0"
|
|
||||||
solana-local-cluster = { path = "../local-cluster", version = "1.6.0" }
|
solana-local-cluster = { path = "../local-cluster", version = "1.6.0" }
|
||||||
solana-core = { path = "../core", version = "1.6.0" }
|
solana-core = { path = "../core", version = "1.6.0" }
|
||||||
tempfile = "3.1.0"
|
tempfile = "3.1.0"
|
||||||
|
|
|
@ -357,7 +357,7 @@ pub fn process_slots(rpc_client: &RpcClient, accounts_info: &mut AccountsInfo, b
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
use serial_test_derive::serial;
|
use serial_test::serial;
|
||||||
use solana_client::rpc_config::RpcSendTransactionConfig;
|
use solana_client::rpc_config::RpcSendTransactionConfig;
|
||||||
use solana_core::{rpc::JsonRpcConfig, validator::ValidatorConfig};
|
use solana_core::{rpc::JsonRpcConfig, validator::ValidatorConfig};
|
||||||
use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
|
use solana_local_cluster::local_cluster::{ClusterConfig, LocalCluster};
|
||||||
|
|
Loading…
Reference in New Issue