X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-invoice%2Fsrc%2Flib.rs;h=5aacf53966c59a075e602ad059237b24eac51753;hb=c06ab02900d454d48f75a54c8ab5c80785acbf8e;hp=20bc5218ae5524d35bd2f4a15157e58ca08b6bf7;hpb=8886d1dc76ce7bd815634c738d114e7d3572c4fe;p=rust-lightning

diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
index 20bc5218..5aacf539 100644
--- a/lightning-invoice/src/lib.rs
+++ b/lightning-invoice/src/lib.rs
@@ -101,7 +101,7 @@ mod sync;
 /// Errors that indicate what is wrong with the invoice. They have some granularity for debug
 /// reasons, but should generally result in an "invalid BOLT11 invoice" message for the user.
 #[allow(missing_docs)]
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum ParseError {
 	Bech32Error(bech32::Error),
 	ParseAmountError(ParseIntError),
@@ -129,7 +129,7 @@ pub enum ParseError {
 /// Indicates that something went wrong while parsing or validating the invoice. Parsing errors
 /// should be mostly seen as opaque and are only there for debugging reasons. Semantic errors
 /// like wrong signatures, missing fields etc. could mean that someone tampered with the invoice.
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum ParseOrSemanticError {
 	/// The invoice couldn't be decoded
 	ParseError(ParseError),
@@ -540,7 +540,8 @@ impl<D: tb::Bool, H: tb::Bool, T: tb::Bool, C: tb::Bool, S: tb::Bool> InvoiceBui
 		self
 	}
 
-	/// Sets the expiry time
+	/// Sets the expiry time, dropping the subsecond part (which is not representable in BOLT 11
+	/// invoices).
 	pub fn expiry_time(mut self, expiry_time: Duration) -> Self {
 		self.tagged_fields.push(TaggedField::ExpiryTime(ExpiryTime::from_duration(expiry_time)));
 		self
@@ -632,7 +633,8 @@ impl<D: tb::Bool, H: tb::Bool, C: tb::Bool, S: tb::Bool> InvoiceBuilder<D, H, tb
 		self.set_flags()
 	}
 
-	/// Sets the timestamp to a duration since the Unix epoch.
+	/// Sets the timestamp to a duration since the Unix epoch, dropping the subsecond part (which
+	/// is not representable in BOLT 11 invoices).
 	pub fn duration_since_epoch(mut self, time: Duration) -> InvoiceBuilder<D, H, tb::True, C, S> {
 		match PositiveTimestamp::from_duration_since_epoch(time) {
 			Ok(t) => self.timestamp = Some(t),
@@ -960,12 +962,18 @@ impl PositiveTimestamp {
 	///
 	/// Otherwise, returns a [`CreationError::TimestampOutOfBounds`].
 	pub fn from_unix_timestamp(unix_seconds: u64) -> Result<Self, CreationError> {
-		Self::from_duration_since_epoch(Duration::from_secs(unix_seconds))
+		if unix_seconds <= MAX_TIMESTAMP {
+			Ok(Self(Duration::from_secs(unix_seconds)))
+		} else {
+			Err(CreationError::TimestampOutOfBounds)
+		}
 	}
 
 	/// Creates a `PositiveTimestamp` from a [`SystemTime`] with a corresponding Unix timestamp in
 	/// the range `0..=MAX_TIMESTAMP`.
 	///
+	/// Note that the subsecond part is dropped as it is not representable in BOLT 11 invoices.
+	///
 	/// Otherwise, returns a [`CreationError::TimestampOutOfBounds`].
 	#[cfg(feature = "std")]
 	pub fn from_system_time(time: SystemTime) -> Result<Self, CreationError> {
@@ -977,13 +985,11 @@ impl PositiveTimestamp {
 	/// Creates a `PositiveTimestamp` from a [`Duration`] since the Unix epoch in the range
 	/// `0..=MAX_TIMESTAMP`.
 	///
+	/// Note that the subsecond part is dropped as it is not representable in BOLT 11 invoices.
+	///
 	/// Otherwise, returns a [`CreationError::TimestampOutOfBounds`].
 	pub fn from_duration_since_epoch(duration: Duration) -> Result<Self, CreationError> {
-		if duration.as_secs() <= MAX_TIMESTAMP {
-			Ok(PositiveTimestamp(duration))
-		} else {
-			Err(CreationError::TimestampOutOfBounds)
-		}
+		Self::from_unix_timestamp(duration.as_secs())
 	}
 
 	/// Returns the Unix timestamp representing the stored time
@@ -1356,9 +1362,9 @@ impl ExpiryTime {
 		ExpiryTime(Duration::from_secs(seconds))
 	}
 
-	/// Construct an `ExpiryTime` from a `Duration`.
+	/// Construct an `ExpiryTime` from a `Duration`, dropping the sub-second part.
 	pub fn from_duration(duration: Duration) -> ExpiryTime {
-		ExpiryTime(duration)
+		Self::from_seconds(duration.as_secs())
 	}
 
 	/// Returns the expiry time in seconds