Merge pull request #126 from buffrr/fix-lint

buffrr · web-flow · commit 83fce1ee7bfb · 2025-12-13T21:14:56.000+01:00
Fix lint errors
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,3 +2,8 @@
 
 resolver = "2"
 members = [ "client", "protocol", "veritas", "testutil", "wallet"]
+
+
+[workspace.package]
+version = "0.0.9"
+edition = "2021"
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spaces_client"
-version = "0.0.8"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 
 [[bin]]
diff --git a/client/src/bin/space-cli.rs b/client/src/bin/space-cli.rs
@@ -18,11 +18,9 @@ use jsonrpsee::{
     core::{client::Error, ClientError},
     http_client::HttpClient,
 };
-use serde::{Deserialize, Serialize};
 use spaces_client::{
     auth::{auth_token_from_cookie, auth_token_from_creds, http_client_with_auth},
     config::{default_cookie_path, default_spaces_rpc_port, ExtendedNetwork},
-    deserialize_base64,
     format::{
         print_error_rpc_response, print_list_bidouts, print_list_spaces_response,
         print_list_transactions, print_list_unspent, print_list_wallets, print_server_info,
@@ -32,7 +30,6 @@ use spaces_client::{
         BidParams, ExecuteParams, OpenParams, RegisterParams, RpcClient, RpcWalletRequest,
         RpcWalletTxBuilder, SendCoinsParams, TransferSpacesParams,
     },
-    serialize_base64,
     wallets::{AddressKind, WalletResponse},
 };
 use spaces_protocol::bitcoin::{Amount, FeeRate, OutPoint, Txid};
@@ -369,28 +366,6 @@ struct SpaceCli {
     client: HttpClient,
 }
 
-#[derive(Serialize, Deserialize)]
-struct SignedDnsUpdate {
-    serial: u32,
-    space: String,
-    #[serde(
-        serialize_with = "serialize_base64",
-        deserialize_with = "deserialize_base64"
-    )]
-    packet: Vec<u8>,
-    signature: Signature,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    proof: Option<Base64Bytes>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct Base64Bytes(
-    #[serde(
-        serialize_with = "serialize_base64",
-        deserialize_with = "deserialize_base64"
-    )]
-    Vec<u8>,
-);
 
 impl SpaceCli {
     async fn configure() -> anyhow::Result<(Self, Args)> {
diff --git a/client/src/store.rs b/client/src/store.rs
@@ -89,11 +89,11 @@ impl Store {
         Ok(Database::new(Box::new(FileBackend::new(file)?), config)?)
     }
 
-    pub fn iter(&self) -> SnapshotIterator<Sha256Hasher> {
+    pub fn iter(&self) -> SnapshotIterator<'_, Sha256Hasher> {
         return self.0.iter();
     }
 
-    pub fn write(&self) -> Result<WriteTx> {
+    pub fn write(&self) -> Result<WriteTx<'_>> {
         Ok(self.0.begin_write()?)
     }
 
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spaces_protocol"
-version = "0.0.8"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 bitcoin = { version = "0.32.2", features = ["base64", "serde"], default-features = false }
diff --git a/veritas/Cargo.toml b/veritas/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spaces_veritas"
-version = "0.0.7"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]
diff --git a/veritas/src/lib.rs b/veritas/src/lib.rs
@@ -103,7 +103,7 @@ impl Veritas {
 }
 
 impl Proof {
-    pub fn iter(&self) -> ProofIter {
+    pub fn iter(&self) -> ProofIter<'_> {
         ProofIter {
             inner: self.inner.iter(),
         }
diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spaces_wallet"
-version = "0.0.8"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 spaces_protocol = { path = "../protocol", features = ["std"], version = "*" }
diff --git a/wallet/src/builder.rs b/wallet/src/builder.rs
@@ -405,7 +405,6 @@ impl Builder {
             if !coin_transfers.is_empty() {
                 for coin in coin_transfers {
                     builder.add_send(coin)?;
-                    vout += 1;
                 }
             }
 
@@ -720,7 +719,7 @@ impl Builder {
         wallet: &mut SpacesWallet,
         unspendables: Vec<OutPoint>,
         confirmed_only: bool,
-    ) -> anyhow::Result<BuilderIterator> {
+    ) -> anyhow::Result<BuilderIterator<'_>> {
         let fee_rate = self
             .fee_rate
             .as_ref()
diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
@@ -256,7 +256,7 @@ impl SpacesWallet {
         })
     }
 
-    pub fn get_tx(&mut self, txid: Txid) -> Option<WalletTx> {
+    pub fn get_tx(&mut self, txid: Txid) -> Option<WalletTx<'_>> {
         self.internal.get_tx(txid)
     }
 
@@ -281,7 +281,7 @@ impl SpacesWallet {
         })
     }
 
-    pub fn transactions(&self) -> impl Iterator<Item=WalletTx> + '_ {
+    pub fn transactions(&self) -> impl Iterator<Item=WalletTx<'_>> + '_ {
         self.internal
             .transactions()
             .filter(|tx| !is_revert_tx(tx) && self.internal.spk_index().is_tx_relevant(&tx.tx_node))
@@ -299,7 +299,7 @@ impl SpacesWallet {
         &mut self,
         unspendables: Vec<OutPoint>,
         confirmed_only: bool,
-    ) -> anyhow::Result<TxBuilder<SpacesAwareCoinSelection>> {
+    ) -> anyhow::Result<TxBuilder<'_, SpacesAwareCoinSelection>> {
         self.create_builder(unspendables, None, confirmed_only)
     }
 
@@ -530,7 +530,7 @@ impl SpacesWallet {
     ///
     /// This is used to monitor bid txs in the mempool
     /// to check if they have been replaced.
-    pub fn unconfirmed_bids(&mut self) -> anyhow::Result<Vec<(WalletTx, OutPoint)>> {
+    pub fn unconfirmed_bids(&mut self) -> anyhow::Result<Vec<(WalletTx<'_>, OutPoint)>> {
         let txids: Vec<_> = {
             let unconfirmed: Vec<_> = self
                 .transactions()

Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ impl Store {`
`89`	`89`	`Ok(Database::new(Box::new(FileBackend::new(file)?), config)?)`
`90`	`90`	`}`
`91`	`91`
`92`		`- pub fn iter(&self) -> SnapshotIterator<Sha256Hasher> {`
	`92`	`+ pub fn iter(&self) -> SnapshotIterator<'_, Sha256Hasher> {`
`93`	`93`	`return self.0.iter();`
`94`	`94`	`}`
`95`	`95`
`96`		`- pub fn write(&self) -> Result<WriteTx> {`
	`96`	`+ pub fn write(&self) -> Result<WriteTx<'_>> {`
`97`	`97`	`Ok(self.0.begin_write()?)`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ impl Veritas {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`impl Proof {`
`106`		`- pub fn iter(&self) -> ProofIter {`
	`106`	`+ pub fn iter(&self) -> ProofIter<'_> {`
`107`	`107`	`ProofIter {`
`108`	`108`	`inner: self.inner.iter(),`
`109`	`109`	`}`