Skip to content

Commit 05517f1

Browse files
committed
f Simplify test code a bit
1 parent 61f6600 commit 05517f1

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lightning-transaction-sync/src/tests.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,11 @@ fn get_electrsd() -> &'static ElectrsD {
5050
}
5151

5252
fn generate_blocks_and_wait(num: usize) {
53+
let _miner = MINER_LOCK.lock().unwrap();
5354
let cur_height = get_bitcoind().client.get_block_count().unwrap();
54-
generate_blocks(num);
55-
wait_for_block(cur_height as usize + num);
56-
}
57-
58-
fn generate_blocks(num: usize) {
5955
let address = get_bitcoind().client.get_new_address(Some("test"), Some(AddressType::Legacy)).unwrap();
6056
let _block_hashes = get_bitcoind().client.generate_to_address(num as u64, &address).unwrap();
57+
wait_for_block(cur_height as usize + num);
6158
}
6259

6360
fn wait_for_block(min_height: usize) {
@@ -92,7 +89,6 @@ where
9289

9390
fn premine() {
9491
PREMINE.get_or_init(|| {
95-
let _miner = MINER_LOCK.lock().unwrap();
9692
generate_blocks_and_wait(101);
9793
});
9894
}

0 commit comments

Comments
 (0)