Merge remote-tracking branch 'origin/main' into ark-merge

2026-07-14 22:08:55 +01:00
parent 5642aae530 c3a4745d78
commit 128c13e965
142 changed files with 7738 additions and 1336 deletions
@@ -171,19 +171,18 @@ impl CashuToken {
        let v4: TokenV4 =
            ciborium::from_reader(decoded.as_slice()).context("Invalid CBOR in cashuB token")?;

-        let proofs = v4
-            .t
-            .into_iter()
-            .flat_map(|entry| {
-                let keyset_id = hex::encode(&entry.i);
-                entry.p.into_iter().map(move |p| Proof {
-                    amount: p.a,
-                    id: keyset_id.clone(),
-                    secret: p.s,
-                    c: hex::encode(&p.c),
+        let proofs =
+            v4.t.into_iter()
+                .flat_map(|entry| {
+                    let keyset_id = hex::encode(&entry.i);
+                    entry.p.into_iter().map(move |p| Proof {
+                        amount: p.a,
+                        id: keyset_id.clone(),
+                        secret: p.s,
+                        c: hex::encode(&p.c),
+                    })
                })
-            })
-            .collect();
+                .collect();

        let token = CashuToken {
            token: vec![TokenEntry { mint: v4.m, proofs }],
@@ -407,10 +406,8 @@ mod tests {
        use ciborium::value::Value;

        let keyset_id = vec![0x00u8, 0x9a, 0x1f, 0x29, 0x32, 0x53, 0xe4, 0x1e];
-        let sig = hex::decode(
-            "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d94ec4da0e7f6c2b4e24",
-        )
-        .unwrap();
+        let sig = hex::decode("02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d94ec4da0e7f6c2b4e24")
+            .unwrap();

        let proof = Value::Map(vec![
            (Value::from("a"), Value::from(8u64)),