From d8f2f38b0d322256ddad6a609864199d64eb58b5 Mon Sep 17 00:00:00 2001 From: Chris Guimaraes Date: Thu, 3 Aug 2023 20:30:13 +0100 Subject: [PATCH] fix: lint --- components/clarinet-cli/src/bin.rs | 4 +-- components/clarinet-cli/src/devnet/mod.rs | 2 +- components/clarinet-cli/src/devnet/package.rs | 29 ++++++++++--------- components/clarinet-cli/src/frontend/cli.rs | 17 +++++------ components/clarinet-cli/src/lib.rs | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/components/clarinet-cli/src/bin.rs b/components/clarinet-cli/src/bin.rs index 8c11bf1ab..64623159c 100644 --- a/components/clarinet-cli/src/bin.rs +++ b/components/clarinet-cli/src/bin.rs @@ -11,15 +11,15 @@ extern crate hiro_system_kit; mod chainhooks; mod deployments; +mod devnet; mod frontend; mod generate; pub mod integrate; mod lsp; mod runner; -mod devnet; use frontend::cli; pub fn main() { cli::main(); -} \ No newline at end of file +} diff --git a/components/clarinet-cli/src/devnet/mod.rs b/components/clarinet-cli/src/devnet/mod.rs index 8559986ca..8b82703e2 100644 --- a/components/clarinet-cli/src/devnet/mod.rs +++ b/components/clarinet-cli/src/devnet/mod.rs @@ -1 +1 @@ -pub mod package; \ No newline at end of file +pub mod package; diff --git a/components/clarinet-cli/src/devnet/package.rs b/components/clarinet-cli/src/devnet/package.rs index 646371bc4..3dc359f76 100644 --- a/components/clarinet-cli/src/devnet/package.rs +++ b/components/clarinet-cli/src/devnet/package.rs @@ -1,6 +1,6 @@ -use std::process; -use std::fs::{File, read_to_string}; +use std::fs::{read_to_string, File}; use std::io::{self, Write}; +use std::process; use clarinet_deployments::types::DeploymentSpecificationFile; use clarinet_files::NetworkManifestFile; @@ -13,21 +13,21 @@ struct Project { description: Option, authors: Vec, telemetry: Option, - cache_dir: Option + cache_dir: Option, } #[derive(Serialize, Deserialize, Debug)] struct ClarinetSpecificationFile { project: Project, contracts: Option, - repl: Option + repl: Option, } #[derive(Serialize, Deserialize, Debug)] struct ConfigurationPackage { deployment_plan: DeploymentSpecificationFile, devnet_config: NetworkManifestFile, - clarinet_config: ClarinetSpecificationFile + clarinet_config: ClarinetSpecificationFile, } fn get_devnet_config() -> NetworkManifestFile { @@ -59,7 +59,8 @@ fn get_clarinet_config() -> ClarinetSpecificationFile { } }; - let clarinet_config: ClarinetSpecificationFile = match toml::from_str(&clarinet_config_content) { + let clarinet_config: ClarinetSpecificationFile = match toml::from_str(&clarinet_config_content) + { Ok(data) => data, Err(err) => { println!("Unable to load data from Clarinet.toml file: {}", err); @@ -72,7 +73,8 @@ fn get_clarinet_config() -> ClarinetSpecificationFile { fn get_deployment_plan() -> DeploymentSpecificationFile { let deployment_spec_file = File::open("./deployments/default.simnet-plan.yaml").unwrap(); - let deployment_plan: DeploymentSpecificationFile = serde_yaml::from_reader(deployment_spec_file).unwrap(); + let deployment_plan: DeploymentSpecificationFile = + serde_yaml::from_reader(deployment_spec_file).unwrap(); deployment_plan } @@ -92,14 +94,14 @@ fn pack_to_file(file_name: &str) -> Result<(), io::Error> { }; let package = ConfigurationPackage { - deployment_plan : get_deployment_plan(), + deployment_plan: get_deployment_plan(), devnet_config: get_devnet_config(), - clarinet_config: get_clarinet_config() + clarinet_config: get_clarinet_config(), }; match serde_json::to_writer(file, &package) { Ok(_) => println!("{} file generated with success", file_name), - Err(e) => println!("Unable to generate the json file: {}", e) + Err(e) => println!("Unable to generate the json file: {}", e), }; Ok(()) @@ -107,14 +109,13 @@ fn pack_to_file(file_name: &str) -> Result<(), io::Error> { fn pack_to_stdout() { let package = ConfigurationPackage { - deployment_plan : get_deployment_plan(), + deployment_plan: get_deployment_plan(), devnet_config: get_devnet_config(), - clarinet_config: get_clarinet_config() + clarinet_config: get_clarinet_config(), }; let s = serde_json::to_string(&package).unwrap(); io::stdout().write(s.as_bytes()).ok(); - } pub fn pack(file_name: Option) -> Result<(), io::Error> { @@ -124,4 +125,4 @@ pub fn pack(file_name: Option) -> Result<(), io::Error> { } Ok(()) -} \ No newline at end of file +} diff --git a/components/clarinet-cli/src/frontend/cli.rs b/components/clarinet-cli/src/frontend/cli.rs index e2fc43217..03e204160 100644 --- a/components/clarinet-cli/src/frontend/cli.rs +++ b/components/clarinet-cli/src/frontend/cli.rs @@ -4,6 +4,7 @@ use crate::deployments::{ self, check_deployments, generate_default_deployment, get_absolute_deployment_path, write_deployment, }; +use crate::devnet::package as Package; use crate::generate::{ self, changes::{Changes, TOMLEdition}, @@ -11,7 +12,6 @@ use crate::generate::{ use crate::integrate; use crate::lsp::run_lsp; use crate::runner::{run_scripts, DeploymentCache}; -use crate::devnet::package as Package; use clarinet_deployments::onchain::{ apply_on_chain_deployment, get_initial_transactions_trackers, update_deployment_costs, @@ -115,7 +115,7 @@ enum Command { Completions(Completions), /// Subcommands for Devnet usage #[clap(subcommand, name = "devnet")] - Devnet(Devnet) + Devnet(Devnet), } #[derive(Subcommand, PartialEq, Clone, Debug)] @@ -167,7 +167,7 @@ enum Chainhooks { enum Devnet { /// Generate packaged deployment plan #[clap(name = "package", bin_name = "package")] - Package(DevnetPackage) + Package(DevnetPackage), } #[derive(Parser, PartialEq, Clone, Debug)] @@ -1436,13 +1436,12 @@ pub fn main() { cmd.shell.generate(&mut app, &mut file); println!("{} {}", green!("Created file"), file_name.clone()); println!("Check your shell's documentation for details about using this file to enable completions for clarinet"); - }, + } Command::Devnet(subcommand) => match subcommand { - Devnet::Package(cmd) => { - Package::pack(cmd.package_file_name).expect("Could not execute the package command.") - } - } + Devnet::Package(cmd) => Package::pack(cmd.package_file_name) + .expect("Could not execute the package command."), + }, }; } @@ -2087,4 +2086,4 @@ fn display_deploy_hint() { yellow!("Find more information on the DevNet here: https://docs.hiro.so/clarinet/how-to-guides/how-to-run-integration-environment") ); display_hint_footer(); -} \ No newline at end of file +} diff --git a/components/clarinet-cli/src/lib.rs b/components/clarinet-cli/src/lib.rs index e8d41e186..f7f799e77 100644 --- a/components/clarinet-cli/src/lib.rs +++ b/components/clarinet-cli/src/lib.rs @@ -18,10 +18,10 @@ pub mod deployments; pub mod generate; pub mod integrate; +pub mod devnet; #[cfg(feature = "cli")] pub mod frontend; #[cfg(feature = "cli")] pub mod lsp; #[cfg(feature = "cli")] pub mod runner; -pub mod devnet; \ No newline at end of file