Set pending_sync when last-minute check fails in Electrum

Author: tnull

lightning-transaction-sync/src/electrum.rs

@@ -112,17 +112,31 @@ 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.
-							if self.check_update_tip(&mut tip_header, &mut tip_height)?
-							{
-								log_debug!(self.logger,
-									"Encountered inconsistency during transaction sync, restarting.");
-								sync_state.pending_sync = true;
-								continue;
+							match self.check_update_tip(&mut tip_header, &mut tip_height) {
+								Ok(false) => {
+									num_unconfirmed += unconfirmed_txs.len();
+									sync_state.sync_unconfirmed_transactions(
+										&confirmables,
+										unconfirmed_txs
+									);
+								}
+								Ok(true) => {
+									log_debug!(self.logger,
+										"Encountered inconsistency during transaction sync, restarting.");
+									sync_state.pending_sync = true;
+									continue;
+								}
+								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.
@@ -146,19 +160,31 @@ 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.
-						if self.check_update_tip(&mut tip_header, &mut tip_height)?
-						{
-							log_debug!(self.logger,
-								"Encountered inconsistency during transaction sync, restarting.");
-							sync_state.pending_sync = true;
-							continue;
+						match self.check_update_tip(&mut tip_header, &mut tip_height) {
+							Ok(false) => {
+								num_confirmed += confirmed_txs.len();
+								sync_state.sync_confirmed_transactions(
+									&confirmables,
+									confirmed_txs
+								);
+							}
+							Ok(true) => {
+								log_debug!(self.logger,
+									"Encountered inconsistency during transaction sync, restarting.");
+								sync_state.pending_sync = true;
+								continue;
+							}
+							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.