f Make it a closure

Author: tnull

src/chain/mod.rs

@@ -756,12 +756,8 @@ impl ChainSource {
 				let incremental_sync =
 					node_metrics.read().unwrap().latest_onchain_wallet_sync_timestamp.is_some();
 
-				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 {
+				let apply_wallet_update =
+					|update_res: Result<BdkUpdate, Error>, now: Instant| match update_res {
 						Ok(update) => match onchain_wallet.apply_update(update) {
 							Ok(()) => {
 								log_info!(
@@ -789,8 +785,7 @@ impl ChainSource {
 							Err(e) => Err(e),
 						},
 						Err(e) => Err(e),
-					}
-				}
+					};
 
 				let cached_txs = onchain_wallet.get_cached_txs();
 
@@ -801,30 +796,14 @@ impl ChainSource {
 
 					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),
-					)
+					apply_wallet_update(update_res, now)
 				} 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);
 					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),
-					)
+					apply_wallet_update(update_res, now)
 				};
 
 				onchain_wallet_sync_status.lock().unwrap().propagate_result_to_subscribers(res);