Skip to content

Commit ab844cc

Browse files
committed
chore: fmt and clippy
1 parent 346c442 commit ab844cc

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

Cargo.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/wallet.rs

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@ use base64::{engine::general_purpose, Engine as _};
77
use bip39::{Language, Mnemonic};
88
use chia::protocol::CoinState;
99
use chia::puzzles::cat::CatArgs;
10-
use chia_wallet_sdk::driver::{Cat};
11-
use chia_wallet_sdk::prelude::{ ToClvm, TreeHash};
10+
use chia_wallet_sdk::driver::Cat;
11+
use chia_wallet_sdk::prelude::TreeHash;
12+
use datalayer_driver::wallet::DIG_ASSET_ID;
1213
use datalayer_driver::{
1314
address_to_puzzle_hash, connect_random, get_coin_id, master_public_key_to_first_puzzle_hash,
1415
master_public_key_to_wallet_synthetic_key, master_secret_key_to_wallet_synthetic_secret_key,
1516
puzzle_hash_to_address, secret_key_to_public_key, sign_message, verify_signature, Bytes,
1617
Bytes32, Coin, CoinSpend, NetworkType, Peer, PublicKey, SecretKey, Signature,
1718
};
18-
use hex_literal::hex;
1919
use serde::{Deserialize, Serialize};
2020
use std::collections::{HashMap, HashSet};
2121
use std::env;
2222
use std::fs;
2323
use std::path::PathBuf;
24-
use datalayer_driver::wallet::DIG_ASSET_ID;
2524

2625
const KEYRING_FILE: &str = "keyring.json";
2726
// Cache duration constant - keeping for potential future use
@@ -266,7 +265,7 @@ impl Wallet {
266265
public_key,
267266
signature,
268267
)
269-
.map_err(|e| WalletError::CryptoError(e.to_string()))
268+
.map_err(|e| WalletError::CryptoError(e.to_string()))
270269
}
271270

272271
/// Get all unspent DIG Token coins
@@ -287,8 +286,8 @@ impl Wallet {
287286
None, // previous_height - start from genesis
288287
datalayer_driver::constants::get_mainnet_genesis_challenge(), // Use mainnet for now
289288
)
290-
.await
291-
.map_err(|e| WalletError::NetworkError(format!("Failed to get unspent coins: {}", e)))?;
289+
.await
290+
.map_err(|e| WalletError::NetworkError(format!("Failed to get unspent coins: {}", e)))?;
292291

293292
// Convert coin states to coins and filter out omitted coins
294293
let omit_coin_ids: Vec<Bytes32> = omit_coins.iter().map(get_coin_id).collect();
@@ -320,7 +319,9 @@ impl Wallet {
320319
};
321320

322321
//Parse CAT to prove lineage
323-
let cat_parse_result = datalayer_driver::async_api::prove_dig_cat_coin(peer, coin, coin_created_height).await;
322+
let cat_parse_result =
323+
datalayer_driver::async_api::prove_dig_cat_coin(peer, coin, coin_created_height)
324+
.await;
324325
match cat_parse_result {
325326
Ok(parsed_cat) => {
326327
// lineage proved. append coin in question
@@ -355,8 +356,11 @@ impl Wallet {
355356
let available_dig_cats = self
356357
.get_all_unspent_dig_cats(peer, omit_coins, verbose)
357358
.await?;
358-
359-
let dig_coins = available_dig_cats.iter().map(|cat| cat.coin).collect::<Vec<_>>();
359+
360+
let dig_coins = available_dig_cats
361+
.iter()
362+
.map(|cat| cat.coin)
363+
.collect::<Vec<_>>();
360364

361365
// Use the DataLayer-Driver's select_coins function
362366
let selected_coins = datalayer_driver::select_coins(&dig_coins, coin_amount)
@@ -367,15 +371,16 @@ impl Wallet {
367371
}
368372

369373
let selected_coins_ids: HashSet<Bytes32> = selected_coins.iter().map(get_coin_id).collect();
370-
let selected_cats = available_dig_cats.into_iter().filter(|cat| selected_coins_ids.contains(&cat.coin.coin_id())).collect::<Vec<_>>();
374+
let selected_cats = available_dig_cats
375+
.into_iter()
376+
.filter(|cat| selected_coins_ids.contains(&cat.coin.coin_id()))
377+
.collect::<Vec<_>>();
371378

372379
Ok(selected_cats)
373380
}
374381

375382
pub async fn get_dig_balance(&self, peer: &Peer, verbose: bool) -> Result<u64, WalletError> {
376-
let dig_cats = self
377-
.get_all_unspent_dig_cats(peer, vec![], verbose)
378-
.await?;
383+
let dig_cats = self.get_all_unspent_dig_cats(peer, vec![], verbose).await?;
379384
let dig_balance = dig_cats.iter().map(|c| c.coin.amount).sum::<u64>();
380385
Ok(dig_balance)
381386
}

0 commit comments

Comments
 (0)