projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create an `AOnionMessenger` trait similar to our other `AStruct`s
[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 fb6ff746717ed1daeb731032ee2fd0145428b53f..42c6914157e74f345ed0d2ad354834262653646a 100644
(file)
--- a/
lightning/src/onion_message/offers.rs
+++ b/
lightning/src/onion_message/offers.rs
@@
-9,7
+9,6
@@
//! Message handling for BOLT 12 Offers.
//! Message handling for BOLT 12 Offers.
-use core::convert::TryFrom;
use core::fmt;
use crate::io::{self, Read};
use crate::ln::msgs::DecodeError;
use core::fmt;
use crate::io::{self, Read};
use crate::ln::msgs::DecodeError;
@@
-17,10
+16,12
@@
use crate::offers::invoice_error::InvoiceError;
use crate::offers::invoice_request::InvoiceRequest;
use crate::offers::invoice::Bolt12Invoice;
use crate::offers::parse::Bolt12ParseError;
use crate::offers::invoice_request::InvoiceRequest;
use crate::offers::invoice::Bolt12Invoice;
use crate::offers::parse::Bolt12ParseError;
-use crate::onion_message::OnionMessageContents;
-use crate::onion_message::messenger::PendingOnionMessage;
+use crate::onion_message::packet::OnionMessageContents;
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};
+use crate::onion_message::messenger::{ResponseInstruction, Responder};
+#[cfg(not(c_bindings))]
+use crate::onion_message::messenger::PendingOnionMessage;
use crate::prelude::*;
use crate::prelude::*;
@@
-38,8
+39,8
@@
pub trait OffersMessageHandler {
///
/// The returned [`OffersMessage`], if any, is enqueued to be sent by [`OnionMessenger`].
///
///
/// The returned [`OffersMessage`], if any, is enqueued to be sent by [`OnionMessenger`].
///
- /// [`OnionMessenger`]: crate::onion_message::OnionMessenger
- fn handle_message(&self, message: OffersMessage
) -> Op
tion<OffersMessage>;
+ /// [`OnionMessenger`]: crate::onion_message::
messenger::
OnionMessenger
+ fn handle_message(&self, message: OffersMessage
, responder: Option<Responder>) -> ResponseInstruc
tion<OffersMessage>;
/// Releases any [`OffersMessage`]s that need to be sent.
///
/// Releases any [`OffersMessage`]s that need to be sent.
///
@@
-53,7
+54,7
@@
pub trait OffersMessageHandler {
/// Typically, this is used for messages initiating a payment flow rather than in response to
/// another message. The latter should use the return value of [`Self::handle_message`].
#[cfg(c_bindings)]
/// Typically, this is used for messages initiating a payment flow rather than in response to
/// another message. The latter should use the return value of [`Self::handle_message`].
#[cfg(c_bindings)]
- fn release_pending_messages(&self) -> Vec<(OffersMessage, crate::onion_message::Destination, Option<crate::blinded_path::BlindedPath>)> { vec![] }
+ fn release_pending_messages(&self) -> Vec<(OffersMessage, crate::onion_message::
messenger::
Destination, Option<crate::blinded_path::BlindedPath>)> { vec![] }
}
/// Possible BOLT 12 Offers messages sent and received via an [`OnionMessage`].
}
/// Possible BOLT 12 Offers messages sent and received via an [`OnionMessage`].
@@
-117,6
+118,13
@@
impl OnionMessageContents for OffersMessage {
OffersMessage::InvoiceError(_) => INVOICE_ERROR_TLV_TYPE,
}
}
OffersMessage::InvoiceError(_) => INVOICE_ERROR_TLV_TYPE,
}
}
+ fn msg_type(&self) -> &'static str {
+ match &self {
+ OffersMessage::InvoiceRequest(_) => "Invoice Request",
+ OffersMessage::Invoice(_) => "Invoice",
+ OffersMessage::InvoiceError(_) => "Invoice Error",
+ }
+ }
}
impl Writeable for OffersMessage {
}
impl Writeable for OffersMessage {