formated versionwith fmt

Author: AmosOO7

src/commands.rs

@@ -128,7 +128,6 @@ pub enum CliSubCommand {
     /// - `mnemonic`: the 12-word phrase
     /// - `external_descriptor`: public and private forms for receive addresses
     /// - `internal_descriptor`: public and private forms for change addresses
-
     Descriptor(GenerateDescriptorArgs),
 }
 #[derive(Debug, Clone, PartialEq, Args)]

src/descriptor_handler.rs

@@ -1,15 +1,17 @@
 use crate::commands::{GenerateDescriptorArgs, ScriptType};
-use bdk_wallet::bitcoin::Network as BdkNetwork;
-use bdk_wallet::keys::{GeneratableKey, GeneratedKey};
+use anyhow::{anyhow, Result};
+use bdk_wallet::bitcoin::bip32::Xpriv;
 use bdk_wallet::bitcoin::secp256k1::Secp256k1;
+use bdk_wallet::bitcoin::Network as BdkNetwork;
 use bdk_wallet::bitcoin::Network;
-use bdk_wallet::miniscript::{Descriptor, DescriptorPublicKey};
-use bdk_wallet::keys::bip39::{Mnemonic, WordCount, Language};
-use bdk_wallet::bitcoin::bip32::Xpriv;
 use bdk_wallet::descriptor::Segwitv0;
-use anyhow::{Result, anyhow};
+use bdk_wallet::keys::bip39::{Language, Mnemonic, WordCount};
+use bdk_wallet::keys::{GeneratableKey, GeneratedKey};
+use bdk_wallet::miniscript::{Descriptor, DescriptorPublicKey};
 
-pub fn generate_descriptor_from_args(args: GenerateDescriptorArgs) -> Result<serde_json::Value, anyhow::Error> {
+pub fn generate_descriptor_from_args(
+    args: GenerateDescriptorArgs,
+) -> Result<serde_json::Value, anyhow::Error> {
     // Convert CLI network to BDK network
     let bdk_network = match args.network {
         Network::Bitcoin => BdkNetwork::Bitcoin,
@@ -27,14 +29,14 @@ pub fn generate_descriptor_from_args(args: GenerateDescriptorArgs) -> Result<ser
         }
         _ => Err(anyhow!("Script type not supported yet")),
     }
-    
 }
 
 pub fn generate_bip84_descriptor(network: Network) -> Result<serde_json::Value> {
     let secp = Secp256k1::new();
 
-    let mnemonic: GeneratedKey<Mnemonic, Segwitv0> = Mnemonic::generate((WordCount::Words12, Language::English))
-        .map_err(|e| anyhow!("Mnemonic generation failed: {:?}", e))?;
+    let mnemonic: GeneratedKey<Mnemonic, Segwitv0> =
+        Mnemonic::generate((WordCount::Words12, Language::English))
+            .map_err(|e| anyhow!("Mnemonic generation failed: {:?}", e))?;
 
     let seed = mnemonic.to_seed("");
     let xprv = Xpriv::new_master(network, &seed)
@@ -49,8 +51,9 @@ pub fn generate_bip84_descriptor(network: Network) -> Result<serde_json::Value>
 
     let (desc, keymap) = Descriptor::<DescriptorPublicKey>::parse_descriptor(&secp, &external_desc)
         .map_err(|e| anyhow!("Failed to parse external descriptor: {}", e))?;
-    let (int_desc, int_keymap) = Descriptor::<DescriptorPublicKey>::parse_descriptor(&secp, &internal_desc)
-        .map_err(|e| anyhow!("Failed to parse internal descriptor: {}", e))?;
+    let (int_desc, int_keymap) =
+        Descriptor::<DescriptorPublicKey>::parse_descriptor(&secp, &internal_desc)
+            .map_err(|e| anyhow!("Failed to parse internal descriptor: {}", e))?;
 
     Ok(serde_json::json!({
         "mnemonic": mnemonic.to_string(),

src/handlers.rs

@@ -10,8 +10,6 @@
 //!
 //! This module describes all the command handling logic used by bdk-cli.
 
-
-
 use crate::commands::OfflineWalletSubCommand::*;
 #[cfg(any(
     feature = "electrum",
@@ -29,8 +27,8 @@ use bdk_wallet::bitcoin::bip32::{DerivationPath, KeySource};
 use bdk_wallet::bitcoin::consensus::encode::serialize_hex;
 use bdk_wallet::bitcoin::script::PushBytesBuf;
 use bdk_wallet::bitcoin::Network;
-use serde_json::Error as SerdeError;
 use serde::ser::Error as SerdeErrorTrait;
+use serde_json::Error as SerdeError;
 
 #[cfg(any(
     feature = "electrum",
@@ -833,17 +831,12 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
     result.map_err(|e| e.into())
 }
 
-
-
 pub fn handle_generate_descriptor(args: GenerateDescriptorArgs) -> Result<String, SerdeError> {
-    let descriptor = generate_descriptor_from_args(args)
-        .map_err(|e| SerdeErrorTrait::custom(e.to_string()))?;
+    let descriptor =
+        generate_descriptor_from_args(args).map_err(|e| SerdeErrorTrait::custom(e.to_string()))?;
     serde_json::to_string_pretty(&descriptor)
 }
 
-
-
-
 #[cfg(feature = "repl")]
 async fn respond(
     network: Network,

src/main.rs

@@ -11,10 +11,10 @@
 #![warn(missing_docs)]
 
 mod commands;
+mod descriptor_handler;
 mod error;
 mod handlers;
 mod utils;
-mod descriptor_handler;
 
 use bdk_wallet::bitcoin::Network;
 use log::{debug, error, warn};