Skip to content

Commit 7d178a3

Browse files
committed
chore: cargo fmt
1 parent 4be7574 commit 7d178a3

25 files changed

Lines changed: 504 additions & 256 deletions

lws/crates/lws-cli/src/audit.rs

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ pub fn log_audit(entry: &AuditEntry) {
3434
}
3535

3636
if let Ok(json) = serde_json::to_string(entry) {
37-
if let Ok(mut file) = OpenOptions::new()
38-
.create(true)
39-
.append(true)
40-
.open(&log_path)
41-
{
37+
if let Ok(mut file) = OpenOptions::new().create(true).append(true).open(&log_path) {
4238
let _ = writeln!(file, "{}", json);
4339

4440
#[cfg(unix)]
@@ -75,13 +71,7 @@ pub fn log_wallet_created(wallet_id: &str, accounts: &[WalletAccount]) {
7571
.map(|a| format!("{}={}", a.chain_id, a.address))
7672
.collect::<Vec<_>>()
7773
.join(", ");
78-
log_wallet_event(
79-
wallet_id,
80-
"create_wallet",
81-
None,
82-
None,
83-
Some(details),
84-
);
74+
log_wallet_event(wallet_id, "create_wallet", None, None, Some(details));
8575
}
8676

8777
/// Convenience: log a wallet import event with all accounts.
@@ -91,13 +81,7 @@ pub fn log_wallet_imported(wallet_id: &str, accounts: &[WalletAccount]) {
9181
.map(|a| format!("{}={}", a.chain_id, a.address))
9282
.collect::<Vec<_>>()
9383
.join(", ");
94-
log_wallet_event(
95-
wallet_id,
96-
"import_wallet",
97-
None,
98-
None,
99-
Some(details),
100-
);
84+
log_wallet_event(wallet_id, "import_wallet", None, None, Some(details));
10185
}
10286

10387
/// Convenience: log a wallet export event.
@@ -107,15 +91,33 @@ pub fn log_wallet_exported(wallet_id: &str) {
10791

10892
/// Convenience: log a wallet deletion event.
10993
pub fn log_wallet_deleted(wallet_id: &str, name: &str) {
110-
log_wallet_event(wallet_id, "delete_wallet", None, None, Some(format!("name={name}")));
94+
log_wallet_event(
95+
wallet_id,
96+
"delete_wallet",
97+
None,
98+
None,
99+
Some(format!("name={name}")),
100+
);
111101
}
112102

113103
/// Convenience: log a wallet rename event.
114104
pub fn log_wallet_renamed(wallet_id: &str, old_name: &str, new_name: &str) {
115-
log_wallet_event(wallet_id, "rename_wallet", None, None, Some(format!("{old_name} -> {new_name}")));
105+
log_wallet_event(
106+
wallet_id,
107+
"rename_wallet",
108+
None,
109+
None,
110+
Some(format!("{old_name} -> {new_name}")),
111+
);
116112
}
117113

118114
/// Convenience: log a broadcast event.
119115
pub fn log_broadcast(wallet_id: &str, chain_id: &str, tx_hash: &str) {
120-
log_wallet_event(wallet_id, "broadcast_transaction", Some(chain_id), None, Some(format!("tx_hash={tx_hash}")));
116+
log_wallet_event(
117+
wallet_id,
118+
"broadcast_transaction",
119+
Some(chain_id),
120+
None,
121+
Some(format!("tx_hash={tx_hash}")),
122+
);
121123
}

lws/crates/lws-cli/src/commands/send_transaction.rs

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ pub fn run(
6262
}
6363

6464
/// Resolve the RPC URL: CLI flag > config override (exact chain_id) > config (namespace) > built-in default.
65-
fn resolve_rpc_url(chain_id: &str, chain_type: ChainType, flag: Option<&str>) -> Result<String, CliError> {
65+
fn resolve_rpc_url(
66+
chain_id: &str,
67+
chain_type: ChainType,
68+
flag: Option<&str>,
69+
) -> Result<String, CliError> {
6670
if let Some(url) = flag {
6771
return Ok(url.to_string());
6872
}
@@ -140,9 +144,12 @@ fn broadcast_bitcoin(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliEr
140144
let output = Command::new("curl")
141145
.args([
142146
"-fsSL",
143-
"-X", "POST",
144-
"-H", "Content-Type: text/plain",
145-
"-d", &hex_tx,
147+
"-X",
148+
"POST",
149+
"-H",
150+
"Content-Type: text/plain",
151+
"-d",
152+
&hex_tx,
146153
&url,
147154
])
148155
.output()
@@ -155,18 +162,17 @@ fn broadcast_bitcoin(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliEr
155162

156163
let tx_hash = String::from_utf8_lossy(&output.stdout).trim().to_string();
157164
if tx_hash.is_empty() {
158-
return Err(CliError::InvalidArgs("empty response from broadcast".into()));
165+
return Err(CliError::InvalidArgs(
166+
"empty response from broadcast".into(),
167+
));
159168
}
160169
Ok(tx_hash)
161170
}
162171

163172
fn broadcast_cosmos(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliError> {
164173
use base64::Engine;
165174
let b64_tx = base64::engine::general_purpose::STANDARD.encode(signed_bytes);
166-
let url = format!(
167-
"{}/cosmos/tx/v1beta1/txs",
168-
rpc_url.trim_end_matches('/')
169-
);
175+
let url = format!("{}/cosmos/tx/v1beta1/txs", rpc_url.trim_end_matches('/'));
170176
let body = serde_json::json!({
171177
"tx_bytes": b64_tx,
172178
"mode": "BROADCAST_MODE_SYNC"
@@ -183,10 +189,7 @@ fn broadcast_cosmos(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliErr
183189

184190
fn broadcast_tron(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliError> {
185191
let hex_tx = hex::encode(signed_bytes);
186-
let url = format!(
187-
"{}/wallet/broadcasthex",
188-
rpc_url.trim_end_matches('/')
189-
);
192+
let url = format!("{}/wallet/broadcasthex", rpc_url.trim_end_matches('/'));
190193
let body = serde_json::json!({ "transaction": hex_tx });
191194
let resp = curl_post_json(&url, &body.to_string())?;
192195
extract_json_field(&resp, "txid")
@@ -195,10 +198,7 @@ fn broadcast_tron(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliError
195198
fn broadcast_ton(rpc_url: &str, signed_bytes: &[u8]) -> Result<String, CliError> {
196199
use base64::Engine;
197200
let b64_boc = base64::engine::general_purpose::STANDARD.encode(signed_bytes);
198-
let url = format!(
199-
"{}/sendBoc",
200-
rpc_url.trim_end_matches('/')
201-
);
201+
let url = format!("{}/sendBoc", rpc_url.trim_end_matches('/'));
202202
let body = serde_json::json!({ "boc": b64_boc });
203203
let resp = curl_post_json(&url, &body.to_string())?;
204204
let parsed: serde_json::Value = serde_json::from_str(&resp)
@@ -214,9 +214,12 @@ fn curl_post_json(url: &str, body: &str) -> Result<String, CliError> {
214214
let output = Command::new("curl")
215215
.args([
216216
"-fsSL",
217-
"-X", "POST",
218-
"-H", "Content-Type: application/json",
219-
"-d", body,
217+
"-X",
218+
"POST",
219+
"-H",
220+
"Content-Type: application/json",
221+
"-d",
222+
body,
220223
url,
221224
])
222225
.output()
@@ -241,7 +244,8 @@ fn extract_key_for_curve(
241244
lws_signer::Curve::Secp256k1 => "secp256k1",
242245
lws_signer::Curve::Ed25519 => "ed25519",
243246
};
244-
let hex_key = obj[field].as_str()
247+
let hex_key = obj[field]
248+
.as_str()
245249
.ok_or_else(|| CliError::InvalidArgs(format!("missing {field} key in wallet")))?;
246250
let bytes = hex::decode(hex_key)
247251
.map_err(|e| CliError::InvalidArgs(format!("invalid {field} hex: {e}")))?;

lws/crates/lws-cli/src/commands/sign_message.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ fn extract_key_for_curve(
7575
lws_signer::Curve::Secp256k1 => "secp256k1",
7676
lws_signer::Curve::Ed25519 => "ed25519",
7777
};
78-
let hex_key = obj[field].as_str()
78+
let hex_key = obj[field]
79+
.as_str()
7980
.ok_or_else(|| CliError::InvalidArgs(format!("missing {field} key in wallet")))?;
8081
let bytes = hex::decode(hex_key)
8182
.map_err(|e| CliError::InvalidArgs(format!("invalid {field} hex: {e}")))?;

lws/crates/lws-cli/src/commands/sign_transaction.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ fn extract_key_for_curve(
5757
lws_signer::Curve::Secp256k1 => "secp256k1",
5858
lws_signer::Curve::Ed25519 => "ed25519",
5959
};
60-
let hex_key = obj[field].as_str()
60+
let hex_key = obj[field]
61+
.as_str()
6162
.ok_or_else(|| CliError::InvalidArgs(format!("missing {field} key in wallet")))?;
6263
let bytes = hex::decode(hex_key)
6364
.map_err(|e| CliError::InvalidArgs(format!("invalid {field} hex: {e}")))?;

lws/crates/lws-cli/src/commands/uninstall.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ pub fn run(purge: bool) -> Result<(), crate::CliError> {
88
let vault_path = vault_path();
99

1010
if !binary.exists() && !purge {
11-
println!("lws binary not found at {} — already uninstalled?", binary.display());
11+
println!(
12+
"lws binary not found at {} — already uninstalled?",
13+
binary.display()
14+
);
1215
return Ok(());
1316
}
1417

@@ -55,8 +58,9 @@ pub fn run(purge: bool) -> Result<(), crate::CliError> {
5558

5659
// Purge vault data
5760
if purge && vault_path.exists() {
58-
std::fs::remove_dir_all(&vault_path)
59-
.map_err(|e| crate::CliError::InvalidArgs(format!("failed to remove vault data: {e}")))?;
61+
std::fs::remove_dir_all(&vault_path).map_err(|e| {
62+
crate::CliError::InvalidArgs(format!("failed to remove vault data: {e}"))
63+
})?;
6064
println!("Removed {}", vault_path.display());
6165
}
6266

@@ -70,7 +74,10 @@ pub fn run(purge: bool) -> Result<(), crate::CliError> {
7074
println!();
7175
println!("lws has been uninstalled.");
7276
if !purge {
73-
println!("Wallet data remains at {}. Use --purge to remove it.", vault_path.display());
77+
println!(
78+
"Wallet data remains at {}. Use --purge to remove it.",
79+
vault_path.display()
80+
);
7481
}
7582

7683
Ok(())

lws/crates/lws-cli/src/commands/update.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ pub fn run(force: bool) -> Result<(), crate::CliError> {
2525
}
2626

2727
let platform = detect_platform()?;
28-
let binary_url = format!(
29-
"https://github.com/{REPO}/releases/download/{tag}/lws-{platform}"
30-
);
28+
let binary_url = format!("https://github.com/{REPO}/releases/download/{tag}/lws-{platform}");
3129

3230
let tmp = tempfile::NamedTempFile::new()
3331
.map_err(|e| crate::CliError::InvalidArgs(format!("failed to create temp file: {e}")))?;
@@ -134,7 +132,12 @@ fn get_latest_tag() -> Result<String, crate::CliError> {
134132
let api_url = format!("https://api.github.com/repos/{REPO}/releases/latest");
135133

136134
let output = Command::new("curl")
137-
.args(["-fsSL", "-H", "Accept: application/vnd.github+json", &api_url])
135+
.args([
136+
"-fsSL",
137+
"-H",
138+
"Accept: application/vnd.github+json",
139+
&api_url,
140+
])
138141
.output()
139142
.map_err(|e| crate::CliError::InvalidArgs(format!("failed to run curl: {e}")))?;
140143

@@ -146,10 +149,11 @@ fn get_latest_tag() -> Result<String, crate::CliError> {
146149

147150
let body = String::from_utf8_lossy(&output.stdout);
148151

149-
extract_json_string(&body, "tag_name")
150-
.ok_or_else(|| crate::CliError::InvalidArgs(
152+
extract_json_string(&body, "tag_name").ok_or_else(|| {
153+
crate::CliError::InvalidArgs(
151154
"no releases found — push a version tag (e.g. v0.2.0) to create one".to_string(),
152-
))
155+
)
156+
})
153157
}
154158

155159
/// Download a binary from a URL using curl.
@@ -201,7 +205,11 @@ fn extract_json_string(json: &str, key: &str) -> Option<String> {
201205
let idx = json.find(&pattern)?;
202206
let rest = &json[idx + pattern.len()..];
203207
// skip `: "` or `:"`
204-
let rest = rest.trim_start().strip_prefix(':')?.trim_start().strip_prefix('"')?;
208+
let rest = rest
209+
.trim_start()
210+
.strip_prefix(':')?
211+
.trim_start()
212+
.strip_prefix('"')?;
205213
let end = rest.find('"')?;
206214
Some(rest[..end].to_string())
207215
}

lws/crates/lws-cli/src/commands/wallet.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::io::IsTerminal;
22

3-
use lws_core::{
4-
default_chain_for_type, EncryptedWallet, KeyType, WalletAccount, ALL_CHAIN_TYPES,
5-
};
3+
use lws_core::{default_chain_for_type, EncryptedWallet, KeyType, WalletAccount, ALL_CHAIN_TYPES};
64
use lws_signer::{
75
decrypt, encrypt, signer_for_chain, CryptoEnvelope, HdDeriver, Mnemonic, MnemonicStrength,
86
};
@@ -98,8 +96,7 @@ pub fn import(
9896
// Determine curve from source chain (default: secp256k1)
9997
let source_curve = match chain {
10098
Some(c) => {
101-
let parsed = lws_core::parse_chain(c)
102-
.map_err(|e| CliError::InvalidArgs(e))?;
99+
let parsed = lws_core::parse_chain(c).map_err(|e| CliError::InvalidArgs(e))?;
103100
signer_for_chain(parsed.chain_type).curve()
104101
}
105102
None => lws_signer::Curve::Secp256k1,
@@ -115,7 +112,9 @@ pub fn import(
115112
let payload = serde_json::json!({
116113
"secp256k1": hex::encode(&keys.0),
117114
"ed25519": hex::encode(&keys.1),
118-
}).to_string().into_bytes();
115+
})
116+
.to_string()
117+
.into_bytes();
119118
let accts = derive_all_accounts_from_keys(&keys.0, &keys.1)?;
120119
(accts, payload, KeyType::PrivateKey)
121120
};

lws/crates/lws-cli/src/vault.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ pub fn delete_wallet(id: &str) -> Result<(), CliError> {
2323
pub fn wallet_name_exists(name: &str) -> Result<bool, CliError> {
2424
Ok(lws_lib::vault::wallet_name_exists(name, None)?)
2525
}
26-

lws/crates/lws-core/src/caip.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ impl ChainId {
2222
),
2323
});
2424
}
25-
if !ns.chars().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit()) {
25+
if !ns
26+
.chars()
27+
.all(|c| c.is_ascii_lowercase() || c.is_ascii_digit())
28+
{
2629
return Err(LwsError::CaipParseError {
2730
message: format!("namespace must be [a-z0-9], got '{}'", ns),
2831
});
@@ -105,7 +108,6 @@ impl<'de> Deserialize<'de> for ChainId {
105108
}
106109
}
107110

108-
109111
#[cfg(test)]
110112
mod tests {
111113
use super::*;

0 commit comments

Comments
 (0)