Skip to content

Commit a183569

Browse files
committed
format code
1 parent ca9b945 commit a183569

File tree

5 files changed

+29
-28
lines changed

5 files changed

+29
-28
lines changed

packages/cli/src/modules/wasm/entrypoint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::{args::BaseTxArgs, config::WasmConfig, proposal::entrypoint::ProposalCmd};
22
use super::{ops, proposal};
33
use crate::framework::{Context, Module};
4+
use crate::support::command::run_command;
45
use crate::support::gas::Gas;
56
use crate::support::node::run_npx;
67
use anyhow::Result;
@@ -11,7 +12,6 @@ use std::path::PathBuf;
1112
use std::process::Command;
1213
use std::str::FromStr;
1314
use std::{env, fs};
14-
use crate::support::command::run_command;
1515

1616
#[derive(clap::ArgEnum, Clone, Debug)]
1717
pub enum NodePackageManager {

packages/cli/src/modules/wasm/ops/build.rs

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::{env, process::Command};
22

33
use anyhow::Result;
44

5-
use crate::{framework::Context, modules::wasm::WasmConfig};
65
use crate::support::command::run_command;
6+
use crate::{framework::Context, modules::wasm::WasmConfig};
77

88
pub fn build<'a, Ctx: Context<'a, WasmConfig>>(
99
ctx: &Ctx,
@@ -29,38 +29,40 @@ pub fn build<'a, Ctx: Context<'a, WasmConfig>>(
2929
.split('\n')
3030
.any(|t| t == "wasm32-unknown-unknown")
3131
{
32-
run_command(Command::new("rustup")
33-
.arg("target")
34-
.arg("add")
35-
.arg("wasm32-unknown-unknown"))?;
32+
run_command(
33+
Command::new("rustup")
34+
.arg("target")
35+
.arg("add")
36+
.arg("wasm32-unknown-unknown"),
37+
)?;
3638
};
3739

38-
let _build = run_command(Command::new("cargo")
39-
.env("RUSTFLAGS", "-C link-arg=-s")
40-
.arg("build")
41-
.arg("--release")
42-
.arg("--target")
43-
.arg("wasm32-unknown-unknown"))?;
40+
let _build = run_command(
41+
Command::new("cargo")
42+
.env("RUSTFLAGS", "-C link-arg=-s")
43+
.arg("build")
44+
.arg("--release")
45+
.arg("--target")
46+
.arg("wasm32-unknown-unknown"),
47+
)?;
4448

4549
if !*no_wasm_opt {
4650
println!("Optimizing wasm...");
4751
let optimizer_version = ctx.config()?.optimizer_version;
4852

4953
let arch_suffix = if *aarch64 { "-arm64" } else { "" };
5054

51-
let _optim = run_command(Command::new("docker")
52-
.args(&[
53-
"run",
54-
"--rm",
55-
"-v",
56-
format!("{root_dir_str}:/code").as_str(),
57-
"--mount",
58-
format!("type=volume,source={wp_name}_cache,target=/code/target").as_str(),
59-
"--mount",
60-
"type=volume,source=registry_cache,target=/usr/local/cargo/registry",
61-
format!("cosmwasm/workspace-optimizer{arch_suffix}:{optimizer_version}").as_str(),
62-
]))?;
63-
55+
let _optim = run_command(Command::new("docker").args(&[
56+
"run",
57+
"--rm",
58+
"-v",
59+
format!("{root_dir_str}:/code").as_str(),
60+
"--mount",
61+
format!("type=volume,source={wp_name}_cache,target=/code/target").as_str(),
62+
"--mount",
63+
"type=volume,source=registry_cache,target=/usr/local/cargo/registry",
64+
format!("cosmwasm/workspace-optimizer{arch_suffix}:{optimizer_version}").as_str(),
65+
]))?;
6466
}
6567

6668
Ok(())

packages/cli/src/support/command.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ pub fn run_command(cmd: &mut std::process::Command) -> Result<(), anyhow::Error>
77
}
88
Ok(())
99
}
10-

packages/cli/src/support/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pub mod coin;
2+
pub mod command;
23
pub mod cosmos;
34
pub mod future;
45
pub mod gas;
@@ -12,4 +13,3 @@ pub mod state;
1213
pub mod string;
1314
pub mod template;
1415
pub mod wasm;
15-
pub mod command;

packages/cli/src/support/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use std::{ffi::OsStr, process::Command};
21
use anyhow::bail;
2+
use std::{ffi::OsStr, process::Command};
33

44
pub fn run_npx<I, S>(args: I, error_context: &str) -> Result<(), anyhow::Error>
55
where

0 commit comments

Comments
 (0)