feat: add wasm feature flag to clarinet-deployments

Author: Ludo Galabru

Cargo.lock

@@ -84,7 +84,7 @@ orchestra_types = { package = "orchestra-types", path = "./vendor/orchestra-type
 stacks_rpc_client = { package = "stacks-rpc-client", path = "./vendor/stacks-rpc-client" }
 clarinet_files = { package = "clarinet-files", path = "./vendor/clarinet-files" }
 clarity_lsp = { package = "clarity-lsp", path = "./vendor/clarity-lsp", features = ["cli"]  }
-clarinet_deployments = { package = "clarinet-deployments", path = "./vendor/clarinet-deployments", features = ["cli"] }
+clarinet_deployments = { package = "clarinet-deployments", path = "./vendor/clarinet-deployments" }
 clarinet_utils = { package = "clarinet-utils", path = "./vendor/clarinet-utils" }
 
 num_cpus = "1.13.1"

Cargo.toml

@@ -10,7 +10,7 @@ extern crate serde_json;
 mod macros;
 
 mod chainhooks;
-mod deployment;
+mod deployments;
 mod frontend;
 mod generate;
 mod integrate;

src/bin.rs

@@ -9,6 +9,8 @@ use clarity_repl::clarity::{ClarityName, Value};
 use reqwest::Url;
 pub use ui::start_ui;
 
+use crate::utils;
+
 use clarinet_deployments::types::{
     DeploymentGenerationArtifacts, DeploymentSpecification, TransactionSpecification,
 };
@@ -230,6 +232,15 @@ pub fn get_default_deployment_path(
     Ok(deployment_path)
 }
 
+pub fn generate_default_deployment(
+    manifest: &ProjectManifest,
+    network: &StacksNetwork,
+    no_batch: bool,
+) -> Result<(DeploymentSpecification, DeploymentGenerationArtifacts), String> {
+    let future = clarinet_deployments::generate_default_deployment(manifest, network, false);
+    utils::nestable_block_on(future)
+}
+
 pub fn read_deployment_or_generate_default(
     manifest: &ProjectManifest,
     network: &StacksNetwork,
@@ -247,8 +258,7 @@ pub fn read_deployment_or_generate_default(
             None,
         )
     } else {
-        let (deployment, artifacts) =
-            clarinet_deployments::generate_default_deployment(manifest, network, false)?;
+        let (deployment, artifacts) = generate_default_deployment(manifest, network, false)?;
         (deployment, Some(artifacts))
     };
     Ok((deployment, artifacts))

src/deployment/bitcoin_deployment.rs src/deployments/bitcoin_deployment.rssrc/deployment/bitcoin_deployment.rs renamed to src/deployments/bitcoin_deployment.rs

@@ -1,4 +1,4 @@
-use crate::deployment::TransactionTracker;
+use crate::deployments::TransactionTracker;
 use tui::widgets::ListState;
 
 pub struct StatefulList<T> {

src/deployment/mod.rs src/deployments/mod.rssrc/deployment/mod.rs renamed to src/deployments/mod.rs

@@ -1,4 +1,4 @@
-use crate::deployment::TransactionStatus;
+use crate::deployments::TransactionStatus;
 
 use super::App;
 use tui::{

src/deployment/types.rs src/deployments/types.rssrc/deployment/types.rs renamed to src/deployments/types.rs

@@ -1,9 +1,10 @@
 use crate::chainhooks::check_chainhooks;
-use crate::deployment::types::DeploymentSynthesis;
-use crate::deployment::{
-    self, apply_on_chain_deployment, check_deployments, get_absolute_deployment_path,
-    get_default_deployment_path, get_initial_transactions_trackers, load_deployment,
-    load_deployment_if_exists, write_deployment, DeploymentCommand, DeploymentEvent,
+use crate::deployments::types::DeploymentSynthesis;
+use crate::deployments::{
+    self, apply_on_chain_deployment, check_deployments, generate_default_deployment,
+    get_absolute_deployment_path, get_default_deployment_path, get_initial_transactions_trackers,
+    load_deployment, load_deployment_if_exists, write_deployment, DeploymentCommand,
+    DeploymentEvent,
 };
 use crate::generate::{
     self,
@@ -13,8 +14,8 @@ use crate::integrate::{self, DevnetOrchestrator};
 use crate::lsp::run_lsp;
 use crate::runner::run_scripts;
 use crate::runner::DeploymentCache;
+use clarinet_deployments::setup_session_with_deployment;
 use clarinet_deployments::types::{DeploymentGenerationArtifacts, DeploymentSpecification};
-use clarinet_deployments::{generate_default_deployment, setup_session_with_deployment};
 use clarinet_files::{FileLocation, ProjectManifest, ProjectManifestFile, RequirementConfig};
 use clarity_repl::clarity::analysis::{AnalysisDatabase, ContractAnalysis};
 use clarity_repl::clarity::costs::LimitedCostTracker;
@@ -651,7 +652,7 @@ pub fn main() {
                         }
                     }
                 } else {
-                    let res = deployment::start_ui(&node_url, event_rx, transaction_trackers);
+                    let res = deployments::start_ui(&node_url, event_rx, transaction_trackers);
                     match res {
                         Ok(()) => println!(
                             "{} Transactions successfully confirmed on {:?}",