From 34543311bb5d099ef0df0a358e32c4ad80f9e4fd Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 1 Jul 2024 12:53:00 -0500 Subject: [PATCH] chore: clean up import paths that use blockdata --- bdk-ffi/src/bitcoin.rs | 4 ++-- bdk-ffi/src/wallet.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs index 4bbff3e0..8f56d3de 100644 --- a/bdk-ffi/src/bitcoin.rs +++ b/bdk-ffi/src/bitcoin.rs @@ -5,8 +5,6 @@ use crate::error::{ use bdk_bitcoind_rpc::bitcoincore_rpc::jsonrpc::serde_json; use bdk_wallet::bitcoin::address::{NetworkChecked, NetworkUnchecked}; use bdk_wallet::bitcoin::amount::ParseAmountError; -use bdk_wallet::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf; -use bdk_wallet::bitcoin::blockdata::transaction::TxOut as BdkTxOut; use bdk_wallet::bitcoin::consensus::encode::serialize; use bdk_wallet::bitcoin::consensus::Decodable; use bdk_wallet::bitcoin::io::Cursor; @@ -17,8 +15,10 @@ use bdk_wallet::bitcoin::FeeRate as BdkFeeRate; use bdk_wallet::bitcoin::Network; use bdk_wallet::bitcoin::OutPoint as BdkOutPoint; use bdk_wallet::bitcoin::Psbt as BdkPsbt; +use bdk_wallet::bitcoin::ScriptBuf as BdkScriptBuf; use bdk_wallet::bitcoin::Transaction as BdkTransaction; use bdk_wallet::bitcoin::TxIn as BdkTxIn; +use bdk_wallet::bitcoin::TxOut as BdkTxOut; use bdk_wallet::bitcoin::Txid; use std::fmt::Display; diff --git a/bdk-ffi/src/wallet.rs b/bdk-ffi/src/wallet.rs index 61c119a9..130c8d15 100644 --- a/bdk-ffi/src/wallet.rs +++ b/bdk-ffi/src/wallet.rs @@ -11,9 +11,9 @@ use crate::types::{ }; use bdk_wallet::bitcoin::amount::Amount as BdkAmount; -use bdk_wallet::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf; use bdk_wallet::bitcoin::Network; use bdk_wallet::bitcoin::Psbt as BdkPsbt; +use bdk_wallet::bitcoin::ScriptBuf as BdkScriptBuf; use bdk_wallet::bitcoin::{OutPoint as BdkOutPoint, Sequence, Txid}; use bdk_wallet::chain::{CombinedChangeSet, ConfirmationTimeHeightAnchor}; use bdk_wallet::wallet::tx_builder::ChangeSpendPolicy;