f Use fn instead of macro to apply wallet updates

Author: tnull

src/chain/mod.rs

@@ -39,6 +39,7 @@ use lightning_block_sync::poll::{ChainPoller, ChainTip, ValidatedBlockHeader};
 use lightning_block_sync::SpvClient;
 
 use bdk_esplora::EsploraAsyncExt;
+use bdk_wallet::Update as BdkUpdate;
 
 use esplora_client::AsyncClient as EsploraAsyncClient;
 
@@ -755,40 +756,40 @@ impl ChainSource {
 				let incremental_sync =
 					node_metrics.read().unwrap().latest_onchain_wallet_sync_timestamp.is_some();
 
-				macro_rules! get_and_apply_wallet_update {
-					($sync_future: expr) => {{
-						let now = Instant::now();
-						let update_res = $sync_future.await;
-						match update_res {
-							Ok(update) => match onchain_wallet.apply_update(update) {
-								Ok(()) => {
-									log_info!(
-										logger,
-										"{} of on-chain wallet finished in {}ms.",
-										if incremental_sync { "Incremental sync" } else { "Sync" },
-										now.elapsed().as_millis()
-									);
-									let unix_time_secs_opt = SystemTime::now()
-										.duration_since(UNIX_EPOCH)
-										.ok()
-										.map(|d| d.as_secs());
-									{
-										let mut locked_node_metrics = node_metrics.write().unwrap();
-										locked_node_metrics.latest_onchain_wallet_sync_timestamp =
-											unix_time_secs_opt;
-										write_node_metrics(
-											&*locked_node_metrics,
-											Arc::clone(&kv_store),
-											Arc::clone(&logger),
-										)?;
-									}
-									Ok(())
-								},
-								Err(e) => Err(e),
+				fn apply_wallet_update(
+					update_res: Result<BdkUpdate, Error>, incremental_sync: bool, now: Instant,
+					node_metrics: Arc<RwLock<NodeMetrics>>, onchain_wallet: Arc<Wallet>,
+					kv_store: Arc<DynStore>, logger: Arc<Logger>,
+				) -> Result<(), Error> {
+					match update_res {
+						Ok(update) => match onchain_wallet.apply_update(update) {
+							Ok(()) => {
+								log_info!(
+									logger,
+									"{} of on-chain wallet finished in {}ms.",
+									if incremental_sync { "Incremental sync" } else { "Sync" },
+									now.elapsed().as_millis()
+								);
+								let unix_time_secs_opt = SystemTime::now()
+									.duration_since(UNIX_EPOCH)
+									.ok()
+									.map(|d| d.as_secs());
+								{
+									let mut locked_node_metrics = node_metrics.write().unwrap();
+									locked_node_metrics.latest_onchain_wallet_sync_timestamp =
+										unix_time_secs_opt;
+									write_node_metrics(
+										&*locked_node_metrics,
+										Arc::clone(&kv_store),
+										Arc::clone(&logger),
+									)?;
+								}
+								Ok(())
 							},
 							Err(e) => Err(e),
-						}
-					}};
+						},
+						Err(e) => Err(e),
+					}
 				}
 
 				let cached_txs = onchain_wallet.get_cached_txs();
@@ -797,12 +798,33 @@ impl ChainSource {
 					let incremental_sync_request = onchain_wallet.get_incremental_sync_request();
 					let incremental_sync_fut = electrum_client
 						.get_incremental_sync_wallet_update(incremental_sync_request, cached_txs);
-					get_and_apply_wallet_update!(incremental_sync_fut)
+
+					let now = Instant::now();
+					let update_res = incremental_sync_fut.await.map(|u| u.into());
+					apply_wallet_update(
+						update_res,
+						incremental_sync,
+						now,
+						Arc::clone(&node_metrics),
+						Arc::clone(&onchain_wallet),
+						Arc::clone(&kv_store),
+						Arc::clone(&logger),
+					)
 				} else {
 					let full_scan_request = onchain_wallet.get_full_scan_request();
 					let full_scan_fut =
 						electrum_client.get_full_scan_wallet_update(full_scan_request, cached_txs);
-					get_and_apply_wallet_update!(full_scan_fut)
+					let now = Instant::now();
+					let update_res = full_scan_fut.await.map(|u| u.into());
+					apply_wallet_update(
+						update_res,
+						incremental_sync,
+						now,
+						Arc::clone(&node_metrics),
+						Arc::clone(&onchain_wallet),
+						Arc::clone(&kv_store),
+						Arc::clone(&logger),
+					)
 				};
 
 				onchain_wallet_sync_status.lock().unwrap().propagate_result_to_subscribers(res);