Skip to content

Commit 49c1f30

Browse files
committed
Decouple lifetimes for trait implementations that used to comprise KeysInterface.
1 parent 72183bd commit 49c1f30

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lightning/src/chain/channelmonitor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3704,9 +3704,9 @@ where
37043704

37053705
const MAX_ALLOC_SIZE: usize = 64*1024;
37063706

3707-
impl<'a, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'a SP)>
3707+
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP)>
37083708
for (BlockHash, ChannelMonitor<SP::Signer>) {
3709-
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'a SP)) -> Result<Self, DecodeError> {
3709+
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'b SP)) -> Result<Self, DecodeError> {
37103710
macro_rules! unwrap_obj {
37113711
($key: expr) => {
37123712
match $key {

lightning/src/chain/onchaintx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
322322
}
323323
}
324324

325-
impl<'a, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'a SP, u64, [u8; 32])> for OnchainTxHandler<SP::Signer> {
326-
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'a SP, u64, [u8; 32])) -> Result<Self, DecodeError> {
325+
impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP, u64, [u8; 32])> for OnchainTxHandler<SP::Signer> {
326+
fn read<R: io::Read>(reader: &mut R, args: (&'a ES, &'b SP, u64, [u8; 32])) -> Result<Self, DecodeError> {
327327
let entropy_source = args.0;
328328
let signer_provider = args.1;
329329
let channel_value_satoshis = args.2;

lightning/src/ln/channel.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6331,12 +6331,12 @@ impl<Signer: Sign> Writeable for Channel<Signer> {
63316331
}
63326332

63336333
const MAX_ALLOC_SIZE: usize = 64*1024;
6334-
impl<'a, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'a SP, u32)> for Channel<<SP::Target as SignerProvider>::Signer>
6334+
impl<'a, 'b, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32)> for Channel<<SP::Target as SignerProvider>::Signer>
63356335
where
63366336
ES::Target: EntropySource,
63376337
SP::Target: SignerProvider
63386338
{
6339-
fn read<R : io::Read>(reader: &mut R, args: (&'a ES, &'a SP, u32)) -> Result<Self, DecodeError> {
6339+
fn read<R : io::Read>(reader: &mut R, args: (&'a ES, &'b SP, u32)) -> Result<Self, DecodeError> {
63406340
let (entropy_source, signer_provider, serialized_height) = args;
63416341
let ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);
63426342

0 commit comments

Comments
 (0)