f Always propagate results

Author: tnull

src/chain/mod.rs

@@ -758,31 +758,33 @@ impl ChainSource {
 				macro_rules! get_and_apply_wallet_update {
 					($sync_future: expr) => {{
 						let now = Instant::now();
-						let update = $sync_future.await?;
-
-						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(())
+						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),
 							},
 							Err(e) => Err(e),
 						}