X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Foffers%2Finvoice_error.rs;h=5ae5f457a84822172d970035286a562be0d67973;hb=478911d42a8b47020511bdcb793756723f3801be;hp=f587b271d12d84e97031391044025f91df0dab65;hpb=0211daa48ba8233ad7dbf2864ca72e0150051c68;p=rust-lightning

diff --git a/lightning/src/offers/invoice_error.rs b/lightning/src/offers/invoice_error.rs
index f587b271..5ae5f457 100644
--- a/lightning/src/offers/invoice_error.rs
+++ b/lightning/src/offers/invoice_error.rs
@@ -11,10 +11,12 @@
 
 use crate::io;
 use crate::ln::msgs::DecodeError;
+use crate::offers::merkle::SignError;
 use crate::offers::parse::Bolt12SemanticError;
 use crate::util::ser::{HighZeroBytesDroppedBigSize, Readable, WithoutLength, Writeable, Writer};
 use crate::util::string::UntrustedString;
 
+#[allow(unused_imports)]
 use crate::prelude::*;
 
 /// An error in response to an [`InvoiceRequest`] or an [`Bolt12Invoice`].
@@ -48,6 +50,16 @@ pub struct ErroneousField {
 	pub suggested_value: Option<Vec<u8>>,
 }
 
+impl InvoiceError {
+	/// Creates an [`InvoiceError`] with the given message.
+	pub fn from_string(s: String) -> Self {
+		Self {
+			erroneous_field: None,
+			message: UntrustedString(s),
+		}
+	}
+}
+
 impl core::fmt::Display for InvoiceError {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 		self.message.fmt(f)
@@ -102,6 +114,19 @@ impl From<Bolt12SemanticError> for InvoiceError {
 	}
 }
 
+impl From<SignError> for InvoiceError {
+	fn from(error: SignError) -> Self {
+		let message = match error {
+			SignError::Signing => "Failed signing invoice",
+			SignError::Verification(_) => "Failed invoice signature verification",
+		};
+		InvoiceError {
+			erroneous_field: None,
+			message: UntrustedString(message.to_string()),
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::{ErroneousField, InvoiceError};