Skip to content

Commit e8aa190

Browse files
committed
Fix Simple*PeerManager to not require refs to the UtxoLookup
`UtxoLookup` doesn't strictly need to be referenced from the `PeerManager`, and in fact the new `GossipVerifier` in `lightning-block-sync` requires itself to be owned by the `PeerManager` (for circular type reasons). This allows us to use `lightning-block-sync`'s `GossipVerifier` with `SimpleArcPeerManager` in ldk-sample.
1 parent 20f287f commit e8aa190

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ impl Peer {
611611
pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
612612
SD,
613613
Arc<SimpleArcChannelManager<M, T, F, L>>,
614-
Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, Arc<C>, Arc<L>>>,
614+
Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, C, Arc<L>>>,
615615
Arc<SimpleArcOnionMessenger<L>>,
616616
Arc<L>,
617617
IgnoringMessageHandler,
@@ -627,12 +627,12 @@ pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
627627
///
628628
/// This is not exported to bindings users as general type aliases don't make sense in bindings.
629629
pub type SimpleRefPeerManager<
630-
'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'l, 'm, 'n, SD, M, T, F, C, L
630+
'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, SD, M, T, F, C, L
631631
> = PeerManager<
632632
SD,
633-
&'n SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'm, M, T, F, L>,
634-
&'f P2PGossipSync<&'g NetworkGraph<&'f L>, &'h C, &'f L>,
635-
&'i SimpleRefOnionMessenger<'g, 'm, 'n, L>,
633+
&'j SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'i, M, T, F, L>,
634+
&'f P2PGossipSync<&'g NetworkGraph<&'f L>, C, &'f L>,
635+
&'h SimpleRefOnionMessenger<'g, 'i, 'j, L>,
636636
&'f L,
637637
IgnoringMessageHandler,
638638
&'c KeysManager

0 commit comments

Comments
 (0)