From 22774fc71d4b4c64b61843dd8cdde2ac30d39caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ceyhun=20=C5=9Een?= Date: Tue, 17 Sep 2024 11:21:39 +0300 Subject: [PATCH] user: Remove unused function. --- core/src/user.rs | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/core/src/user.rs b/core/src/user.rs index 2c40359e..5529687b 100644 --- a/core/src/user.rs +++ b/core/src/user.rs @@ -3,10 +3,10 @@ use crate::config::BridgeConfig; use crate::errors::BridgeError; use crate::extended_rpc::ExtendedRpc; use crate::musig2::AggregateFromPublicKeys; -use crate::transaction_builder::TransactionBuilder; +use crate::transaction_builder; use crate::{EVMAddress, UTXO}; +use bitcoin::Amount; use bitcoin::{Address, TxOut}; -use bitcoin::{Amount, OutPoint}; use bitcoin::{TapSighashType, XOnlyPublicKey}; use bitcoin_mock_rpc::RpcApiWrapper; use secp256k1::schnorr; @@ -44,30 +44,9 @@ where } } - #[tracing::instrument(skip(self), err(level = tracing::Level::ERROR), ret(level = tracing::Level::TRACE))] - pub fn deposit_tx( - &self, - evm_address: EVMAddress, - ) -> Result<(OutPoint, XOnlyPublicKey, EVMAddress), BridgeError> { - let (deposit_address, _) = TransactionBuilder::generate_deposit_address( - &self.nofn_xonly_pk, - self.signer.address.as_unchecked(), - &evm_address, - self.config.bridge_amount_sats, - self.config.network, - self.config.user_takes_after, - ); - - let deposit_outpoint = self - .rpc - .send_to_address(&deposit_address, self.config.bridge_amount_sats)?; - - Ok((deposit_outpoint, self.signer.xonly_public_key, evm_address)) - } - #[tracing::instrument(skip(self), err(level = tracing::Level::ERROR), ret(level = tracing::Level::TRACE))] pub fn get_deposit_address(&self, evm_address: EVMAddress) -> Result { - let (deposit_address, _) = TransactionBuilder::generate_deposit_address( + let (deposit_address, _) = transaction_builder::generate_deposit_address( &self.nofn_xonly_pk, self.signer.address.as_unchecked(), &evm_address, @@ -95,13 +74,13 @@ where script_pubkey: self.signer.address.script_pubkey(), }, }; - let txins = TransactionBuilder::create_tx_ins(vec![dust_utxo.outpoint]); + let txins = transaction_builder::create_tx_ins(vec![dust_utxo.outpoint]); let txout = TxOut { value: Amount::from_sat(withdrawal_amount), // TODO: Change this in the future since Operators should profit from the bridge script_pubkey: withdrawal_address.script_pubkey(), }; let txouts = vec![txout.clone()]; - let mut tx = TransactionBuilder::create_btc_tx(txins, txouts.clone()); + let mut tx = transaction_builder::create_btc_tx(txins, txouts.clone()); let prevouts = vec![dust_utxo.txout.clone()]; let sig = self.signer.sign_taproot_pubkey_spend_tx_with_sighash( &mut tx,