From 18dcda844f8c6cbe01231e88dfe7cff932bdd203 Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Thu, 17 Jun 2021 14:13:17 +0200 Subject: [PATCH] remove serial_test --- Cargo.toml | 2 -- src/database/keyvalue.rs | 1 + src/lib.rs | 7 ------- src/testutils/blockchain_tests.rs | 19 ------------------- 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d30587bb..c89f6f95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,6 @@ tiny-bip39 = { version = "^0.8", optional = true } # Needed by bdk_blockchain_tests macro bitcoincore-rpc = { version = "0.13", optional = true } -serial_test = { version = "0.4", optional = true } # Platform-specific dependencies [target.'cfg(not(target_arch = "wasm32"))'.dependencies] @@ -70,7 +69,6 @@ test-md-docs = ["electrum"] lazy_static = "1.4" env_logger = "0.7" clap = "2.33" -serial_test = "0.4" bitcoind = "0.11.0" electrsd = "0.3.0" diff --git a/src/database/keyvalue.rs b/src/database/keyvalue.rs index 201fc256..ecf9f4d7 100644 --- a/src/database/keyvalue.rs +++ b/src/database/keyvalue.rs @@ -385,6 +385,7 @@ impl BatchDatabase for Tree { mod test { use std::sync::{Arc, Condvar, Mutex, Once}; use std::time::{SystemTime, UNIX_EPOCH}; + use lazy_static::lazy_static; use sled::{Db, Tree}; diff --git a/src/lib.rs b/src/lib.rs index c2ab473b..b5548bae 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -234,13 +234,6 @@ pub extern crate reqwest; #[cfg(feature = "key-value-db")] pub extern crate sled; -#[allow(unused_imports)] -#[cfg(test)] -#[allow(unused_imports)] -#[cfg(test)] -#[macro_use] -pub extern crate serial_test; - #[macro_use] pub(crate) mod error; pub mod blockchain; diff --git a/src/testutils/blockchain_tests.rs b/src/testutils/blockchain_tests.rs index 713c0ef6..041e1a16 100644 --- a/src/testutils/blockchain_tests.rs +++ b/src/testutils/blockchain_tests.rs @@ -343,7 +343,6 @@ macro_rules! bdk_blockchain_tests { use $crate::types::KeychainKind; use $crate::{Wallet, FeeRate}; use $crate::testutils; - use $crate::serial_test::serial; use super::*; @@ -375,7 +374,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_simple() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -398,7 +396,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_stop_gap_20() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -416,7 +413,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_before_and_after_receive() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -434,7 +430,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_multiple_outputs_same_tx() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -456,7 +451,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_receive_multi() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -475,7 +469,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_address_reuse() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -495,7 +488,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_receive_rbf_replaced() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -534,7 +526,6 @@ macro_rules! bdk_blockchain_tests { // doesn't work for some reason. #[cfg(not(feature = "esplora"))] #[test] - #[serial] fn test_sync_reorg_block() { let (wallet, descriptors, mut test_client) = init_single_sig(); @@ -565,7 +556,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_after_send() { let (wallet, descriptors, mut test_client) = init_single_sig(); println!("{}", descriptors.0); @@ -594,7 +584,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_update_confirmation_time_after_generate() { let (wallet, descriptors, mut test_client) = init_single_sig(); println!("{}", descriptors.0); @@ -620,9 +609,7 @@ macro_rules! bdk_blockchain_tests { } - #[test] - #[serial] fn test_sync_outgoing_from_scratch() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -664,7 +651,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_long_change_chain() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -706,7 +692,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_bump_fee_basic() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -742,7 +727,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_bump_fee_remove_change() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -778,7 +762,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_bump_fee_add_input_simple() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -812,7 +795,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_bump_fee_add_input_no_change() { let (wallet, descriptors, mut test_client) = init_single_sig(); let node_addr = test_client.get_node_address(None); @@ -849,7 +831,6 @@ macro_rules! bdk_blockchain_tests { } #[test] - #[serial] fn test_sync_receive_coinbase() { let (wallet, _, mut test_client) = init_single_sig();