Clean up with cargo fmt

Author: buffrr

node/src/bin/spaced.rs

@@ -6,7 +6,7 @@ use log::error;
 use spaced::{
     config::{safe_exit, Args},
     rpc::{AsyncChainState, LoadedWallet, RpcServerImpl, WalletManager},
-    source::BitcoinBlockSource,
+    source::{BitcoinBlockSource, BitcoinRpc},
     store,
     sync::Spaced,
     wallets::RpcWallet,
@@ -16,7 +16,6 @@ use tokio::{
     sync::{broadcast, mpsc},
     task::{JoinHandle, JoinSet},
 };
-use spaced::source::BitcoinRpc;
 
 #[tokio::main]
 async fn main() {

node/src/config.rs

@@ -173,7 +173,9 @@ impl Args {
         let block_index = if args.block_index {
             let block_db_path = data_dir.join("block_index.sdb");
             if !initial_sync && !block_db_path.exists() {
-                return Err(anyhow::anyhow!("Block index must be enabled from the initial sync."))
+                return Err(anyhow::anyhow!(
+                    "Block index must be enabled from the initial sync."
+                ));
             }
             let block_store = Store::open(block_db_path)?;
             let index = LiveStore {
@@ -184,7 +186,9 @@ impl Args {
                 let tip_1 = index.state.tip.read().expect("index");
                 let tip_2 = chain.state.tip.read().expect("tip");
                 if tip_1.height != tip_2.height || tip_1.hash != tip_2.hash {
-                    return Err(anyhow::anyhow!("Protocol and block index states don't match."))
+                    return Err(anyhow::anyhow!(
+                        "Protocol and block index states don't match."
+                    ));
                 }
             }
             Some(index)

node/src/node.rs

@@ -11,7 +11,7 @@ use protocol::{
     hasher::{BidKey, KeyHasher, OutpointKey, SpaceKey},
     prepare::TxContext,
     sname::NameLike,
-    validate::{UpdateKind, TxChangeSet, Validator},
+    validate::{TxChangeSet, UpdateKind, Validator},
     Covenant, FullSpaceOut, RevokeReason, SpaceOut,
 };
 use serde::{Deserialize, Serialize};
@@ -232,13 +232,19 @@ impl Node {
                             .to_bytes(),
                     );
 
-                    let (bid_value, previous_bid) =
-                        unwrap_bid_value(&update.output.spaceout);
+                    let (bid_value, previous_bid) = unwrap_bid_value(&update.output.spaceout);
 
                     let bid_hash = BidKey::from_bid(bid_value, base_hash);
                     let space_key = SpaceKey::from(base_hash);
 
-                    match update.output.spaceout.space.as_ref().expect("space").covenant {
+                    match update
+                        .output
+                        .spaceout
+                        .space
+                        .as_ref()
+                        .expect("space")
+                        .covenant
+                    {
                         Covenant::Bid { claim_height, .. } => {
                             if claim_height.is_none() {
                                 let prev_bid_hash = BidKey::from_bid(previous_bid, base_hash);

node/src/rpc.rs

@@ -100,7 +100,7 @@ pub trait Rpc {
 
     #[method(name = "getspaceowner")]
     async fn get_space_owner(&self, space_hash: &str)
-                             -> Result<Option<OutPoint>, ErrorObjectOwned>;
+        -> Result<Option<OutPoint>, ErrorObjectOwned>;
 
     #[method(name = "getspaceout")]
     async fn get_spaceout(&self, outpoint: OutPoint) -> Result<Option<SpaceOut>, ErrorObjectOwned>;
@@ -112,10 +112,8 @@ pub trait Rpc {
     async fn get_rollout(&self, target: usize) -> Result<Vec<(u32, SpaceKey)>, ErrorObjectOwned>;
 
     #[method(name = "getblock")]
-    async fn get_block(
-        &self,
-        block_hash: BlockHash,
-    ) -> Result<Option<BlockMeta>, ErrorObjectOwned>;
+    async fn get_block(&self, block_hash: BlockHash)
+        -> Result<Option<BlockMeta>, ErrorObjectOwned>;
 
     #[method(name = "walletload")]
     async fn wallet_load(&self, name: &str) -> Result<(), ErrorObjectOwned>;
@@ -156,11 +154,11 @@ pub trait Rpc {
 
     #[method(name = "walletlistspaces")]
     async fn wallet_list_spaces(&self, wallet: &str)
-                                -> Result<Vec<FullSpaceOut>, ErrorObjectOwned>;
+        -> Result<Vec<FullSpaceOut>, ErrorObjectOwned>;
 
     #[method(name = "walletlistunspent")]
     async fn wallet_list_unspent(&self, wallet: &str)
-                                 -> Result<Vec<LocalOutput>, ErrorObjectOwned>;
+        -> Result<Vec<LocalOutput>, ErrorObjectOwned>;
 
     #[method(name = "walletlistauctionoutputs")]
     async fn wallet_list_auction_outputs(
@@ -803,30 +801,35 @@ impl AsyncChainState {
         rpc: &BitcoinRpc,
         chain_state: &mut LiveSnapshot,
     ) -> Result<Option<BlockMeta>, anyhow::Error> {
-        let index = index.as_mut()
+        let index = index
+            .as_mut()
             .ok_or_else(|| anyhow!("block index must be enabled"))?;
         let hash = BaseHash::from_slice(block_hash.as_ref());
-        let block: Option<BlockMeta> = index.get(hash)
+        let block: Option<BlockMeta> = index
+            .get(hash)
             .context("Could not fetch block from index")?;
 
         if let Some(block_set) = block {
             return Ok(Some(block_set));
         }
 
-        let info: serde_json::Value = rpc.send_json(client, &rpc.
-            get_block_header(block_hash)).await
+        let info: serde_json::Value = rpc
+            .send_json(client, &rpc.get_block_header(block_hash))
+            .await
             .map_err(|e| anyhow!("Could not retrieve block ({})", e))?;
 
-        let height = info.get("height").and_then(|t| t.as_u64())
+        let height = info
+            .get("height")
+            .and_then(|t| t.as_u64())
             .ok_or_else(|| anyhow!("Could not retrieve block height"))?;
 
         let tip = chain_state.tip.read().expect("read meta").clone();
         if height > tip.height as u64 {
             return Err(anyhow!(
-            "Spaces is syncing at height {}, requested block height {}",
-            tip.height,
-            height
-        ));
+                "Spaces is syncing at height {}, requested block height {}",
+                tip.height,
+                height
+            ));
         }
         Err(anyhow!("Could not retrieve block"))
     }
@@ -860,9 +863,9 @@ impl AsyncChainState {
                 let _ = resp.send(result);
             }
             ChainStateCommand::GetBlockMeta { block_hash, resp } => {
-                let res = Self::get_indexed_block(
-                    block_index, &block_hash, client, rpc, chain_state
-                ).await;
+                let res =
+                    Self::get_indexed_block(block_index, &block_hash, client, rpc, chain_state)
+                        .await;
                 let _ = resp.send(res);
             }
             ChainStateCommand::EstimateBid { target, resp } => {

node/src/source.rs

@@ -141,7 +141,7 @@ impl BitcoinRpc {
         self.make_request("getblockcount", params)
     }
 
-    pub fn get_block_header(&self, hash : &BlockHash) -> BitcoinRpcRequest {
+    pub fn get_block_header(&self, hash: &BlockHash) -> BitcoinRpcRequest {
         let params = serde_json::json!([hash]);
         self.make_request("getblockheader", params)
     }

protocol/src/lib.rs

@@ -115,7 +115,10 @@ pub enum Covenant {
 #[derive(Copy, Clone, PartialEq, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
-#[cfg_attr(feature = "serde", serde(rename_all = "snake_case", tag = "revoke_reason"))]
+#[cfg_attr(
+    feature = "serde",
+    serde(rename_all = "snake_case", tag = "revoke_reason")
+)]
 pub enum RevokeReason {
     BidPsbt(BidPsbtReason),
     /// Space was prematurely spent during the auctions phase
@@ -142,7 +145,7 @@ pub enum RejectReason {
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
-    serde(rename_all = "snake_case", tag = "bid_psbt_reason"),
+    serde(rename_all = "snake_case", tag = "bid_psbt_reason")
 )]
 #[cfg_attr(feature = "bincode", derive(Encode, Decode))]
 pub enum BidPsbtReason {

protocol/src/prepare.rs

@@ -47,10 +47,7 @@ pub struct AuctionedOutput {
 }
 
 pub trait DataSource {
-    fn get_space_outpoint(
-        &mut self,
-        space_hash: &SpaceKey,
-    ) -> Result<Option<OutPoint>>;
+    fn get_space_outpoint(&mut self, space_hash: &SpaceKey) -> Result<Option<OutPoint>>;
 
     fn get_spaceout(&mut self, outpoint: &OutPoint) -> Result<Option<SpaceOut>>;
 }

protocol/src/validate.rs

@@ -1,4 +1,5 @@
 use alloc::{collections::btree_map::BTreeMap, vec, vec::Vec};
+
 #[cfg(feature = "bincode")]
 use bincode::{Decode, Encode};
 use bitcoin::{Amount, OutPoint, Transaction, Txid};
@@ -7,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     constants::{AUCTION_DURATION, AUCTION_EXTENSION_ON_BID, RENEWAL_INTERVAL, ROLLOUT_BATCH_SIZE},
-    prepare::{is_magic_lock_time, AuctionedOutput, TxContext, TrackableOutput, SSTXO},
+    prepare::{is_magic_lock_time, AuctionedOutput, TrackableOutput, TxContext, SSTXO},
     script::{OpOpenContext, ScriptError, SpaceKind},
     sname::SName,
     BidPsbtReason, Covenant, FullSpaceOut, RejectReason, RevokeReason, Space, SpaceOut,
@@ -384,7 +385,7 @@ impl Validator {
             return;
         }
 
-        changeset.updates.push(UpdateOut{
+        changeset.updates.push(UpdateOut {
             kind: UpdateKind::Bid,
             output: fullspaceout,
         });