Remove redundant clones

shinghim · shinghim · commit dcd44a2b1eff · 2025-07-01T21:09:38.000-05:00
diff --git a/payjoin-cli/src/app/v2/mod.rs b/payjoin-cli/src/app/v2/mod.rs
@@ -195,7 +195,7 @@ impl App {
             SendSession::V2GetContext(context) =>
                 self.get_proposed_payjoin_psbt(context, persister).await?,
             SendSession::ProposalReceived(proposal) => {
-                self.process_pj_response(proposal.clone())?;
+                self.process_pj_response(proposal)?;
                 return Ok(());
             }
             _ => return Err(anyhow!("Unexpected sender state")),
@@ -232,7 +232,7 @@ impl App {
             match res {
                 Ok(OptionalTransitionOutcome::Progress(psbt)) => {
                     println!("Proposal received. Processing...");
-                    self.process_pj_response(psbt.clone())?;
+                    self.process_pj_response(psbt)?;
                     return Ok(());
                 }
                 Ok(OptionalTransitionOutcome::Stasis(current_state)) => {
@@ -446,7 +446,7 @@ impl App {
         proposal.process_res(&res.bytes().await?, ohttp_ctx).save(persister)?;
         println!(
             "Response successful. Watch mempool for successful Payjoin. TXID: {}",
-            payjoin_psbt.extract_tx_unchecked_fee_rate().clone().compute_txid()
+            payjoin_psbt.extract_tx_unchecked_fee_rate().compute_txid()
         );
         Ok(())
     }
diff --git a/payjoin-cli/src/db/v2.rs b/payjoin-cli/src/db/v2.rs
@@ -42,11 +42,11 @@ impl SenderPersister {
         send_tree.insert(id.as_ref(), value.as_slice())?;
         send_tree.flush()?;
 
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 
     pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 }
 
@@ -112,11 +112,11 @@ impl ReceiverPersister {
         recv_tree.insert(id.as_ref(), value.as_slice())?;
         recv_tree.flush()?;
 
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 
     pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
-        Ok(Self { db: db.clone(), session_id: id })
+        Ok(Self { db, session_id: id })
     }
 }
 
diff --git a/payjoin/src/core/receive/v2/mod.rs b/payjoin/src/core/receive/v2/mod.rs
@@ -405,7 +405,7 @@ impl Receiver<Initialized> {
         let new_state = Receiver {
             state: UncheckedProposal {
                 v1: event,
-                context: SessionContext { e: reply_key, ..self.state.context.clone() },
+                context: SessionContext { e: reply_key, ..self.state.context },
             },
         };
 
@@ -479,7 +479,7 @@ impl Receiver<UncheckedProposal> {
 
     pub(crate) fn apply_maybe_inputs_owned(self, v1: v1::MaybeInputsOwned) -> ReceiveSession {
         let new_state =
-            Receiver { state: MaybeInputsOwned { v1, context: self.state.context.clone() } };
+            Receiver { state: MaybeInputsOwned { v1, context: self.state.context } };
         ReceiveSession::MaybeInputsOwned(new_state)
     }
 }
@@ -532,7 +532,7 @@ impl Receiver<MaybeInputsOwned> {
 
     pub(crate) fn apply_maybe_inputs_seen(self, v1: v1::MaybeInputsSeen) -> ReceiveSession {
         let new_state =
-            Receiver { state: MaybeInputsSeen { v1, context: self.state.context.clone() } };
+            Receiver { state: MaybeInputsSeen { v1, context: self.state.context } };
         ReceiveSession::MaybeInputsSeen(new_state)
     }
 }
@@ -572,13 +572,13 @@ impl Receiver<MaybeInputsSeen> {
         };
         MaybeFatalTransition::success(
             SessionEvent::OutputsUnknown(inner.clone()),
-            Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } },
+            Receiver { state: OutputsUnknown { inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_outputs_unknown(self, inner: v1::OutputsUnknown) -> ReceiveSession {
         let new_state =
-            Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } };
+            Receiver { state: OutputsUnknown { inner, context: self.state.context } };
         ReceiveSession::OutputsUnknown(new_state)
     }
 }
@@ -617,13 +617,13 @@ impl Receiver<OutputsUnknown> {
         };
         MaybeFatalTransition::success(
             SessionEvent::WantsOutputs(inner.clone()),
-            Receiver { state: WantsOutputs { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: WantsOutputs { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_wants_outputs(self, v1: v1::WantsOutputs) -> ReceiveSession {
         let new_state =
-            Receiver { state: WantsOutputs { v1, context: self.state.context.clone() } };
+            Receiver { state: WantsOutputs { v1, context: self.state.context } };
         ReceiveSession::WantsOutputs(new_state)
     }
 }
@@ -672,12 +672,12 @@ impl Receiver<WantsOutputs> {
         let inner = self.state.v1.clone().commit_outputs();
         NextStateTransition::success(
             SessionEvent::WantsInputs(inner.clone()),
-            Receiver { state: WantsInputs { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: WantsInputs { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_wants_inputs(self, v1: v1::WantsInputs) -> ReceiveSession {
-        let new_state = Receiver { state: WantsInputs { v1, context: self.state.context.clone() } };
+        let new_state = Receiver { state: WantsInputs { v1, context: self.state.context } };
         ReceiveSession::WantsInputs(new_state)
     }
 }
@@ -729,14 +729,14 @@ impl Receiver<WantsInputs> {
         NextStateTransition::success(
             SessionEvent::ProvisionalProposal(inner.clone()),
             Receiver {
-                state: ProvisionalProposal { v1: inner, context: self.state.context.clone() },
+                state: ProvisionalProposal { v1: inner, context: self.state.context },
             },
         )
     }
 
     pub(crate) fn apply_provisional_proposal(self, v1: v1::ProvisionalProposal) -> ReceiveSession {
         let new_state =
-            Receiver { state: ProvisionalProposal { v1, context: self.state.context.clone() } };
+            Receiver { state: ProvisionalProposal { v1, context: self.state.context } };
         ReceiveSession::ProvisionalProposal(new_state)
     }
 }
@@ -780,13 +780,13 @@ impl Receiver<ProvisionalProposal> {
         };
         MaybeTransientTransition::success(
             SessionEvent::PayjoinProposal(inner.clone()),
-            Receiver { state: PayjoinProposal { v1: inner, context: self.state.context.clone() } },
+            Receiver { state: PayjoinProposal { v1: inner, context: self.state.context } },
         )
     }
 
     pub(crate) fn apply_payjoin_proposal(self, v1: v1::PayjoinProposal) -> ReceiveSession {
         let new_state =
-            Receiver { state: PayjoinProposal { v1, context: self.state.context.clone() } };
+            Receiver { state: PayjoinProposal { v1, context: self.state.context } };
         ReceiveSession::PayjoinProposal(new_state)
     }
 }
@@ -904,7 +904,7 @@ pub(crate) fn pj_uri<'a>(
 ) -> crate::PjUri<'a> {
     use crate::uri::{PayjoinExtras, UrlExt};
     let id = session_context.id();
-    let mut pj = subdir(&session_context.directory, &id).clone();
+    let mut pj = subdir(&session_context.directory, &id);
     pj.set_receiver_pubkey(session_context.s.public_key().clone());
     pj.set_ohttp(session_context.ohttp_keys.clone());
     pj.set_exp(session_context.expiry);

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ impl SenderPersister {`
`42`	`42`	`send_tree.insert(id.as_ref(), value.as_slice())?;`
`43`	`43`	`send_tree.flush()?;`
`44`	`44`
`45`		`- Ok(Self { db: db.clone(), session_id: id })`
	`45`	`+ Ok(Self { db, session_id: id })`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {`
`49`		`- Ok(Self { db: db.clone(), session_id: id })`
	`49`	`+ Ok(Self { db, session_id: id })`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -112,11 +112,11 @@ impl ReceiverPersister {`
`112`	`112`	`recv_tree.insert(id.as_ref(), value.as_slice())?;`
`113`	`113`	`recv_tree.flush()?;`
`114`	`114`
`115`		`- Ok(Self { db: db.clone(), session_id: id })`
	`115`	`+ Ok(Self { db, session_id: id })`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {`
`119`		`- Ok(Self { db: db.clone(), session_id: id })`
	`119`	`+ Ok(Self { db, session_id: id })`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ impl Receiver<Initialized> {`
`405`	`405`	`let new_state = Receiver {`
`406`	`406`	`state: UncheckedProposal {`
`407`	`407`	`v1: event,`
`408`		`- context: SessionContext { e: reply_key, ..self.state.context.clone() },`
	`408`	`+ context: SessionContext { e: reply_key, ..self.state.context },`
`409`	`409`	`},`
`410`	`410`	`};`
`411`	`411`
`@@ -479,7 +479,7 @@ impl Receiver<UncheckedProposal> {`
`479`	`479`
`480`	`480`	`pub(crate) fn apply_maybe_inputs_owned(self, v1: v1::MaybeInputsOwned) -> ReceiveSession {`
`481`	`481`	`let new_state =`
`482`		`- Receiver { state: MaybeInputsOwned { v1, context: self.state.context.clone() } };`
	`482`	`+ Receiver { state: MaybeInputsOwned { v1, context: self.state.context } };`
`483`	`483`	`ReceiveSession::MaybeInputsOwned(new_state)`
`484`	`484`	`}`
`485`	`485`	`}`
`@@ -532,7 +532,7 @@ impl Receiver<MaybeInputsOwned> {`
`532`	`532`
`533`	`533`	`pub(crate) fn apply_maybe_inputs_seen(self, v1: v1::MaybeInputsSeen) -> ReceiveSession {`
`534`	`534`	`let new_state =`
`535`		`- Receiver { state: MaybeInputsSeen { v1, context: self.state.context.clone() } };`
	`535`	`+ Receiver { state: MaybeInputsSeen { v1, context: self.state.context } };`
`536`	`536`	`ReceiveSession::MaybeInputsSeen(new_state)`
`537`	`537`	`}`
`538`	`538`	`}`
`@@ -572,13 +572,13 @@ impl Receiver<MaybeInputsSeen> {`
`572`	`572`	`};`
`573`	`573`	`MaybeFatalTransition::success(`
`574`	`574`	`SessionEvent::OutputsUnknown(inner.clone()),`
`575`		`- Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } },`
	`575`	`+ Receiver { state: OutputsUnknown { inner, context: self.state.context } },`
`576`	`576`	`)`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`pub(crate) fn apply_outputs_unknown(self, inner: v1::OutputsUnknown) -> ReceiveSession {`
`580`	`580`	`let new_state =`
`581`		`- Receiver { state: OutputsUnknown { inner, context: self.state.context.clone() } };`
	`581`	`+ Receiver { state: OutputsUnknown { inner, context: self.state.context } };`
`582`	`582`	`ReceiveSession::OutputsUnknown(new_state)`
`583`	`583`	`}`
`584`	`584`	`}`
`@@ -617,13 +617,13 @@ impl Receiver<OutputsUnknown> {`
`617`	`617`	`};`
`618`	`618`	`MaybeFatalTransition::success(`
`619`	`619`	`SessionEvent::WantsOutputs(inner.clone()),`
`620`		`- Receiver { state: WantsOutputs { v1: inner, context: self.state.context.clone() } },`
	`620`	`+ Receiver { state: WantsOutputs { v1: inner, context: self.state.context } },`
`621`	`621`	`)`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`pub(crate) fn apply_wants_outputs(self, v1: v1::WantsOutputs) -> ReceiveSession {`
`625`	`625`	`let new_state =`
`626`		`- Receiver { state: WantsOutputs { v1, context: self.state.context.clone() } };`
	`626`	`+ Receiver { state: WantsOutputs { v1, context: self.state.context } };`
`627`	`627`	`ReceiveSession::WantsOutputs(new_state)`
`628`	`628`	`}`
`629`	`629`	`}`
`@@ -672,12 +672,12 @@ impl Receiver<WantsOutputs> {`
`672`	`672`	`let inner = self.state.v1.clone().commit_outputs();`
`673`	`673`	`NextStateTransition::success(`
`674`	`674`	`SessionEvent::WantsInputs(inner.clone()),`
`675`		`- Receiver { state: WantsInputs { v1: inner, context: self.state.context.clone() } },`
	`675`	`+ Receiver { state: WantsInputs { v1: inner, context: self.state.context } },`
`676`	`676`	`)`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`pub(crate) fn apply_wants_inputs(self, v1: v1::WantsInputs) -> ReceiveSession {`
`680`		`- let new_state = Receiver { state: WantsInputs { v1, context: self.state.context.clone() } };`
	`680`	`+ let new_state = Receiver { state: WantsInputs { v1, context: self.state.context } };`
`681`	`681`	`ReceiveSession::WantsInputs(new_state)`
`682`	`682`	`}`
`683`	`683`	`}`
`@@ -729,14 +729,14 @@ impl Receiver<WantsInputs> {`
`729`	`729`	`NextStateTransition::success(`
`730`	`730`	`SessionEvent::ProvisionalProposal(inner.clone()),`
`731`	`731`	`Receiver {`
`732`		`- state: ProvisionalProposal { v1: inner, context: self.state.context.clone() },`
	`732`	`+ state: ProvisionalProposal { v1: inner, context: self.state.context },`
`733`	`733`	`},`
`734`	`734`	`)`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`pub(crate) fn apply_provisional_proposal(self, v1: v1::ProvisionalProposal) -> ReceiveSession {`
`738`	`738`	`let new_state =`
`739`		`- Receiver { state: ProvisionalProposal { v1, context: self.state.context.clone() } };`
	`739`	`+ Receiver { state: ProvisionalProposal { v1, context: self.state.context } };`
`740`	`740`	`ReceiveSession::ProvisionalProposal(new_state)`
`741`	`741`	`}`
`742`	`742`	`}`
`@@ -780,13 +780,13 @@ impl Receiver<ProvisionalProposal> {`
`780`	`780`	`};`
`781`	`781`	`MaybeTransientTransition::success(`
`782`	`782`	`SessionEvent::PayjoinProposal(inner.clone()),`
`783`		`- Receiver { state: PayjoinProposal { v1: inner, context: self.state.context.clone() } },`
	`783`	`+ Receiver { state: PayjoinProposal { v1: inner, context: self.state.context } },`
`784`	`784`	`)`
`785`	`785`	`}`
`786`	`786`
`787`	`787`	`pub(crate) fn apply_payjoin_proposal(self, v1: v1::PayjoinProposal) -> ReceiveSession {`
`788`	`788`	`let new_state =`
`789`		`- Receiver { state: PayjoinProposal { v1, context: self.state.context.clone() } };`
	`789`	`+ Receiver { state: PayjoinProposal { v1, context: self.state.context } };`
`790`	`790`	`ReceiveSession::PayjoinProposal(new_state)`
`791`	`791`	`}`
`792`	`792`	`}`
`@@ -904,7 +904,7 @@ pub(crate) fn pj_uri<'a>(`
`904`	`904`	`) -> crate::PjUri<'a> {`
`905`	`905`	`use crate::uri::{PayjoinExtras, UrlExt};`
`906`	`906`	`let id = session_context.id();`
`907`		`- let mut pj = subdir(&session_context.directory, &id).clone();`
	`907`	`+ let mut pj = subdir(&session_context.directory, &id);`
`908`	`908`	`pj.set_receiver_pubkey(session_context.s.public_key().clone());`
`909`	`909`	`pj.set_ohttp(session_context.ohttp_keys.clone());`
`910`	`910`	`pj.set_exp(session_context.expiry);`