f Wait for funding txo spend

Author: tnull

src/tests/functional_tests.rs

@@ -1,7 +1,7 @@
 use crate::tests::test_utils::expect_event;
 use crate::{Builder, Config, Error, Event};
 
-use bitcoin::{Address, Amount, Txid};
+use bitcoin::{Address, Amount, OutPoint, Txid};
 use bitcoind::bitcoincore_rpc::RpcApi;
 use electrsd::bitcoind::bitcoincore_rpc::bitcoincore_rpc_json::AddressType;
 use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
@@ -83,6 +83,22 @@ fn wait_for_tx(txid: Txid) {
 	}
 }
 
+fn wait_for_outpoint_spend(outpoint: OutPoint) {
+	let tx = get_electrsd().client.transaction_get(&outpoint.txid).unwrap();
+	let txout_script = tx.output.get(outpoint.vout as usize).unwrap().clone().script_pubkey;
+	let mut is_spent = !get_electrsd().client.script_get_history(&txout_script).unwrap().is_empty();
+	loop {
+		if is_spent {
+			break;
+		}
+		is_spent = exponential_backoff_poll(|| {
+			get_electrsd().trigger().unwrap();
+			get_electrsd().client.ping().unwrap();
+			Some(!get_electrsd().client.script_get_history(&txout_script).unwrap().is_empty())
+		});
+	}
+}
+
 fn exponential_backoff_poll<T, F>(mut poll: F) -> T
 where
 	F: FnMut() -> Option<T>,
@@ -254,8 +270,7 @@ fn channel_full_cycle() {
 	expect_event!(node_a, ChannelClosed);
 	expect_event!(node_b, ChannelClosed);
 
-	// Wait a sec so the shutdown tx can 'propagate' via EsploraD to BitcoinD.
-	std::thread::sleep(Duration::from_secs(1));
+	wait_for_outpoint_spend(funding_txo.into_bitcoin_outpoint());
 
 	generate_blocks_and_wait(1);
 	node_a.sync_wallets().unwrap();