Fix lifetime warnings

Author: dannywillems

ledger/src/account/account.rs

@@ -1331,11 +1331,11 @@ impl Account {
         }
     }
 
-    pub fn delegate_or_empty(&self) -> MyCow<CompressedPubKey> {
+    pub fn delegate_or_empty(&self) -> MyCow<'_, CompressedPubKey> {
         MyCow::borrow_or_else(&self.delegate, CompressedPubKey::empty)
     }
 
-    pub fn zkapp_or_empty(&self) -> MyCow<Box<ZkAppAccount>> {
+    pub fn zkapp_or_empty(&self) -> MyCow<'_, Box<ZkAppAccount>> {
         MyCow::borrow_or_else(&self.zkapp, Box::<ZkAppAccount>::default)
     }
 

ledger/src/ondisk/compression.rs

@@ -19,7 +19,7 @@ impl MaybeCompressed<'_> {
 }
 
 #[cfg(feature = "compression")]
-pub fn compress(bytes: &[u8]) -> std::io::Result<MaybeCompressed> {
+pub fn compress(bytes: &[u8]) -> std::io::Result<MaybeCompressed<'_>> {
     let compressed = {
         let mut result = Vec::<u8>::with_capacity(bytes.len());
         zstd::stream::copy_encode(bytes, &mut result, zstd::DEFAULT_COMPRESSION_LEVEL)?;
@@ -34,7 +34,7 @@ pub fn compress(bytes: &[u8]) -> std::io::Result<MaybeCompressed> {
 }
 
 #[cfg(not(feature = "compression"))]
-pub fn compress(bytes: &[u8]) -> std::io::Result<MaybeCompressed> {
+pub fn compress(bytes: &[u8]) -> std::io::Result<MaybeCompressed<'_>> {
     Ok(MaybeCompressed::No(bytes))
 }
 

ledger/src/proofs/zkapp.rs

@@ -455,7 +455,7 @@ pub struct ZkappCommandWitnessesParams<'a> {
 }
 
 pub fn zkapp_command_witnesses_exn(
-    params: ZkappCommandWitnessesParams,
+    params: ZkappCommandWitnessesParams<'_>,
 ) -> Result<
     Vec<(
         ZkappCommandSegmentWitness<'_>,

ledger/src/scan_state/scan_state.rs

@@ -709,7 +709,7 @@ pub mod transaction_snark {
             }
         }
 
-        pub fn iter(&self) -> OneOrTwoIter<T> {
+        pub fn iter(&self) -> OneOrTwoIter<'_, T> {
             let array = match self {
                 OneOrTwo::One(a) => [Some(a), None],
                 OneOrTwo::Two((a, b)) => [Some(a), Some(b)],

ledger/src/scan_state/transaction_logic.rs

@@ -2294,7 +2294,7 @@ pub mod zkapp_command {
         }
 
         /// <https://github.com/MinaProtocol/mina/blob/3fe924c80a4d01f418b69f27398f5f93eb652514/src/lib/mina_base/account_update.ml#L635>
-        pub fn to_full(&self) -> MyCow<Account> {
+        pub fn to_full(&self) -> MyCow<'_, Account> {
             MyCow::Borrow(&self.0)
         }
 

ledger/src/zkapps/intefaces.rs

@@ -459,7 +459,7 @@ where
     fn get(&self) -> &crate::Account;
     fn get_mut(&mut self) -> &mut crate::Account;
     fn set_delegate(&mut self, new: CompressedPubKey);
-    fn zkapp(&self) -> MyCow<ZkAppAccount>;
+    fn zkapp(&self) -> MyCow<'_, ZkAppAccount>;
     fn zkapp_mut(&mut self) -> &mut ZkAppAccount;
     fn verification_key_hash(&self) -> Self::VerificationKeyHash;
     fn set_token_id(&mut self, token_id: TokenId);

ledger/src/zkapps/non_snark.rs

@@ -664,7 +664,7 @@ impl AccountInterface for Account {
         };
     }
 
-    fn zkapp(&self) -> MyCow<ZkAppAccount> {
+    fn zkapp(&self) -> MyCow<'_, ZkAppAccount> {
         match self.zkapp.as_ref() {
             Some(zkapp) => MyCow::Borrow(zkapp),
             None => MyCow::Own(ZkAppAccount::default()),

ledger/src/zkapps/snark.rs

@@ -902,7 +902,7 @@ impl AccountInterface for SnarkAccount {
             Some(new)
         };
     }
-    fn zkapp(&self) -> MyCow<ZkAppAccount> {
+    fn zkapp(&self) -> MyCow<'_, ZkAppAccount> {
         match &self.zkapp {
             Some(zkapp) => MyCow::Borrow(zkapp),
             None => MyCow::Own(ZkAppAccount::default()),

node/src/recorder/replayer.rs

@@ -22,7 +22,7 @@ impl StateWithInputActionsReader {
         super::initial_state_path(&self.dir)
     }
 
-    pub fn read_initial_state(&self) -> Result<RecordedInitialState, Box<dyn Error>> {
+    pub fn read_initial_state(&self) -> Result<RecordedInitialState<'_>, Box<dyn Error>> {
         let path = self.initial_state_path();
         let encoded = fs::read(path)?;
         Ok(RecordedInitialState::decode(&encoded)?)

node/src/state.rs

@@ -678,7 +678,7 @@ impl P2p {
             .collect()
     }
 
-    pub fn ready_peers_iter(&self) -> ReadyPeersIter {
+    pub fn ready_peers_iter(&self) -> ReadyPeersIter<'_> {
         ReadyPeersIter::new(self)
     }
 }