depolymerization

commit 1bca69267cbf96aba82ea031a8c15ebacd1a28bd
parent 8e8b3c720d7a807a3076ce400fa1bd70d5306c2b
Author: Antoine A <>
Date:   Mon, 28 Jul 2025 12:55:50 +0200

common: clean code

Diffstat:
M
Cargo.lock
 | 
8
++++----
M
depolymerizer-bitcoin/src/db.rs
 | 
2
+-
M
depolymerizer-bitcoin/src/loops/worker.rs
 | 
6
+++---
M
depolymerizer-bitcoin/src/rpc.rs
 | 
11
++++-------
M
depolymerizer-bitcoin/src/segwit.rs
 | 
2
+-
M
uri-pack/src/main.rs
 | 
1
-

6 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -2088,9 +2088,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc_version"
@@ -2116,9 +2116,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.29"
+version = "0.23.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
+checksum = "069a8df149a16b1a12dcc31497c3396a173844be3cac4bd40c9e7671fef96671"
 dependencies = [
  "log",
  "once_cell",
diff --git a/depolymerizer-bitcoin/src/db.rs b/depolymerizer-bitcoin/src/db.rs
@@ -483,7 +483,7 @@ pub async fn sync_out<'a>(
     .bind(replace_txid.map(|it| it.as_byte_array()))
     .bind_amount(amount)
     .bind(exchange_url.to_string())
-    .bind(&credit_acc.to_string())
+    .bind(credit_acc.to_string())
     .bind(wtid.as_slice())
     .bind_timestamp(created)
     .try_map(|r: PgRow| {
diff --git a/depolymerizer-bitcoin/src/loops/worker.rs b/depolymerizer-bitcoin/src/loops/worker.rs
@@ -268,7 +268,7 @@ async fn sync_chain_incoming_confirmed(
     db: &mut PgListener,
     state: &WorkerCfg,
 ) -> Result<(), LoopError> {
-    match rpc.get_tx_segwit_key(&id).await {
+    match rpc.get_tx_segwit_key(id).await {
         Ok((full, reserve_pub)) => {
             // Store transactions in database
             let debit_addr = sender_address(rpc, &full).await?;
@@ -293,12 +293,12 @@ async fn sync_chain_incoming_confirmed(
                     }
                 }
                 AddIncomingResult::ReservePubReuse => {
-                    db::bounce(db, &id, "reserve_pub reuse").await?
+                    db::bounce(db, id, "reserve_pub reuse").await?
                 }
             }
         }
         Err(err) => match err {
-            GetSegwitErr::Decode(e) => db::bounce(db, &id, &e.to_string()).await?,
+            GetSegwitErr::Decode(e) => db::bounce(db, id, &e.to_string()).await?,
             GetSegwitErr::RPC(e) => return Err(e.into()),
         },
     }
diff --git a/depolymerizer-bitcoin/src/rpc.rs b/depolymerizer-bitcoin/src/rpc.rs
@@ -131,14 +131,14 @@ impl JsonSocket {
         writeln!(buf, "Accept: application/json-rpc\r")?;
         writeln!(buf, "Authorization: {}\r", self.cookie)?;
         writeln!(buf, "Content-Type: application/json-rpc\r")?;
-        writeln!(buf, "Content-Length: {}\r", body_len)?;
+        writeln!(buf, "Content-Length: {body_len}\r")?;
         // Write separator
         writeln!(buf, "\r")?;
         let (body, head) = buf.split_at(body_len);
         let mut vectors = [IoSlice::new(head), IoSlice::new(body)];
         let mut vectors = vectors.as_mut_slice();
         while !vectors.is_empty() {
-            let written = sock.write_vectored(&vectors).await?;
+            let written = sock.write_vectored(vectors).await?;
             IoSlice::advance_slices(&mut vectors, written);
         }
         sock.flush().await?;
@@ -154,11 +154,8 @@ impl JsonSocket {
                     "End of file reached unexpectedly",
                 )));
             }
-            if let Some(header_pos) = buf
-                .windows(4)
-                .position(|w| *w == [b'\r', b'\n', b'\r', b'\n'])
-            {
-                if buf.ends_with(&[b'\n']) {
+            if let Some(header_pos) = buf.windows(4).position(|w| w == b"\r\n\r\n") {
+                if buf.ends_with(b"\n") {
                     break header_pos;
                 }
             }
diff --git a/depolymerizer-bitcoin/src/segwit.rs b/depolymerizer-bitcoin/src/segwit.rs
@@ -18,7 +18,7 @@ use common::{rand_slice, taler_common::api_common::EddsaPublicKey};
 use rand::rngs::ThreadRng;
 use std::cmp::Ordering;
 
-/// TODO use segwit v1 to only use a single address
+// TODO use segwit v1 to only use a single address
 
 /// Encode metadata into a segwit address
 pub fn encode_segwit_addr(hrp: Hrp, metada: &[u8; 20]) -> String {
diff --git a/uri-pack/src/main.rs b/uri-pack/src/main.rs
@@ -18,7 +18,6 @@ use std::cmp::Ordering;
 use uri_pack::pack_uri;
 
 /// Compute efficiency statistics of uri-pack using domains from majestic_million
-
 fn main() {
     let mut majestic = csv::Reader::from_reader(include_str!("majestic_million.csv").as_bytes());
     let mut ascii_counter = [0u64; 255];