f - Use u64 instead of Duration for Payee::expiry_time

Author: jkczyz

lightning-invoice/src/payment.rs

@@ -227,7 +227,7 @@ where
 			hash_map::Entry::Vacant(entry) => {
 				let payer = self.payer.node_id();
 				let mut payee = Payee::new(invoice.recover_payee_pub_key())
-					.with_expiry_time(expiry_time_from_unix_epoch(&invoice))
+					.with_expiry_time(expiry_time_from_unix_epoch(&invoice).as_secs())
 					.with_route_hints(invoice.route_hints());
 				if let Some(features) = invoice.features() {
 					payee = payee.with_features(features.clone());
@@ -280,7 +280,8 @@ fn expiry_time_from_unix_epoch(invoice: &Invoice) -> Duration {
 }
 
 fn has_expired(params: &RouteParameters) -> bool {
-	Invoice::is_expired_from_epoch(&SystemTime::UNIX_EPOCH, params.payee.expiry_time.unwrap())
+	let expiry_time = Duration::from_secs(params.payee.expiry_time.unwrap());
+	Invoice::is_expired_from_epoch(&SystemTime::UNIX_EPOCH, expiry_time)
 }
 
 impl<P: Deref, R, L: Deref, E> EventHandler for InvoicePayer<P, R, L, E>
@@ -858,7 +859,7 @@ mod tests {
 
 		fn retry_for_invoice(invoice: &Invoice) -> RouteParameters {
 			let mut payee = Payee::new(invoice.recover_payee_pub_key())
-				.with_expiry_time(expiry_time_from_unix_epoch(invoice))
+				.with_expiry_time(expiry_time_from_unix_epoch(invoice).as_secs())
 				.with_route_hints(invoice.route_hints());
 			if let Some(features) = invoice.features() {
 				payee = payee.with_features(features.clone());

lightning/src/routing/router.rs

@@ -27,7 +27,6 @@ use prelude::*;
 use alloc::collections::BinaryHeap;
 use core::cmp;
 use core::ops::Deref;
-use core::time::Duration;
 
 /// A hop in a route
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -182,8 +181,8 @@ pub struct Payee {
 	/// Hints for routing to the payee, containing channels connecting the payee to public nodes.
 	pub route_hints: Vec<RouteHint>,
 
-	/// Expiration of a payment to the payee, relative to a user-defined epoch.
-	pub expiry_time: Option<Duration>,
+	/// Expiration of a payment to the payee, in seconds relative to the UNIX epoch.
+	pub expiry_time: Option<u64>,
 }
 
 impl_writeable_tlv_based!(Payee, {
@@ -223,8 +222,8 @@ impl Payee {
 		Self { route_hints, ..self }
 	}
 
-	/// Includes a payment expiration relative to a user-defined epoch.
-	pub fn with_expiry_time(self, expiry_time: Duration) -> Self {
+	/// Includes a payment expiration in seconds relative to the UNIX epoch.
+	pub fn with_expiry_time(self, expiry_time: u64) -> Self {
 		Self { expiry_time: Some(expiry_time), ..self }
 	}
 }

lightning/src/util/ser.rs

@@ -27,7 +27,6 @@ use bitcoin::consensus::Encodable;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hash_types::{Txid, BlockHash};
 use core::marker::Sized;
-use core::time::Duration;
 use ln::msgs::DecodeError;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 
@@ -912,16 +911,3 @@ impl Readable for String {
 		Ok(ret)
 	}
 }
-
-impl Writeable for Duration {
-	#[inline]
-	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		self.as_secs().write(w)
-	}
-}
-impl Readable for Duration {
-	#[inline]
-	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		Ok(Duration::from_secs(Readable::read(r)?))
-	}
-}