projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2430 from TheBlueMatt/2023-07-116-bindings-part-1
[rust-lightning]
/
lightning
/
src
/
onion_message
/
offers.rs
diff --git
a/lightning/src/onion_message/offers.rs
b/lightning/src/onion_message/offers.rs
index f82afdd618a5bfa78ac02a7e0bfd6476cac4bbdd..9a1f59b84592eac465b718e8ee89c6037c24423e 100644
(file)
--- a/
lightning/src/onion_message/offers.rs
+++ b/
lightning/src/onion_message/offers.rs
@@
-14,8
+14,8
@@
use crate::io::{self, Read};
use crate::ln::msgs::DecodeError;
use crate::offers::invoice_error::InvoiceError;
use crate::offers::invoice_request::InvoiceRequest;
use crate::ln::msgs::DecodeError;
use crate::offers::invoice_error::InvoiceError;
use crate::offers::invoice_request::InvoiceRequest;
-use crate::offers::invoice::Invoice;
-use crate::offers::parse::ParseError;
+use crate::offers::invoice::
Bolt12
Invoice;
+use crate::offers::parse::
Bolt12
ParseError;
use crate::util::logger::Logger;
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::logger::Logger;
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
@@
-30,8
+30,8
@@
const INVOICE_ERROR_TLV_TYPE: u64 = 68;
///
/// [`OnionMessage`]: crate::ln::msgs::OnionMessage
pub trait OffersMessageHandler {
///
/// [`OnionMessage`]: crate::ln::msgs::OnionMessage
pub trait OffersMessageHandler {
- /// Handles the given message by either responding with an [`
Invoice`], sending a payment, or
- /// replying with an error.
+ /// Handles the given message by either responding with an [`
Bolt12Invoice`], sending a payment,
+ ///
or
replying with an error.
fn handle_message(&self, message: OffersMessage) -> Option<OffersMessage>;
}
fn handle_message(&self, message: OffersMessage) -> Option<OffersMessage>;
}
@@
-40,15
+40,15
@@
pub trait OffersMessageHandler {
/// [`OnionMessage`]: crate::ln::msgs::OnionMessage
#[derive(Debug)]
pub enum OffersMessage {
/// [`OnionMessage`]: crate::ln::msgs::OnionMessage
#[derive(Debug)]
pub enum OffersMessage {
- /// A request for a
n [`
Invoice`] for a particular [`Offer`].
+ /// A request for a
[`Bolt12
Invoice`] for a particular [`Offer`].
///
/// [`Offer`]: crate::offers::offer::Offer
InvoiceRequest(InvoiceRequest),
///
/// [`Offer`]: crate::offers::offer::Offer
InvoiceRequest(InvoiceRequest),
- /// A
n [`
Invoice`] sent in response to an [`InvoiceRequest`] or a [`Refund`].
+ /// A
[`Bolt12
Invoice`] sent in response to an [`InvoiceRequest`] or a [`Refund`].
///
/// [`Refund`]: crate::offers::refund::Refund
///
/// [`Refund`]: crate::offers::refund::Refund
- Invoice(Invoice),
+ Invoice(
Bolt12
Invoice),
/// An error from handling an [`OffersMessage`].
InvoiceError(InvoiceError),
/// An error from handling an [`OffersMessage`].
InvoiceError(InvoiceError),
@@
-72,11
+72,11
@@
impl OffersMessage {
}
}
}
}
- fn parse(tlv_type: u64, bytes: Vec<u8>) -> Result<Self, ParseError> {
+ fn parse(tlv_type: u64, bytes: Vec<u8>) -> Result<Self,
Bolt12
ParseError> {
match tlv_type {
INVOICE_REQUEST_TLV_TYPE => Ok(Self::InvoiceRequest(InvoiceRequest::try_from(bytes)?)),
match tlv_type {
INVOICE_REQUEST_TLV_TYPE => Ok(Self::InvoiceRequest(InvoiceRequest::try_from(bytes)?)),
- INVOICE_TLV_TYPE => Ok(Self::Invoice(Invoice::try_from(bytes)?)),
- _ => Err(ParseError::Decode(DecodeError::InvalidValue)),
+ INVOICE_TLV_TYPE => Ok(Self::Invoice(
Bolt12
Invoice::try_from(bytes)?)),
+ _ => Err(
Bolt12
ParseError::Decode(DecodeError::InvalidValue)),
}
}
}
}
}
}
@@
-103,12
+103,12
@@
impl<L: Logger + ?Sized> ReadableArgs<(u64, &L)> for OffersMessage {
match Self::parse(tlv_type, bytes) {
Ok(message) => Ok(message),
match Self::parse(tlv_type, bytes) {
Ok(message) => Ok(message),
- Err(ParseError::Decode(e)) => Err(e),
- Err(ParseError::InvalidSemantics(e)) => {
+ Err(
Bolt12
ParseError::Decode(e)) => Err(e),
+ Err(
Bolt12
ParseError::InvalidSemantics(e)) => {
log_trace!(logger, "Invalid semantics for TLV type {}: {:?}", tlv_type, e);
Err(DecodeError::InvalidValue)
},
log_trace!(logger, "Invalid semantics for TLV type {}: {:?}", tlv_type, e);
Err(DecodeError::InvalidValue)
},
- Err(ParseError::InvalidSignature(e)) => {
+ Err(
Bolt12
ParseError::InvalidSignature(e)) => {
log_trace!(logger, "Invalid signature for TLV type {}: {:?}", tlv_type, e);
Err(DecodeError::InvalidValue)
},
log_trace!(logger, "Invalid signature for TLV type {}: {:?}", tlv_type, e);
Err(DecodeError::InvalidValue)
},