f DROPME TRY sync_wallets

Author: tnull

src/lib.rs

@@ -1239,27 +1239,55 @@ impl Node {
 		let sync_cman = Arc::clone(&self.channel_manager);
 		let sync_cmon = Arc::clone(&self.chain_monitor);
 		let sync_sweeper = Arc::clone(&self.output_sweeper);
-		self.runtime.block_on(async move {
-			match chain_source.as_ref() {
-				ChainSource::Esplora { .. } => {
-					chain_source.update_fee_rate_estimates().await?;
-					chain_source.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper).await?;
-					chain_source.sync_onchain_wallet().await?;
-				},
-				ChainSource::Electrum { .. } => {
-					chain_source.update_fee_rate_estimates().await?;
-					chain_source.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper).await?;
-					chain_source.sync_onchain_wallet().await?;
-				},
-				ChainSource::BitcoindRpc { .. } => {
-					chain_source.update_fee_rate_estimates().await?;
-					chain_source
-						.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
-						.await?;
-				},
-			}
-			Ok(())
+		tokio::task::block_in_place(move || {
+			tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap().block_on(
+				async move {
+					match chain_source.as_ref() {
+						ChainSource::Esplora { .. } => {
+							chain_source.update_fee_rate_estimates().await?;
+							chain_source
+								.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
+								.await?;
+							chain_source.sync_onchain_wallet().await?;
+						},
+						ChainSource::Electrum { .. } => {
+							chain_source.update_fee_rate_estimates().await?;
+							chain_source
+								.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper)
+								.await?;
+							chain_source.sync_onchain_wallet().await?;
+						},
+						ChainSource::BitcoindRpc { .. } => {
+							chain_source.update_fee_rate_estimates().await?;
+							chain_source
+								.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
+								.await?;
+						},
+					}
+					Ok(())
+				})
 		})
+		//self.runtime.block_on(async move {
+		//	match chain_source.as_ref() {
+		//		ChainSource::Esplora { .. } => {
+		//			chain_source.update_fee_rate_estimates().await?;
+		//			chain_source.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper).await?;
+		//			chain_source.sync_onchain_wallet().await?;
+		//		},
+		//		ChainSource::Electrum { .. } => {
+		//			chain_source.update_fee_rate_estimates().await?;
+		//			chain_source.sync_lightning_wallet(sync_cman, sync_cmon, sync_sweeper).await?;
+		//			chain_source.sync_onchain_wallet().await?;
+		//		},
+		//		ChainSource::BitcoindRpc { .. } => {
+		//			chain_source.update_fee_rate_estimates().await?;
+		//			chain_source
+		//				.poll_and_update_listeners(sync_cman, sync_cmon, sync_sweeper)
+		//				.await?;
+		//		},
+		//	}
+		//	Ok(())
+		//})
 	}
 
 	/// Close a previously opened channel.