X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-transaction-sync%2Fsrc%2Fesplora.rs;h=eb52faf33648cfb173985b13c29ecb9d754fdb87;hb=037954b3131e0c5a5ef642048998db122349d5d7;hp=3f0d4828355161ac0a807a9004636ad3961814ac;hpb=82f4c10e18f9cbe5359a20433fa7638a66c4f96f;p=rust-lightning

diff --git a/lightning-transaction-sync/src/esplora.rs b/lightning-transaction-sync/src/esplora.rs
index 3f0d4828..eb52faf3 100644
--- a/lightning-transaction-sync/src/esplora.rs
+++ b/lightning-transaction-sync/src/esplora.rs
@@ -14,7 +14,6 @@ use esplora_client::r#async::AsyncClient;
 #[cfg(not(feature = "async-interface"))]
 use esplora_client::blocking::BlockingClient;
 
-use std::time::Instant;
 use std::collections::HashSet;
 use core::ops::Deref;
 
@@ -91,7 +90,8 @@ where
 		let mut sync_state = self.sync_state.lock().await;
 
 		log_trace!(self.logger, "Starting transaction sync.");
-		let start_time = Instant::now();
+		#[cfg(feature = "time")]
+		let start_time = std::time::Instant::now();
 		let mut num_confirmed = 0;
 		let mut num_unconfirmed = 0;
 
@@ -114,16 +114,32 @@ where
 						Ok(unconfirmed_txs) => {
 							// Double-check the tip hash. If it changed, a reorg happened since
 							// we started syncing and we need to restart last-minute.
-							let check_tip_hash = maybe_await!(self.client.get_tip_hash())?;
-							if check_tip_hash != tip_hash {
-								tip_hash = check_tip_hash;
-
-								log_debug!(self.logger, "Encountered inconsistency during transaction sync, restarting.");
-								sync_state.pending_sync = true;
-								continue;
+							match maybe_await!(self.client.get_tip_hash()) {
+								Ok(check_tip_hash) => {
+									if check_tip_hash != tip_hash {
+										tip_hash = check_tip_hash;
+
+										log_debug!(self.logger, "Encountered inconsistency during transaction sync, restarting.");
+										sync_state.pending_sync = true;
+										continue;
+									}
+									num_unconfirmed += unconfirmed_txs.len();
+									sync_state.sync_unconfirmed_transactions(
+										&confirmables,
+										unconfirmed_txs
+									);
+								}
+								Err(err) => {
+									// (Semi-)permanent failure, retry later.
+									log_error!(self.logger,
+										"Failed during transaction sync, aborting. Synced so far: {} confirmed, {} unconfirmed.",
+										num_confirmed,
+										num_unconfirmed
+										);
+									sync_state.pending_sync = true;
+									return Err(TxSyncError::from(err));
+								}
 							}
-							num_unconfirmed += unconfirmed_txs.len();
-							sync_state.sync_unconfirmed_transactions(&confirmables, unconfirmed_txs);
 						},
 						Err(err) => {
 							// (Semi-)permanent failure, retry later.
@@ -162,17 +178,33 @@ where
 					Ok(confirmed_txs) => {
 						// Double-check the tip hash. If it changed, a reorg happened since
 						// we started syncing and we need to restart last-minute.
-						let check_tip_hash = maybe_await!(self.client.get_tip_hash())?;
-						if check_tip_hash != tip_hash {
-							tip_hash = check_tip_hash;
-							continue;
+						match maybe_await!(self.client.get_tip_hash()) {
+							Ok(check_tip_hash) => {
+								if check_tip_hash != tip_hash {
+									tip_hash = check_tip_hash;
+
+									log_debug!(self.logger,
+										"Encountered inconsistency during transaction sync, restarting.");
+									sync_state.pending_sync = true;
+									continue;
+								}
+								num_confirmed += confirmed_txs.len();
+								sync_state.sync_confirmed_transactions(
+									&confirmables,
+									confirmed_txs
+								);
+							}
+							Err(err) => {
+								// (Semi-)permanent failure, retry later.
+								log_error!(self.logger,
+									"Failed during transaction sync, aborting. Synced so far: {} confirmed, {} unconfirmed.",
+									num_confirmed,
+									num_unconfirmed
+								);
+								sync_state.pending_sync = true;
+								return Err(TxSyncError::from(err));
+							}
 						}
-
-						num_confirmed += confirmed_txs.len();
-						sync_state.sync_confirmed_transactions(
-							&confirmables,
-							confirmed_txs,
-						);
 					}
 					Err(InternalError::Inconsistency) => {
 						// Immediately restart syncing when we encounter any inconsistencies.
@@ -195,8 +227,12 @@ where
 				sync_state.pending_sync = false;
 			}
 		}
+		#[cfg(feature = "time")]
 		log_debug!(self.logger, "Finished transaction sync at tip {} in {}ms: {} confirmed, {} unconfirmed.",
 				tip_hash, start_time.elapsed().as_millis(), num_confirmed, num_unconfirmed);
+		#[cfg(not(feature = "time"))]
+		log_debug!(self.logger, "Finished transaction sync at tip {}: {} confirmed, {} unconfirmed.",
+				tip_hash, num_confirmed, num_unconfirmed);
 		Ok(())
 	}