Change signature of try_preserving_privacy to return Vec<Outpoint>

payjoin · Jul 31, 2024 · b4aa5e8 · b4aa5e8
1 parent a122a5b
commit b4aa5e8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/payjoin-cli/src/app/v1.rs b/payjoin-cli/src/app/v1.rs
@@ -352,7 +352,7 @@ fn try_contributing_inputs(
         .map(|i| (i.amount, OutPoint { txid: i.txid, vout: i.vout }))
         .collect();
 
-    let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg");
+    let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg")[0];
     let selected_utxo = available_inputs
         .iter()
         .find(|i| i.txid == selected_outpoint.txid && i.vout == selected_outpoint.vout)

diff --git a/payjoin-cli/src/app/v2.rs b/payjoin-cli/src/app/v2.rs
@@ -367,7 +367,7 @@ fn try_contributing_inputs(
         .map(|i| (i.amount, OutPoint { txid: i.txid, vout: i.vout }))
         .collect();
 
-    let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg");
+    let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg")[0];
     let selected_utxo = available_inputs
         .iter()
         .find(|i| i.txid == selected_outpoint.txid && i.vout == selected_outpoint.vout)

diff --git a/payjoin/src/receive/mod.rs b/payjoin/src/receive/mod.rs
@@ -420,7 +420,7 @@ impl WantsInputs {
     pub fn try_preserving_privacy(
         &self,
         candidate_inputs: HashMap<Amount, OutPoint>,
-    ) -> Result<OutPoint, SelectionError> {
+    ) -> Result<Vec<OutPoint>, SelectionError> {
         if candidate_inputs.is_empty() {
             return Err(SelectionError::from(InternalSelectionError::Empty));
         }
@@ -446,7 +446,7 @@ impl WantsInputs {
     fn avoid_uih(
         &self,
         candidate_inputs: HashMap<Amount, OutPoint>,
-    ) -> Result<OutPoint, SelectionError> {
+    ) -> Result<Vec<OutPoint>, SelectionError> {
         let min_original_out_sats = self
             .payjoin_psbt
             .unsigned_tx
@@ -473,7 +473,7 @@ impl WantsInputs {
             if candidate_min_in > candidate_min_out {
                 // The candidate avoids UIH2 but conforms to UIH1: Optimal change heuristic.
                 // It implies the smallest output is the sender's change address.
-                return Ok(candidate.1);
+                return Ok(vec![candidate.1]);
             }
         }
 
@@ -484,12 +484,11 @@ impl WantsInputs {
     fn select_first_candidate(
         &self,
         candidate_inputs: HashMap<Amount, OutPoint>,
-    ) -> Result<OutPoint, SelectionError> {
-        candidate_inputs
-            .values()
-            .next()
-            .cloned()
-            .ok_or_else(|| SelectionError::from(InternalSelectionError::NotFound))
+    ) -> Result<Vec<OutPoint>, SelectionError> {
+        match candidate_inputs.values().next().cloned() {
+            Some(outpoint) => Ok(vec![outpoint]),
+            None => Err(SelectionError::from(InternalSelectionError::NotFound)),
+        }
     }
 
     pub fn contribute_witness_input(self, txo: TxOut, outpoint: OutPoint) -> ProvisionalProposal {

diff --git a/payjoin/src/receive/v2/mod.rs b/payjoin/src/receive/v2/mod.rs
@@ -428,7 +428,7 @@ impl WantsInputs {
     pub fn try_preserving_privacy(
         &self,
         candidate_inputs: HashMap<Amount, OutPoint>,
-    ) -> Result<OutPoint, SelectionError> {
+    ) -> Result<Vec<OutPoint>, SelectionError> {
         self.inner.try_preserving_privacy(candidate_inputs)
     }
 

diff --git a/payjoin/tests/integration.rs b/payjoin/tests/integration.rs
@@ -166,7 +166,8 @@ mod integration {
                 .map(|i| (i.amount, OutPoint { txid: i.txid, vout: i.vout }))
                 .collect();
 
-            let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg");
+            let selected_outpoint =
+                payjoin.try_preserving_privacy(candidate_inputs).expect("gg")[0];
             let selected_utxo = available_inputs
                 .iter()
                 .find(|i| i.txid == selected_outpoint.txid && i.vout == selected_outpoint.vout)
@@ -763,7 +764,8 @@ mod integration {
                 .map(|i| (i.amount, OutPoint { txid: i.txid, vout: i.vout }))
                 .collect();
 
-            let selected_outpoint = payjoin.try_preserving_privacy(candidate_inputs).expect("gg");
+            let selected_outpoint =
+                payjoin.try_preserving_privacy(candidate_inputs).expect("gg")[0];
             let selected_utxo = available_inputs
                 .iter()
                 .find(|i| i.txid == selected_outpoint.txid && i.vout == selected_outpoint.vout)