rustfmt: Run on lightning/src/offers/invoice_error.rs

This commit is contained in:
Elias Rohrer 2025-01-30 11:54:50 +01:00
parent d6f6024ce2
commit e1cab931c3
No known key found for this signature in database
GPG key ID: 36153082BDF676FD

View file

@ -53,10 +53,7 @@ pub struct ErroneousField {
impl InvoiceError { impl InvoiceError {
/// Creates an [`InvoiceError`] with the given message. /// Creates an [`InvoiceError`] with the given message.
pub fn from_string(s: String) -> Self { pub fn from_string(s: String) -> Self {
Self { Self { erroneous_field: None, message: UntrustedString(s) }
erroneous_field: None,
message: UntrustedString(s),
}
} }
} }
@ -107,10 +104,7 @@ impl Readable for InvoiceError {
impl From<Bolt12SemanticError> for InvoiceError { impl From<Bolt12SemanticError> for InvoiceError {
fn from(error: Bolt12SemanticError) -> Self { fn from(error: Bolt12SemanticError) -> Self {
InvoiceError { InvoiceError { erroneous_field: None, message: UntrustedString(format!("{:?}", error)) }
erroneous_field: None,
message: UntrustedString(format!("{:?}", error)),
}
} }
} }
@ -120,10 +114,7 @@ impl From<SignError> for InvoiceError {
SignError::Signing => "Failed signing invoice", SignError::Signing => "Failed signing invoice",
SignError::Verification(_) => "Failed invoice signature verification", SignError::Verification(_) => "Failed invoice signature verification",
}; };
InvoiceError { InvoiceError { erroneous_field: None, message: UntrustedString(message.to_string()) }
erroneous_field: None,
message: UntrustedString(message.to_string()),
}
} }
} }
@ -132,7 +123,9 @@ mod tests {
use super::{ErroneousField, InvoiceError}; use super::{ErroneousField, InvoiceError};
use crate::ln::msgs::DecodeError; use crate::ln::msgs::DecodeError;
use crate::util::ser::{HighZeroBytesDroppedBigSize, Readable, VecWriter, WithoutLength, Writeable}; use crate::util::ser::{
HighZeroBytesDroppedBigSize, Readable, VecWriter, WithoutLength, Writeable,
};
use crate::util::string::UntrustedString; use crate::util::string::UntrustedString;
#[test] #[test]
@ -149,7 +142,7 @@ mod tests {
Ok(invoice_error) => { Ok(invoice_error) => {
assert_eq!(invoice_error.message, UntrustedString("Invalid value".to_string())); assert_eq!(invoice_error.message, UntrustedString("Invalid value".to_string()));
assert_eq!(invoice_error.erroneous_field, None); assert_eq!(invoice_error.erroneous_field, None);
} },
Err(e) => panic!("Unexpected error: {:?}", e), Err(e) => panic!("Unexpected error: {:?}", e),
} }
} }
@ -174,7 +167,7 @@ mod tests {
invoice_error.erroneous_field, invoice_error.erroneous_field,
Some(ErroneousField { tlv_fieldnum: 42, suggested_value: Some(vec![42; 32]) }), Some(ErroneousField { tlv_fieldnum: 42, suggested_value: Some(vec![42; 32]) }),
); );
} },
Err(e) => panic!("Unexpected error: {:?}", e), Err(e) => panic!("Unexpected error: {:?}", e),
} }
} }
@ -183,10 +176,7 @@ mod tests {
fn parses_invoice_error_without_suggested_value() { fn parses_invoice_error_without_suggested_value() {
let mut writer = VecWriter(Vec::new()); let mut writer = VecWriter(Vec::new());
let invoice_error = InvoiceError { let invoice_error = InvoiceError {
erroneous_field: Some(ErroneousField { erroneous_field: Some(ErroneousField { tlv_fieldnum: 42, suggested_value: None }),
tlv_fieldnum: 42,
suggested_value: None,
}),
message: UntrustedString("Invalid value".to_string()), message: UntrustedString("Invalid value".to_string()),
}; };
invoice_error.write(&mut writer).unwrap(); invoice_error.write(&mut writer).unwrap();
@ -199,7 +189,7 @@ mod tests {
invoice_error.erroneous_field, invoice_error.erroneous_field,
Some(ErroneousField { tlv_fieldnum: 42, suggested_value: None }), Some(ErroneousField { tlv_fieldnum: 42, suggested_value: None }),
); );
} },
Err(e) => panic!("Unexpected error: {:?}", e), Err(e) => panic!("Unexpected error: {:?}", e),
} }
} }