Merge testutils crate into the main crate

This avoids having to keep the apis in sync between the macros and the
main project.
This commit is contained in:
LLFourn
2021-05-19 13:04:32 +10:00
parent fcae5adabd
commit d60c5003bf
11 changed files with 50 additions and 75 deletions

View File

@@ -169,9 +169,8 @@ impl ConfigurableBlockchain for ElectrumBlockchain {
}
}
#[cfg(all(feature = "test-electrum", test))]
testutils::bdk_blockchain_tests! {
bdk => crate,
#[cfg(feature = "test-blockchains")]
crate::bdk_blockchain_tests! {
fn test_instance() -> ElectrumBlockchain {
ElectrumBlockchain::from(Client::new(&testutils::get_electrum_url()).unwrap())
}

View File

@@ -415,9 +415,8 @@ impl_error!(std::num::ParseIntError, Parsing, EsploraError);
impl_error!(consensus::encode::Error, BitcoinEncoding, EsploraError);
impl_error!(bitcoin::hashes::hex::Error, Hex, EsploraError);
#[cfg(all(feature = "test-esplora", test))]
testutils::bdk_blockchain_tests! {
bdk => crate,
#[cfg(feature = "test-blockchains")]
crate::bdk_blockchain_tests! {
fn test_instance() -> EsploraBlockchain {
EsploraBlockchain::new(std::env::var("BDK_ESPLORA_URL").unwrap_or("127.0.0.1:3002".into()).as_str(), None)
}