Skip to content

Commit 04efc9a

Browse files
committed
Use ChannelManager as OffersMessageHandler
1 parent d5dbc5c commit 04efc9a

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

lightning/src/ln/peer_handler.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
611611
SD,
612612
Arc<SimpleArcChannelManager<M, T, F, L>>,
613613
Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, Arc<C>, Arc<L>>>,
614-
Arc<SimpleArcOnionMessenger<L>>,
614+
Arc<SimpleArcOnionMessenger<M, T, F, L>>,
615615
Arc<L>,
616616
IgnoringMessageHandler,
617617
Arc<KeysManager>
@@ -626,12 +626,12 @@ pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
626626
///
627627
/// This is not exported to bindings users as general type aliases don't make sense in bindings.
628628
pub type SimpleRefPeerManager<
629-
'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'l, 'm, 'n, SD, M, T, F, C, L
629+
'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'l, 'm, 'n, 'o, SD, M, T, F, C, L
630630
> = PeerManager<
631631
SD,
632632
&'n SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'm, M, T, F, L>,
633633
&'f P2PGossipSync<&'g NetworkGraph<&'f L>, &'h C, &'f L>,
634-
&'i SimpleRefOnionMessenger<'g, 'm, 'n, L>,
634+
&'i SimpleRefOnionMessenger<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'm, 'n, 'o, M, T, F, L>,
635635
&'f L,
636636
IgnoringMessageHandler,
637637
&'c KeysManager

lightning/src/onion_message/messenger.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
1818
use crate::blinded_path::{BlindedPath, ForwardTlvs, ReceiveTlvs, utils};
1919
use crate::sign::{EntropySource, KeysManager, NodeSigner, Recipient};
2020
use crate::events::OnionMessageProvider;
21+
use crate::ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
2122
use crate::ln::features::{InitFeatures, NodeFeatures};
2223
use crate::ln::msgs::{self, OnionMessageHandler};
2324
use crate::ln::onion_utils;
@@ -609,12 +610,12 @@ where
609610
///
610611
/// [`SimpleArcChannelManager`]: crate::ln::channelmanager::SimpleArcChannelManager
611612
/// [`SimpleArcPeerManager`]: crate::ln::peer_handler::SimpleArcPeerManager
612-
pub type SimpleArcOnionMessenger<L> = OnionMessenger<
613+
pub type SimpleArcOnionMessenger<M, T, F, L> = OnionMessenger<
613614
Arc<KeysManager>,
614615
Arc<KeysManager>,
615616
Arc<L>,
616617
Arc<DefaultMessageRouter>,
617-
IgnoringMessageHandler,
618+
Arc<SimpleArcChannelManager<M, T, F, L>>,
618619
IgnoringMessageHandler
619620
>;
620621

@@ -625,12 +626,14 @@ pub type SimpleArcOnionMessenger<L> = OnionMessenger<
625626
///
626627
/// [`SimpleRefChannelManager`]: crate::ln::channelmanager::SimpleRefChannelManager
627628
/// [`SimpleRefPeerManager`]: crate::ln::peer_handler::SimpleRefPeerManager
628-
pub type SimpleRefOnionMessenger<'a, 'b, 'c, L> = OnionMessenger<
629+
pub type SimpleRefOnionMessenger<
630+
'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, M, T, F, L
631+
> = OnionMessenger<
629632
&'a KeysManager,
630633
&'a KeysManager,
631634
&'b L,
632-
&'c DefaultMessageRouter,
633-
IgnoringMessageHandler,
635+
&'i DefaultMessageRouter,
636+
&'j SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L>,
634637
IgnoringMessageHandler
635638
>;
636639

0 commit comments

Comments
 (0)