From 5ad8de2b5768b6467f7e6095d82600837b9a4d49 Mon Sep 17 00:00:00 2001
From: thunderbiscuit <thunderbiscuit@protonmail.com>
Date: Mon, 16 Sep 2024 09:53:18 -0400
Subject: [PATCH] refactor: move small types in types module

---
 bdk-ffi/src/lib.rs        |  2 +-
 bdk-ffi/src/tx_builder.rs |  4 ++--
 bdk-ffi/src/types.rs      | 11 +++++++++++
 bdk-ffi/src/wallet.rs     | 28 +++++++---------------------
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
index 453bb63d..110b21cc 100644
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -57,11 +57,11 @@ use crate::types::FullScanRequestBuilder;
 use crate::types::FullScanScriptInspector;
 use crate::types::LocalOutput;
 use crate::types::ScriptAmount;
+use crate::types::SentAndReceivedValues;
 use crate::types::SyncRequest;
 use crate::types::SyncRequestBuilder;
 use crate::types::SyncScriptInspector;
 use crate::types::Update;
-use crate::wallet::SentAndReceivedValues;
 use crate::wallet::Wallet;
 
 use bitcoin_ffi::Amount;
diff --git a/bdk-ffi/src/tx_builder.rs b/bdk-ffi/src/tx_builder.rs
index acb297ce..8bef9709 100644
--- a/bdk-ffi/src/tx_builder.rs
+++ b/bdk-ffi/src/tx_builder.rs
@@ -1,7 +1,7 @@
 use crate::bitcoin::Psbt;
 use crate::error::CreateTxError;
-use crate::types::ScriptAmount;
-use crate::wallet::{RbfValue, Wallet};
+use crate::types::{RbfValue, ScriptAmount};
+use crate::wallet::Wallet;
 
 use bitcoin_ffi::{Amount, FeeRate, Script};
 
diff --git a/bdk-ffi/src/types.rs b/bdk-ffi/src/types.rs
index 0620d245..6b290d5c 100644
--- a/bdk-ffi/src/types.rs
+++ b/bdk-ffi/src/types.rs
@@ -227,3 +227,14 @@ impl FullScanRequestBuilder {
 }
 
 pub struct Update(pub(crate) BdkUpdate);
+
+pub struct SentAndReceivedValues {
+    pub sent: Arc<Amount>,
+    pub received: Arc<Amount>,
+}
+
+#[derive(Clone, Debug)]
+pub enum RbfValue {
+    Default,
+    Value(u32),
+}
diff --git a/bdk-ffi/src/wallet.rs b/bdk-ffi/src/wallet.rs
index ac168457..34d92064 100644
--- a/bdk-ffi/src/wallet.rs
+++ b/bdk-ffi/src/wallet.rs
@@ -5,19 +5,16 @@ use crate::error::{
     SignerError, SqliteError, TxidParseError,
 };
 use crate::store::Connection;
-use crate::types::{AddressInfo, Balance, CanonicalTx, LocalOutput};
-use crate::types::{FullScanRequestBuilder, SyncRequestBuilder, Update};
+use crate::types::{
+    AddressInfo, Balance, CanonicalTx, FullScanRequestBuilder, LocalOutput, SentAndReceivedValues,
+    SyncRequestBuilder, Update,
+};
 
-use bitcoin_ffi::Amount;
-use bitcoin_ffi::FeeRate;
-use bitcoin_ffi::Script;
+use bitcoin_ffi::{Amount, FeeRate, Script};
 
-use bdk_wallet::bitcoin::Network;
-use bdk_wallet::bitcoin::Txid;
+use bdk_wallet::bitcoin::{Network, Txid};
 use bdk_wallet::rusqlite::Connection as BdkConnection;
-use bdk_wallet::PersistedWallet;
-use bdk_wallet::Wallet as BdkWallet;
-use bdk_wallet::{KeychainKind, SignOptions};
+use bdk_wallet::{KeychainKind, PersistedWallet, SignOptions, Wallet as BdkWallet};
 
 use std::borrow::BorrowMut;
 use std::str::FromStr;
@@ -178,14 +175,3 @@ impl Wallet {
             })
     }
 }
-
-pub struct SentAndReceivedValues {
-    pub sent: Arc<Amount>,
-    pub received: Arc<Amount>,
-}
-
-#[derive(Clone, Debug)]
-pub enum RbfValue {
-    Default,
-    Value(u32),
-}