chore: cargo fmt, more feedbacks addressed

Author: Ludo Galabru

src/deployment/mod.rs

@@ -667,7 +667,13 @@ pub fn write_deployment(
         let mut base_dir = target_path.clone();
         base_dir.pop();
         if !base_dir.exists() {
-            let _ = std::fs::create_dir(base_dir);
+            if let Err(e) = std::fs::create_dir(&base_dir) {
+                return Err(format!(
+                    "unable to create directory {}: {:?}",
+                    base_dir.display(),
+                    e
+                ));
+            }
         }
     }
 
@@ -760,7 +766,7 @@ pub fn generate_default_deployment(
         .collect::<Vec<QualifiedContractIdentifier>>();
     requirements_asts.append(&mut boot_contracts_asts);
 
-    // Build the ASTs / DependencySet for requirements - step required for Tests/Devnet/Testnet/Mainnet
+    // Build the ASTs / DependencySet for requirements - step required for Simnet/Devnet/Testnet/Mainnet
     if let Some(ref requirements) = manifest.project.requirements {
         let default_cache_path = match PathBuf::from_str(&manifest.project.cache_dir) {
             Ok(path) => path,
@@ -985,7 +991,7 @@ pub fn generate_default_deployment(
     let ordered_contracts_ids = match ASTDependencyDetector::order_contracts(&dependencies) {
         Ok(ordered_contracts_ids) => ordered_contracts_ids
             .into_iter()
-            .map(|c| c.clone())
+            .map(|c| c)
             .collect::<Vec<_>>(),
         Err(e) => return Err(format!("unable to order contracts {}", e)),
     };
@@ -1017,33 +1023,35 @@ pub fn generate_default_deployment(
         transactions.push(tx);
     }
 
-    let _tx_chain_limit = 25;
+    let tx_chain_limit = 25;
 
     let mut batches = vec![];
-    for (id, transactions) in transactions.chunks(25).enumerate() {
+    for (id, transactions) in transactions.chunks(tx_chain_limit).enumerate() {
         batches.push(TransactionsBatchSpecification {
             id: id,
             transactions: transactions.to_vec(),
         })
     }
 
     let mut wallets = vec![];
-    for (name, account) in chain_config.accounts.into_iter() {
-        let address = match PrincipalData::parse_standard_principal(&account.address) {
-            Ok(res) => res,
-            Err(_) => {
-                return Err(format!(
-                    "unable to parse wallet {} in a valid Stacks address",
-                    account.address
-                ))
-            }
-        };
+    if let StacksNetwork::Simnet = network {
+        for (name, account) in chain_config.accounts.into_iter() {
+            let address = match PrincipalData::parse_standard_principal(&account.address) {
+                Ok(res) => res,
+                Err(_) => {
+                    return Err(format!(
+                        "unable to parse wallet {} in a valid Stacks address",
+                        account.address
+                    ))
+                }
+            };
 
-        wallets.push(WalletSpecification {
-            name,
-            address,
-            balance: account.balance.into(),
-        });
+            wallets.push(WalletSpecification {
+                name,
+                address,
+                balance: account.balance.into(),
+            });
+        }
     }
 
     let name = match network {

src/deployment/requirements.rs

@@ -36,7 +36,7 @@ pub fn retrieve_contract(
     );
 
     let rt = tokio::runtime::Runtime::new().unwrap();
-    let response = rt.block_on(async { fetch_contract(request_url).await });
+    let response = rt.block_on(async { fetch_contract(request_url).await })?;
     let code = response.source.to_string();
 
     if use_cache {
@@ -60,12 +60,13 @@ struct Contract {
     publish_height: u32,
 }
 
-async fn fetch_contract(request_url: String) -> Contract {
-    let response: Contract = reqwest::get(&request_url)
+async fn fetch_contract(request_url: String) -> Result<Contract, String> {
+    let response = reqwest::get(&request_url)
         .await
-        .expect("Unable to retrieve contract")
+        .map_err(|_| format!("Unable to retrieve contract {}", request_url))?;
+
+    response
         .json()
         .await
-        .expect("Unable to parse contract");
-    return response;
+        .map_err(|_| format!("Unable to parse contract {}", request_url))?
 }

src/frontend/cli.rs

@@ -1,8 +1,8 @@
 use crate::deployment::{
     self, apply_on_chain_deployment, check_deployments, generate_default_deployment,
     get_absolute_deployment_path, get_default_deployment_path, load_deployment,
-    load_deployment_if_exists, read_deployment_or_generate_default,
-    setup_session_with_deployment, write_deployment, DeploymentCommand, DeploymentEvent,
+    load_deployment_if_exists, read_deployment_or_generate_default, setup_session_with_deployment,
+    write_deployment, DeploymentCommand, DeploymentEvent,
 };
 use crate::generate::{
     self,

src/integrate/chains_coordinator.rs

@@ -1,8 +1,8 @@
 use super::DevnetEvent;
 use crate::deployment::types::DeploymentSpecification;
 use crate::deployment::{
-    apply_on_chain_deployment, read_deployment_or_generate_default,
-    setup_session_with_deployment, DeploymentCommand, DeploymentEvent,
+    apply_on_chain_deployment, read_deployment_or_generate_default, setup_session_with_deployment,
+    DeploymentCommand, DeploymentEvent,
 };
 use crate::indexer::{chains, Indexer, IndexerConfig};
 use crate::integrate::{MempoolAdmissionData, ServiceStatusData, Status};
@@ -115,7 +115,12 @@ pub async fn start_chains_coordinator(
     let (deployment_events_tx, deployment_events_rx) = channel();
     let (deployment_commands_tx, deployments_command_rx) = channel();
 
-    prepare_protocol_deployment(&config.manifest, &config.deployment, deployment_events_tx, deployments_command_rx);
+    prepare_protocol_deployment(
+        &config.manifest,
+        &config.deployment,
+        deployment_events_tx,
+        deployments_command_rx,
+    );
 
     let init_status = DevnetInitializationStatus {
         should_deploy_protocol: true,
@@ -195,7 +200,7 @@ pub async fn start_chains_coordinator(
                             &deployment_commands_tx,
                             &devnet_event_tx,
                             &chains_coordinator_commands_tx,
-                        )    
+                        )
                     }
                 }
             }
@@ -592,7 +597,13 @@ pub fn prepare_protocol_deployment(
     let deployment = deployment.clone();
 
     std::thread::spawn(move || {
-        apply_on_chain_deployment(&manifest, deployment, deployment_event_tx, deployment_command_rx, false);
+        apply_on_chain_deployment(
+            &manifest,
+            deployment,
+            deployment_event_tx,
+            deployment_command_rx,
+            false,
+        );
     });
 }
 
@@ -630,7 +641,6 @@ pub fn perform_protocol_deployment(
     });
 }
 
-
 pub async fn publish_stacking_orders(
     devnet_config: &DevnetConfig,
     accounts: &Vec<AccountConfig>,