Refactor handling of InvoiceRequest

[rust-lightning] / lightning / src / offers / invoice_error.rs

diff --git a/lightning/src/offers/invoice_error.rs b/lightning/src/offers/invoice_error.rs
index 441dae265cbb4fb9c9ed8d527e6b9b65c1e61ad1..5ae5f457a84822172d970035286a562be0d67973 100644 (file)
--- 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`].
@@ -50,10 +52,10 @@ pub struct ErroneousField {
 
 impl InvoiceError {
        /// Creates an [`InvoiceError`] with the given message.
-       pub fn from_str(s: &str) -> Self {
+       pub fn from_string(s: String) -> Self {
                Self {
                        erroneous_field: None,
-                       message: UntrustedString(s.to_string()),
+                       message: UntrustedString(s),
                }
        }
 }
@@ -112,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};