From: Matt Corallo Date: Tue, 3 Oct 2023 03:52:53 +0000 (+0000) Subject: Clean up at least some lifetimes on `SimpleRefPeerManager` X-Git-Tag: v0.0.117~2^2 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0b4bb24af8fe8de2d4958e2a8ae7eebdac4dc0f6;p=rust-lightning Clean up at least some lifetimes on `SimpleRefPeerManager` Rather than simply a, b, c, d...we at least use names for a few things, also splitting the reused 'f lifetime. --- diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs index 63dfa527d..92826244e 100644 --- a/lightning/src/ln/peer_handler.rs +++ b/lightning/src/ln/peer_handler.rs @@ -627,13 +627,13 @@ pub type SimpleArcPeerManager = PeerManager< /// /// This is not exported to bindings users as general type aliases don't make sense in bindings. pub type SimpleRefPeerManager< - 'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, SD, M, T, F, C, L + 'a, 'b, 'c, 'd, 'e, 'f, 'logger, 'h, 'i, 'j, 'graph, SD, M, T, F, C, L > = PeerManager< SD, - &'j SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'i, M, T, F, L>, - &'f P2PGossipSync<&'g NetworkGraph<&'f L>, C, &'f L>, - &'h SimpleRefOnionMessenger<'g, 'i, 'j, L>, - &'f L, + &'j SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'graph, 'logger, 'i, M, T, F, L>, + &'f P2PGossipSync<&'graph NetworkGraph<&'logger L>, C, &'logger L>, + &'h SimpleRefOnionMessenger<'logger, 'i, 'j, L>, + &'logger L, IgnoringMessageHandler, &'c KeysManager >;