chore: rename build_command module to build

near · Dec 3, 2024 · 0f3f053 · 0f3f053
1 parent 6e44f83
commit 0f3f053
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 29 deletions.
diff --git a/...mand/actions/non_reproducible_wasm/mod.rs → ...uild/actions/non_reproducible_wasm/mod.rs b/...mand/actions/non_reproducible_wasm/mod.rs → ...uild/actions/non_reproducible_wasm/mod.rs
diff --git a/..._command/actions/reproducible_wasm/mod.rs → ...ds/build/actions/reproducible_wasm/mod.rs b/..._command/actions/reproducible_wasm/mod.rs → ...ds/build/actions/reproducible_wasm/mod.rs
diff --git a/cargo-near/src/commands/build_command/mod.rs → cargo-near/src/commands/build/mod.rs b/cargo-near/src/commands/build_command/mod.rs → cargo-near/src/commands/build/mod.rs
@@ -48,22 +48,3 @@ pub struct Command {
     #[interactive_clap(subcommand)]
     actions: actions::Actions,
 }
-
-// fn get_env_key_vals(input: Vec<String>) -> Vec<(String, String)> {
-//     let iterator = input.iter().flat_map(|pair_string| {
-//         pair_string
-//             .split_once('=')
-//             .map(|(env_key, value)| (env_key.to_string(), value.to_string()))
-//     });
-
-//     let dedup_map: HashMap<String, String> = HashMap::from_iter(iterator);
-
-//     let result = dedup_map.into_iter().collect();
-//     tracing::info!(
-//         target: "near_teach_me",
-//         parent: &tracing::Span::none(),
-//         "Passed additional environment pairs:\n{}",
-//         near_cli_rs::common::indent_payload(&format!("{:#?}", result))
-//     );
-//     result
-// }
diff --git a/cargo-near/src/commands/deploy/actions/non_reproducible_wasm.rs b/cargo-near/src/commands/deploy/actions/non_reproducible_wasm.rs
@@ -1,6 +1,6 @@
 use near_cli_rs::commands::contract::deploy::initialize_mode::InitializeMode;
 
-use crate::commands::build_command;
+use crate::commands::build as build_command;
 
 #[derive(Debug, Clone, interactive_clap::InteractiveClap)]
 #[interactive_clap(input_context = near_cli_rs::GlobalContext)]
@@ -18,7 +18,7 @@ pub struct DeployOpts {
 }
 
 mod context {
-    use crate::commands::build_command;
+    use crate::commands::build as build_command;
 
     #[derive(Debug, Clone)]
     pub struct Context(near_cli_rs::commands::contract::deploy::ContractFileContext);
@@ -69,7 +69,7 @@ mod manual_input {
 /// this module is needed because of #[interactive_clap(skip_default_from_cli)]
 /// on `Opts`
 mod manual_from_cli {
-    use crate::commands::build_command;
+    use crate::commands::build as build_command;
     use near_cli_rs::commands::contract::deploy::initialize_mode::InitializeMode;
 
     impl interactive_clap::FromCli for super::DeployOpts {

diff --git a/cargo-near/src/commands/deploy/actions/reproducible_wasm.rs b/cargo-near/src/commands/deploy/actions/reproducible_wasm.rs
@@ -1,6 +1,6 @@
 use near_cli_rs::commands::contract::deploy::initialize_mode::InitializeMode;
 
-use crate::commands::build_command;
+use crate::commands::build as build_command;
 
 #[derive(Debug, Clone, interactive_clap::InteractiveClap)]
 #[interactive_clap(input_context = near_cli_rs::GlobalContext)]
@@ -21,7 +21,7 @@ pub struct DeployOpts {
 }
 
 mod context {
-    use crate::commands::build_command;
+    use crate::commands::build as build_command;
 
     #[derive(Debug, Clone)]
     pub struct Context(near_cli_rs::commands::contract::deploy::ContractFileContext);
@@ -75,7 +75,7 @@ mod manual_input {
 /// this module is needed because of #[interactive_clap(skip_default_from_cli)]
 /// on `Opts`
 mod manual_from_cli {
-    use crate::commands::build_command;
+    use crate::commands::build as build_command;
     use near_cli_rs::commands::contract::deploy::initialize_mode::InitializeMode;
 
     impl interactive_clap::FromCli for super::DeployOpts {

diff --git a/cargo-near/src/commands/mod.rs b/cargo-near/src/commands/mod.rs
@@ -1,7 +1,7 @@
 use strum::{EnumDiscriminants, EnumIter, EnumMessage};
 
 pub mod abi_command;
-pub mod build_command;
+pub mod build;
 pub mod create_dev_account;
 pub mod deploy;
 pub mod new;
@@ -22,7 +22,7 @@ pub enum NearCommand {
         message = "build               -  Build a NEAR contract with embedded ABI"
     ))]
     /// Build a NEAR contract with embedded ABI
-    Build(self::build_command::Command),
+    Build(self::build::Command),
     #[strum_discriminants(strum(
         message = "abi                 -  Generates ABI for the contract"
     ))]

diff --git a/cargo-near/src/main.rs b/cargo-near/src/main.rs
@@ -1,5 +1,5 @@
+use std::env;
 use std::io::IsTerminal;
-use std::{env, ops::Index};
 
 use cargo_near_build::env_keys;
 use colored::Colorize;
@@ -11,7 +11,7 @@ use cargo_near::{setup_tracing, CliOpts, Cmd, Opts};
 
 fn main() -> CliResult {
     let args = std::env::args().collect::<Vec<_>>();
-    if std::env::var(env_keys::nep330::BUILD_ENVIRONMENT).is_ok() {
+    if env::var(env_keys::nep330::BUILD_ENVIRONMENT).is_ok() {
         println!("enforcing stuff in docker");
         if args.len() < 4 {
             return Err(color_eyre::eyre::eyre!("it's not cool in docker"));