Use upstream `TestLogger` util in tx sync tests

diff --git a/lightning-transaction-sync/Cargo.toml b/lightning-transaction-sync/Cargo.toml
index 782c4b7033e91f089ded4f178484e9f28b426ec9..9b85042fae1ec44310755bae81018383e3be5708 100644 (file)
--- a/lightning-transaction-sync/Cargo.toml
+++ b/lightning-transaction-sync/Cargo.toml
@@ -29,7 +29,7 @@ esplora-client = { version = "0.6", default-features = false, optional = true }
 reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
 
 [dev-dependencies]
-lightning = { version = "0.0.118", path = "../lightning", features = ["std"] }
+lightning = { version = "0.0.118", path = "../lightning", features = ["std", "_test_utils"] }
 electrsd = { version = "0.26.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_25_0"] }
 electrum-client = "0.18.0"
 tokio = { version = "1.14.0", features = ["full"] }

diff --git a/lightning-transaction-sync/tests/integration_tests.rs b/lightning-transaction-sync/tests/integration_tests.rs
index 218d187a441c647d618ca3ced0cc631e8bc7d915..358f49a88a33c84dd26ac9f4e9be52d370a0befa 100644 (file)
--- a/lightning-transaction-sync/tests/integration_tests.rs
+++ b/lightning-transaction-sync/tests/integration_tests.rs
@@ -2,7 +2,7 @@
 use lightning_transaction_sync::EsploraSyncClient;
 use lightning::chain::{Confirm, Filter};
 use lightning::chain::transaction::TransactionData;
-use lightning::util::logger::{Logger, Record};
+use lightning::util::test_utils::TestLogger;
 
 use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
 use bitcoin::{Amount, Txid, BlockHash};
@@ -148,22 +148,12 @@ impl Confirm for TestConfirmable {
        }
 }
 
-pub struct TestLogger {}
-
-impl Logger for TestLogger {
-       fn log(&self, record: &Record) {
-               println!("{} -- {}",
-                               record.level,
-                               record.args);
-       }
-}
-
 #[test]
 #[cfg(feature = "esplora-blocking")]
 fn test_esplora_syncs() {
        let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
        generate_blocks_and_wait(&bitcoind, &electrsd, 101);
-       let mut logger = TestLogger {};
+       let mut logger = TestLogger::new();
        let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
        let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
        let confirmable = TestConfirmable::new();
@@ -246,7 +236,7 @@ fn test_esplora_syncs() {
 async fn test_esplora_syncs() {
        let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
        generate_blocks_and_wait(&bitcoind, &electrsd, 101);
-       let mut logger = TestLogger {};
+       let mut logger = TestLogger::new();
        let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
        let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
        let confirmable = TestConfirmable::new();