Skip to content

Commit 5b18696

Browse files
committed
Uses node's runtime in sync_wallets()
1 parent 5586b69 commit 5b18696

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

src/lib.rs

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,39 +1253,38 @@ impl Node {
12531253
if rt_lock.is_none() {
12541254
return Err(Error::NotRunning);
12551255
}
1256+
let runtime = rt_lock.as_ref().unwrap();
12561257

12571258
let chain_source = Arc::clone(&self.chain_source);
12581259
let sync_cman = Arc::clone(&self.channel_manager);
12591260
let sync_cmon = Arc::clone(&self.chain_monitor);
12601261
let sync_sweeper = Arc::clone(&self.output_sweeper);
12611262
tokio::task::block_in_place(move || {
1262-
tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap().block_on(
1263-
async move {
1264-
match chain_source.as_ref() {
1265-
ChainSource::Esplora { .. } => {
1266-
chain_source.update_fee_rate_estimates().await?;
1267-
chain_source
1268-
.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
1269-
.await?;
1270-
chain_source.sync_onchain_wallet().await?;
1271-
},
1272-
ChainSource::Electrum { .. } => {
1273-
chain_source.update_fee_rate_estimates().await?;
1274-
chain_source
1275-
.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
1276-
.await?;
1277-
chain_source.sync_onchain_wallet().await?;
1278-
},
1279-
ChainSource::BitcoindRpc { .. } => {
1280-
chain_source.update_fee_rate_estimates().await?;
1281-
chain_source
1282-
.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
1283-
.await?;
1284-
},
1285-
}
1286-
Ok(())
1287-
},
1288-
)
1263+
runtime.block_on(async move {
1264+
match chain_source.as_ref() {
1265+
ChainSource::Esplora { .. } => {
1266+
chain_source.update_fee_rate_estimates().await?;
1267+
chain_source
1268+
.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
1269+
.await?;
1270+
chain_source.sync_onchain_wallet().await?;
1271+
},
1272+
ChainSource::Electrum { .. } => {
1273+
chain_source.update_fee_rate_estimates().await?;
1274+
chain_source
1275+
.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
1276+
.await?;
1277+
chain_source.sync_onchain_wallet().await?;
1278+
},
1279+
ChainSource::BitcoindRpc { .. } => {
1280+
chain_source.update_fee_rate_estimates().await?;
1281+
chain_source
1282+
.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
1283+
.await?;
1284+
},
1285+
}
1286+
Ok(())
1287+
})
12891288
})
12901289
}
12911290

0 commit comments

Comments
 (0)