f use consistent variable names

Author: TheBlueMatt

lightning-block-sync/src/init.rs

@@ -231,8 +231,8 @@ impl<'a, L: chain::Listen + ?Sized> chain::Listen for DynamicChainListener<'a, L
 		unreachable!()
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
-		self.0.blocks_disconnected(new_best_block)
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
+		self.0.blocks_disconnected(fork_point)
 	}
 }
 
@@ -258,7 +258,7 @@ impl<'a, L: chain::Listen + ?Sized> chain::Listen for ChainListenerSet<'a, L> {
 		}
 	}
 
-	fn blocks_disconnected(&self, _new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, _fork_point: BestBlock) {
 		unreachable!()
 	}
 }

lightning-block-sync/src/lib.rs

@@ -405,8 +405,8 @@ where
 			}
 		}
 		if let Some(block) = disconnected_blocks.last() {
-			let best_block = BestBlock::new(block.header.prev_blockhash, block.height - 1);
-			self.chain_listener.blocks_disconnected(best_block);
+			let fork_point = BestBlock::new(block.header.prev_blockhash, block.height - 1);
+			self.chain_listener.blocks_disconnected(fork_point);
 		}
 	}
 

lightning-block-sync/src/test_utils.rs

@@ -204,7 +204,7 @@ impl chain::Listen for NullChainListener {
 		&self, _header: &Header, _txdata: &chain::transaction::TransactionData, _height: u32,
 	) {
 	}
-	fn blocks_disconnected(&self, _new_best_block: BestBlock) {}
+	fn blocks_disconnected(&self, _fork_point: BestBlock) {}
 }
 
 pub struct MockChainListener {
@@ -265,17 +265,17 @@ impl chain::Listen for MockChainListener {
 		}
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
 		match self.expected_blocks_disconnected.borrow_mut().pop_front() {
 			None => {
 				panic!(
 					"Unexpected block(s) disconnected {} at height {}",
-					new_best_block.block_hash, new_best_block.height,
+					fork_point.block_hash, fork_point.height,
 				);
 			},
 			Some(disconnected_block) => {
-				assert_eq!(new_best_block.block_hash, disconnected_block.header.prev_blockhash);
-				assert_eq!(new_best_block.height, disconnected_block.height - 1);
+				assert_eq!(fork_point.block_hash, disconnected_block.header.prev_blockhash);
+				assert_eq!(fork_point.height, disconnected_block.height - 1);
 			},
 		}
 	}

lightning-liquidity/src/manager.rs

@@ -583,9 +583,9 @@ where
 		self.best_block_updated(header, height);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
 		if let Some(best_block) = self.best_block.write().unwrap().as_mut() {
-			*best_block = new_best_block;
+			*best_block = fork_point;
 		}
 
 		// TODO: Call block_disconnected on all sub-modules that require it, e.g., LSPS1MessageHandler.

lightning/src/chain/chainmonitor.rs

@@ -929,17 +929,17 @@ where
 		self.event_notifier.notify();
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
 		let monitor_states = self.monitors.read().unwrap();
 		log_debug!(
 			self.logger,
 			"Block(s) removed to height {} via blocks_disconnected. New best block is {}",
-			new_best_block.height,
-			new_best_block.block_hash,
+			fork_point.height,
+			fork_point.block_hash,
 		);
 		for monitor_state in monitor_states.values() {
 			monitor_state.monitor.blocks_disconnected(
-				new_best_block,
+				fork_point,
 				&*self.broadcaster,
 				&*self.fee_estimator,
 				&self.logger,

lightning/src/chain/channelmonitor.rs

@@ -2176,15 +2176,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 	/// Determines if the disconnected block contained any transactions of interest and updates
 	/// appropriately.
 	pub fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
-		&self, new_best_block: BestBlock, broadcaster: B, fee_estimator: F, logger: &L,
+		&self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &L,
 	) where
 		B::Target: BroadcasterInterface,
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
 		let mut inner = self.inner.lock().unwrap();
 		let logger = WithChannelMonitor::from_impl(logger, &*inner, None);
-		inner.blocks_disconnected(new_best_block, broadcaster, fee_estimator, &logger)
+		inner.blocks_disconnected(fork_point, broadcaster, fee_estimator, &logger)
 	}
 
 	/// Processes transactions confirmed in a block with the given header and height, returning new
@@ -5112,12 +5112,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 
 	#[rustfmt::skip]
 	fn blocks_disconnected<B: Deref, F: Deref, L: Deref>(
-		&mut self, new_best_block: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
+		&mut self, fork_point: BestBlock, broadcaster: B, fee_estimator: F, logger: &WithChannelMonitor<L>
 	) where B::Target: BroadcasterInterface,
 		F::Target: FeeEstimator,
 		L::Target: Logger,
 	{
-		let new_height = new_best_block.height;
+		let new_height = fork_point.height;
 		log_trace!(logger, "Block(s) disconnected to height {}", new_height);
 
 		//We may discard:
@@ -5131,7 +5131,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			new_height + 1, broadcaster, conf_target, &self.destination_script, &bounded_fee_estimator, logger
 		);
 
-		self.best_block = new_best_block;
+		self.best_block = fork_point;
 	}
 
 	#[rustfmt::skip]
@@ -5576,8 +5576,8 @@ where
 		self.0.block_connected(header, txdata, height, &*self.1, &*self.2, &self.3);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
-		self.0.blocks_disconnected(new_best_block, &*self.1, &*self.2, &self.3);
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
+		self.0.blocks_disconnected(fork_point, &*self.1, &*self.2, &self.3);
 	}
 }
 

lightning/src/chain/mod.rs

@@ -398,8 +398,8 @@ impl<T: Listen> Listen for dyn core::ops::Deref<Target = T> {
 		(**self).filtered_block_connected(header, txdata, height);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
-		(**self).blocks_disconnected(new_best_block);
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
+		(**self).blocks_disconnected(fork_point);
 	}
 }
 
@@ -413,9 +413,9 @@ where
 		self.1.filtered_block_connected(header, txdata, height);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
-		self.0.blocks_disconnected(new_best_block);
-		self.1.blocks_disconnected(new_best_block);
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
+		self.0.blocks_disconnected(fork_point);
+		self.1.blocks_disconnected(fork_point);
 	}
 }
 

lightning/src/ln/channelmanager.rs

@@ -12543,20 +12543,20 @@ where
 		self.best_block_updated(header, height);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
 		let _persistence_guard =
 			PersistenceNotifierGuard::optionally_notify_skipping_background_events(
 				self,
 				|| -> NotifyOption { NotifyOption::DoPersist },
 			);
 		{
 			let mut best_block = self.best_block.write().unwrap();
-			*best_block = new_best_block;
+			*best_block = fork_point;
 		}
 
-		self.do_chain_event(Some(new_best_block.height), |channel| {
+		self.do_chain_event(Some(fork_point.height), |channel| {
 			channel.best_block_updated(
-				new_best_block.height,
+				fork_point.height,
 				0,
 				self.chain_hash,
 				&self.node_signer,

lightning/src/util/sweep.rs

@@ -691,13 +691,13 @@ where
 		self.best_block_updated_internal(&mut state_lock, header, height);
 	}
 
-	fn blocks_disconnected(&self, new_best_block: BestBlock) {
+	fn blocks_disconnected(&self, fork_point: BestBlock) {
 		let mut state_lock = self.sweeper_state.lock().unwrap();
 
-		state_lock.best_block = new_best_block;
+		state_lock.best_block = fork_point;
 
 		for output_info in state_lock.outputs.iter_mut() {
-			if output_info.status.confirmation_height() > Some(new_best_block.height) {
+			if output_info.status.confirmation_height() > Some(fork_point.height) {
 				output_info.status.unconfirmed();
 			}
 		}