Drop passing now to hold_time

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -7500,7 +7500,6 @@ where
 					true
 				}
 			});
-			let now = duration_since_epoch();
 			pending_outbound_htlcs.retain(|htlc| {
 				if let &OutboundHTLCState::AwaitingRemovedRemoteRevoke(ref outcome) = &htlc.state {
 					log_trace!(
@@ -7511,7 +7510,7 @@ where
 					// We really want take() here, but, again, non-mut ref :(
 					match outcome.clone() {
 						OutboundHTLCOutcome::Failure(mut reason) => {
-							hold_time(htlc.send_timestamp, now).map(|hold_time| {
+							hold_time_since(htlc.send_timestamp).map(|hold_time| {
 								reason.set_hold_time(hold_time);
 							});
 							revoked_htlcs.push((htlc.source.clone(), htlc.payment_hash, reason));
@@ -13598,7 +13597,7 @@ where
 	}
 }
 
-pub(crate) fn duration_since_epoch() -> Option<Duration> {
+fn duration_since_epoch() -> Option<Duration> {
 	#[cfg(not(feature = "std"))]
 	let now = None;
 
@@ -13614,9 +13613,9 @@ pub(crate) fn duration_since_epoch() -> Option<Duration> {
 
 /// Returns the time expressed in hold time units (1 unit = 100 ms) that has elapsed between send_timestamp and now. If
 /// any of the arguments are `None`, returns `None`.
-pub(crate) fn hold_time(send_timestamp: Option<Duration>, now: Option<Duration>) -> Option<u32> {
+pub(crate) fn hold_time_since(send_timestamp: Option<Duration>) -> Option<u32> {
 	send_timestamp.and_then(|t| {
-		now.map(|now| {
+		duration_since_epoch().map(|now| {
 			let elapsed = now.saturating_sub(t).as_millis() / HOLD_TIME_UNIT_MILLIS;
 			u32::try_from(elapsed).unwrap_or(u32::MAX)
 		})

lightning/src/ln/channelmanager.rs

@@ -60,11 +60,10 @@ use crate::ln::chan_utils::selected_commitment_sat_per_1000_weight;
 // Since this struct is returned in `list_channels` methods, expose it here in case users want to
 // construct one themselves.
 use crate::ln::channel::{
-	self, hold_time, Channel, ChannelError, ChannelUpdateStatus, FundedChannel, InboundV1Channel,
-	OutboundV1Channel, ReconnectionMsg, ShutdownResult, UpdateFulfillCommitFetch,
-	WithChannelContext,
+	self, hold_time_since, Channel, ChannelError, ChannelUpdateStatus, FundedChannel,
+	InboundV1Channel, OutboundV1Channel, PendingV2Channel, ReconnectionMsg, ShutdownResult,
+	UpdateFulfillCommitFetch, WithChannelContext,
 };
-use crate::ln::channel::{duration_since_epoch, PendingV2Channel};
 use crate::ln::channel_state::ChannelDetails;
 use crate::ln::inbound_payment;
 use crate::ln::msgs;
@@ -8299,8 +8298,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					RAAMonitorUpdateBlockingAction::from_prev_hop_data(&hop_data);
 
 				// Obtain hold time, if available.
-				let now = duration_since_epoch();
-				let hold_time = hold_time(send_timestamp, now).unwrap_or(0);
+				let hold_time = hold_time_since(send_timestamp).unwrap_or(0);
 
 				// If attribution data was received from downstream, we shift it and get it ready for adding our hold
 				// time. Note that fulfilled HTLCs take a fast path to the incoming side. We don't need to wait for RAA