frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove serial_test

Browse Source
This commit is contained in:
Riccardo Casatta 2021-06-17 14:13:17 +02:00
parent 6394c3e209
commit 18dcda844f
No known key found for this signature in database
GPG Key ID: FD986A969E450397
4 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -34,7 +34,6 @@ tiny-bip39 = { version = "^0.8", optional = true }
# Needed by bdk_blockchain_tests macro # Needed by bdk_blockchain_tests macro
bitcoincore-rpc = { version = "0.13", optional = true } bitcoincore-rpc = { version = "0.13", optional = true }
serial_test = { version = "0.4", optional = true }
# Platform-specific dependencies # Platform-specific dependencies
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@ -70,7 +69,6 @@ test-md-docs = ["electrum"]
lazy_static = "1.4" lazy_static = "1.4"
env_logger = "0.7" env_logger = "0.7"
clap = "2.33" clap = "2.33"
serial_test = "0.4"
bitcoind = "0.11.0" bitcoind = "0.11.0"
electrsd = "0.3.0" electrsd = "0.3.0"

1
src/database/keyvalue.rs
View File

@ -385,6 +385,7 @@ impl BatchDatabase for Tree {
mod test { mod test {
use std::sync::{Arc, Condvar, Mutex, Once}; use std::sync::{Arc, Condvar, Mutex, Once};
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use lazy_static::lazy_static;
use sled::{Db, Tree}; use sled::{Db, Tree};

7
src/lib.rs
View File

@ -234,13 +234,6 @@ pub extern crate reqwest;
#[cfg(feature = "key-value-db")] #[cfg(feature = "key-value-db")]
pub extern crate sled; pub extern crate sled;
#[allow(unused_imports)]
#[cfg(test)]
#[allow(unused_imports)]
#[cfg(test)]
#[macro_use]
pub extern crate serial_test;
#[macro_use] #[macro_use]
pub(crate) mod error; pub(crate) mod error;
pub mod blockchain; pub mod blockchain;

19
src/testutils/blockchain_tests.rs
View File

@ -343,7 +343,6 @@ macro_rules! bdk_blockchain_tests {
use $crate::types::KeychainKind; use $crate::types::KeychainKind;
use $crate::{Wallet, FeeRate}; use $crate::{Wallet, FeeRate};
use $crate::testutils; use $crate::testutils;
use $crate::serial_test::serial;
use super::*; use super::*;
@ -375,7 +374,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_simple() { fn test_sync_simple() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -398,7 +396,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_stop_gap_20() { fn test_sync_stop_gap_20() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -416,7 +413,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_before_and_after_receive() { fn test_sync_before_and_after_receive() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -434,7 +430,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_multiple_outputs_same_tx() { fn test_sync_multiple_outputs_same_tx() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -456,7 +451,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_receive_multi() { fn test_sync_receive_multi() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -475,7 +469,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_address_reuse() { fn test_sync_address_reuse() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -495,7 +488,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_receive_rbf_replaced() { fn test_sync_receive_rbf_replaced() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -534,7 +526,6 @@ macro_rules! bdk_blockchain_tests {
// doesn't work for some reason. // doesn't work for some reason.
#[cfg(not(feature = "esplora"))] #[cfg(not(feature = "esplora"))]
#[test] #[test]
#[serial]
fn test_sync_reorg_block() { fn test_sync_reorg_block() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
@ -565,7 +556,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_after_send() { fn test_sync_after_send() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
println!("{}", descriptors.0); println!("{}", descriptors.0);
@ -594,7 +584,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_update_confirmation_time_after_generate() { fn test_update_confirmation_time_after_generate() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
println!("{}", descriptors.0); println!("{}", descriptors.0);
@ -620,9 +609,7 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_outgoing_from_scratch() { fn test_sync_outgoing_from_scratch() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -664,7 +651,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_long_change_chain() { fn test_sync_long_change_chain() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -706,7 +692,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_bump_fee_basic() { fn test_sync_bump_fee_basic() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -742,7 +727,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_bump_fee_remove_change() { fn test_sync_bump_fee_remove_change() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -778,7 +762,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_bump_fee_add_input_simple() { fn test_sync_bump_fee_add_input_simple() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -812,7 +795,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_bump_fee_add_input_no_change() { fn test_sync_bump_fee_add_input_no_change() {
let (wallet, descriptors, mut test_client) = init_single_sig(); let (wallet, descriptors, mut test_client) = init_single_sig();
let node_addr = test_client.get_node_address(None); let node_addr = test_client.get_node_address(None);
@ -849,7 +831,6 @@ macro_rules! bdk_blockchain_tests {
} }
#[test] #[test]
#[serial]
fn test_sync_receive_coinbase() { fn test_sync_receive_coinbase() {
let (wallet, _, mut test_client) = init_single_sig(); let (wallet, _, mut test_client) = init_single_sig();