Merge pull request fedimint#6333 from dpc/24-11-10-out-idxs-newtype-more

refactor(client): use OutPoint when iterating OutPointRange
Kodylow · Nov 11, 2024 · da9ba35 · da9ba35
2 parents 97ff8a6 + eabafc5
commit da9ba35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/fedimint-client/src/module/mod.rs b/fedimint-client/src/module/mod.rs
@@ -1035,7 +1035,7 @@ impl OutPointRange {
 }
 
 impl IntoIterator for OutPointRange {
-    type Item = (TransactionId, u64);
+    type Item = OutPoint;
 
     type IntoIter = OutPointRangeIter;
 
@@ -1060,10 +1060,13 @@ impl OutPointRange {
 }
 
 impl Iterator for OutPointRangeIter {
-    type Item = (TransactionId, u64);
+    type Item = OutPoint;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next().map(|idx| (self.txid, idx))
+        self.inner.next().map(|idx| OutPoint {
+            txid: self.txid,
+            out_idx: idx,
+        })
     }
 }
 

diff --git a/modules/fedimint-mint-client/src/backup.rs b/modules/fedimint-mint-client/src/backup.rs
@@ -109,16 +109,12 @@ impl MintClientModule {
                     common
                         .out_point_range
                         .into_iter()
-                        .map(|(txid, out_idx)| {
+                        .map(|out_point| {
                             let issuance_request = created_state
                                 .issuance_requests
-                                .get(&out_idx)
+                                .get(&out_point.out_idx)
                                 .expect("Must have corresponding out_idx");
-                            (
-                                OutPoint { txid, out_idx },
-                                issuance_request.0,
-                                issuance_request.1,
-                            )
+                            (out_point, issuance_request.0, issuance_request.1)
                         })
                         .collect(),
                 ),

diff --git a/modules/fedimint-mint-client/src/lib.rs b/modules/fedimint-mint-client/src/lib.rs
@@ -1085,7 +1085,7 @@ impl MintClientModule {
         }
 
         let state_generator = Arc::new(move |out_point_range: OutPointRange| {
-            assert_eq!(out_point_range.into_iter().count(), issuance_requests.len());
+            assert_eq!(out_point_range.count(), issuance_requests.len());
             vec![MintClientStateMachines::Output(MintOutputStateMachine {
                 common: MintOutputCommon {
                     operation_id,
@@ -1094,7 +1094,7 @@ impl MintClientModule {
                 state: MintOutputStates::CreatedMulti(MintOutputStatesCreatedMulti {
                     issuance_requests: out_point_range
                         .into_iter()
-                        .map(|(_, out_idx)| out_idx)
+                        .map(|out_point| out_point.out_idx)
                         .zip(issuance_requests.clone())
                         .collect(),
                 }),