exponential backoff fix

Author: joostjager

tests/common/mod.rs

@@ -448,16 +448,10 @@ pub(crate) fn wait_for_block<E: ElectrumApi>(electrs: &E, min_height: usize) {
 }
 
 pub(crate) fn wait_for_tx<E: ElectrumApi>(electrs: &E, txid: Txid) {
-	let mut tx_res = electrs.transaction_get(&txid);
-	loop {
-		if tx_res.is_ok() {
-			break;
-		}
-		tx_res = exponential_backoff_poll(|| {
-			electrs.ping().unwrap();
-			Some(electrs.transaction_get(&txid))
-		});
-	}
+	exponential_backoff_poll(|| {
+		electrs.ping().unwrap();
+		electrs.transaction_get(&txid).ok()
+	});
 }
 
 pub(crate) fn wait_for_outpoint_spend<E: ElectrumApi>(electrs: &E, outpoint: OutPoint) {
@@ -500,9 +494,13 @@ where
 pub(crate) fn premine_and_distribute_funds<E: ElectrumApi>(
 	bitcoind: &BitcoindClient, electrs: &E, addrs: Vec<Address>, amount: Amount,
 ) {
+	println!("JOOST: Premining...");
 	premine_blocks(bitcoind, electrs);
 
+	println!("JOOST: Distributing funds...");
 	distribute_funds_unconfirmed(bitcoind, electrs, addrs, amount);
+
+	println!("JOOST: Generate blocks and wait...");
 	generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 
@@ -530,6 +528,8 @@ pub(crate) fn distribute_funds_unconfirmed<E: ElectrumApi>(
 		.parse()
 		.unwrap();
 
+	println!("JOOST: wait for txid {}", txid);
+
 	wait_for_tx(electrs, txid);
 
 	txid