mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Drop some unnecessary lifetime specifiers in return type definitions

Browse source 
In general, we don't need an explicit lifetime when doing something
like:
fn get_thing(&self) -> &Thing { &self.thing }.

This also makes it easier to reason about what's going on in the
bindings generation.
This commit is contained in:
Matt Corallo 2020-05-30 23:18:35 -04:00
parent 775a5adfb9
commit aa14fe5830
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lightning/src/chain/chaininterface.rs
View file

@ -274,7 +274,7 @@ impl<'a, CL: Deref<Target = ChainListener + 'a> + 'a, C: Deref> BlockNotifier<'a
/// ///
/// Handles re-scanning the block and calling block_connected again if listeners register new /// Handles re-scanning the block and calling block_connected again if listeners register new
/// watch data during the callbacks for you (see ChainListener::block_connected for more info). /// watch data during the callbacks for you (see ChainListener::block_connected for more info).
pub fn block_connected<'b>(&self, block: &'b Block, height: u32) { pub fn block_connected(&self, block: &Block, height: u32) {
let mut reentered = true; let mut reentered = true;
while reentered { while reentered {
let (matched, matched_index) = self.chain_monitor.filter_block(block); let (matched, matched_index) = self.chain_monitor.filter_block(block);

6
lightning/src/chain/keysinterface.rs
View file

@ -196,9 +196,9 @@ impl Readable for SpendableOutputDescriptor {
// ChannelMonitors instead of expecting to clone the one out of the Channel into the monitors. // ChannelMonitors instead of expecting to clone the one out of the Channel into the monitors.
pub trait ChannelKeys : Send+Clone { pub trait ChannelKeys : Send+Clone {
/// Gets the commitment seed /// Gets the commitment seed
fn commitment_seed<'a>(&'a self) -> &'a [u8; 32]; fn commitment_seed(&self) -> &[u8; 32];
/// Gets the local channel public keys and basepoints /// Gets the local channel public keys and basepoints
fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys; fn pubkeys(&self) -> &ChannelPublicKeys;
/// Gets arbitrary identifiers describing the set of keys which are provided back to you in /// Gets arbitrary identifiers describing the set of keys which are provided back to you in
/// some SpendableOutputDescriptor types. These should be sufficient to identify this /// some SpendableOutputDescriptor types. These should be sufficient to identify this
/// ChannelKeys object uniquely and lookup or re-derive its keys. /// ChannelKeys object uniquely and lookup or re-derive its keys.
@ -405,7 +405,7 @@ impl InMemoryChannelKeys {
impl ChannelKeys for InMemoryChannelKeys { impl ChannelKeys for InMemoryChannelKeys {
fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed } fn commitment_seed(&self) -> &[u8; 32] { &self.commitment_seed }
fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys { &self.local_channel_pubkeys } fn pubkeys(&self) -> &ChannelPublicKeys { &self.local_channel_pubkeys }
fn key_derivation_params(&self) -> (u64, u64) { self.key_derivation_params } fn key_derivation_params(&self) -> (u64, u64) { self.key_derivation_params }
fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> { fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {

2
lightning/src/util/enforcing_trait_impls.rs
View file

@ -49,7 +49,7 @@ impl EnforcingChannelKeys {
impl ChannelKeys for EnforcingChannelKeys { impl ChannelKeys for EnforcingChannelKeys {
fn commitment_seed(&self) -> &[u8; 32] { self.inner.commitment_seed() } fn commitment_seed(&self) -> &[u8; 32] { self.inner.commitment_seed() }
fn pubkeys<'a>(&'a self) -> &'a ChannelPublicKeys { self.inner.pubkeys() } fn pubkeys(&self) -> &ChannelPublicKeys { self.inner.pubkeys() }
fn key_derivation_params(&self) -> (u64, u64) { self.inner.key_derivation_params() } fn key_derivation_params(&self) -> (u64, u64) { self.inner.key_derivation_params() }
fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> { fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, feerate_per_kw: u32, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {