From 498d86e4c7bddaa9cfb2ffabc40d9e65ef234876 Mon Sep 17 00:00:00 2001 From: f321x Date: Fri, 16 Aug 2024 13:39:44 +0200 Subject: [PATCH] run cargo fix coordinator --- .../coordinator/src/coordinator/mempool_monitoring.rs | 2 +- taptrade-cli-demo/coordinator/src/coordinator/mod.rs | 6 +++--- .../src/coordinator/tx_confirmation_monitoring.rs | 4 ++-- taptrade-cli-demo/coordinator/src/database/mod.rs | 6 +++--- taptrade-cli-demo/coordinator/src/main.rs | 2 +- .../coordinator/src/wallet/escrow_psbt.rs | 10 +++++----- taptrade-cli-demo/coordinator/src/wallet/mod.rs | 3 +-- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/taptrade-cli-demo/coordinator/src/coordinator/mempool_monitoring.rs b/taptrade-cli-demo/coordinator/src/coordinator/mempool_monitoring.rs index 31b5ba4..a1d4308 100644 --- a/taptrade-cli-demo/coordinator/src/coordinator/mempool_monitoring.rs +++ b/taptrade-cli-demo/coordinator/src/coordinator/mempool_monitoring.rs @@ -8,7 +8,7 @@ use bdk::bitcoin::{OutPoint, Transaction}; use bdk::bitcoin::{TxIn, Txid}; use bdk::bitcoincore_rpc::{Client, RpcApi}; use std::collections::{HashMap, HashSet}; -use std::net::Shutdown; + use std::ops::Deref; use std::sync::RwLock; use tokio::sync::oneshot; diff --git a/taptrade-cli-demo/coordinator/src/coordinator/mod.rs b/taptrade-cli-demo/coordinator/src/coordinator/mod.rs index 936fbe9..7571cb3 100755 --- a/taptrade-cli-demo/coordinator/src/coordinator/mod.rs +++ b/taptrade-cli-demo/coordinator/src/coordinator/mod.rs @@ -6,8 +6,8 @@ pub mod tx_confirmation_monitoring; use self::coordinator_utils::*; use super::*; -use bitcoin::key; -use musig2::{AggNonce, KeyAggContext, PartialSignature}; + +use musig2::{KeyAggContext, PartialSignature}; pub async fn process_order( coordinator: Arc, @@ -330,7 +330,7 @@ pub async fn handle_payout_signature( coordinator: Arc, ) -> Result { let database = &coordinator.coordinator_db; - let wallet = &coordinator.coordinator_wallet; + let _wallet = &coordinator.coordinator_wallet; check_offer_and_confirmation(&payload.offer_id_hex, &payload.robohash_hex, database).await?; diff --git a/taptrade-cli-demo/coordinator/src/coordinator/tx_confirmation_monitoring.rs b/taptrade-cli-demo/coordinator/src/coordinator/tx_confirmation_monitoring.rs index 53e0bfb..a1902a2 100644 --- a/taptrade-cli-demo/coordinator/src/coordinator/tx_confirmation_monitoring.rs +++ b/taptrade-cli-demo/coordinator/src/coordinator/tx_confirmation_monitoring.rs @@ -1,10 +1,10 @@ use std::str::FromStr; -use axum::Json; + use bdk::{ bitcoin::Txid, bitcoincore_rpc::{ - jsonrpc::error::RpcError, jsonrpc::Error as JsonRpcError, Error as CoreRpcError, RpcApi, + jsonrpc::Error as JsonRpcError, Error as CoreRpcError, RpcApi, }, }; diff --git a/taptrade-cli-demo/coordinator/src/database/mod.rs b/taptrade-cli-demo/coordinator/src/database/mod.rs index 9204773..41b402c 100644 --- a/taptrade-cli-demo/coordinator/src/database/mod.rs +++ b/taptrade-cli-demo/coordinator/src/database/mod.rs @@ -2,10 +2,10 @@ mod db_tests; use anyhow::Context; -use coordinator::coordinator_utils::*; + use futures_util::StreamExt; -use musig2::PartialSignature; -use sha2::digest::typenum::marker_traits; + + use super::*; use bdk::bitcoin::address::Address; diff --git a/taptrade-cli-demo/coordinator/src/main.rs b/taptrade-cli-demo/coordinator/src/main.rs index 5286c97..266c3e9 100755 --- a/taptrade-cli-demo/coordinator/src/main.rs +++ b/taptrade-cli-demo/coordinator/src/main.rs @@ -4,7 +4,7 @@ mod database; mod wallet; use anyhow::{anyhow, Result}; -use bdk::{database::MemoryDatabase, sled}; +use bdk::{database::MemoryDatabase}; use communication::{api::*, api_server, communication_utils::*, handler_errors::*}; use coordinator::{ bond_monitoring::*, coordinator_utils::*, diff --git a/taptrade-cli-demo/coordinator/src/wallet/escrow_psbt.rs b/taptrade-cli-demo/coordinator/src/wallet/escrow_psbt.rs index 68ad7aa..637436f 100644 --- a/taptrade-cli-demo/coordinator/src/wallet/escrow_psbt.rs +++ b/taptrade-cli-demo/coordinator/src/wallet/escrow_psbt.rs @@ -1,12 +1,12 @@ use super::*; use bdk::{ - bitcoin::{psbt::PartiallySignedTransaction, PublicKey}, - descriptor::{policy, Descriptor}, - miniscript::{descriptor::TapTree, policy::Concrete, Miniscript, Tap, ToPublicKey}, + bitcoin::{psbt::PartiallySignedTransaction}, + descriptor::{Descriptor}, + miniscript::{descriptor::TapTree, policy::Concrete, Tap, ToPublicKey}, SignOptions, }; use musig2::{secp256k1::PublicKey as MuSig2PubKey, KeyAggContext}; -use sha2::digest::typenum::{bit, Xor}; + #[derive(Debug)] pub struct EscrowPsbtConstructionData { @@ -226,7 +226,7 @@ impl CoordinatorWallet { }) } - pub async fn validate_escrow_init_psbt(&self, escrow_init_psbt: &str) -> Result<()> { + pub async fn validate_escrow_init_psbt(&self, _escrow_init_psbt: &str) -> Result<()> { warn!("Implement escrow psbt validation. For now, returning Ok"); Ok(()) } diff --git a/taptrade-cli-demo/coordinator/src/wallet/mod.rs b/taptrade-cli-demo/coordinator/src/wallet/mod.rs index aa5391e..37778bd 100644 --- a/taptrade-cli-demo/coordinator/src/wallet/mod.rs +++ b/taptrade-cli-demo/coordinator/src/wallet/mod.rs @@ -15,7 +15,6 @@ use bdk::{ bip32::ExtendedPrivKey, consensus::encode::deserialize, key::{secp256k1, XOnlyPublicKey}, - taproot::TapLeaf, Address, Network::Regtest, Transaction, @@ -23,7 +22,7 @@ use bdk::{ bitcoincore_rpc::{Client, RawTx, RpcApi}, blockchain::{rpc::Auth, Blockchain, ConfigurableBlockchain, RpcBlockchain, RpcConfig}, database::MemoryDatabase, - sled::{self, Tree}, + sled::{Tree}, template::Bip86, wallet::verify::*, KeychainKind, SyncOptions, Wallet,