diff --git a/src/main.rs b/src/main.rs index 34ae3e1..57c16c4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,11 +15,11 @@ use futures_util::{future, pin_mut, stream::TryStreamExt, FutureExt, StreamExt}; use log::{debug, error, warn}; use message::{broadcast_message, process_message, BroadcastType, MessageCache, MESSAGECACHE}; use scan::compute_partial_tweak_to_transaction; -use sdk_common::sp_client::bitcoin::{ +use sdk_common::{sp_client::bitcoin::{ consensus::deserialize, hex::{DisplayHex, FromHex}, Amount, Network, Transaction, -}; +}, MutexExt}; use sdk_common::sp_client::{ bitcoin::secp256k1::rand::{thread_rng, Rng}, spclient::SpWallet, @@ -123,17 +123,6 @@ impl WalletFile { const FAUCET_AMT: Amount = Amount::from_sat(100_000); -pub(crate) trait MutexExt { - fn lock_anyhow(&self) -> Result, Error>; -} - -impl MutexExt for Mutex { - fn lock_anyhow(&self) -> Result, Error> { - self.lock() - .map_err(|e| Error::msg(format!("Failed to lock: {}", e))) - } -} - #[derive(Debug)] struct SilentPaymentWallet { sp_wallet: Mutex,