refactor: move CreatedTransactionResult to types.h

So it can be used by external modules without requiring wallet.h dependency.
bitcoin-core · May 16, 2024 · 95aaaa4 · 95aaaa4
1 parent 355199c
commit 95aaaa4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -357,6 +357,7 @@ BITCOIN_CORE_H = \
   wallet/sqlite.h \
   wallet/transaction.h \
   wallet/types.h \
+  wallet/util_spend.h \
   wallet/wallet.h \
   wallet/walletdb.h \
   wallet/wallettool.h \

diff --git a/src/wallet/spend.h b/src/wallet/spend.h
@@ -10,6 +10,7 @@
 #include <util/result.h>
 #include <wallet/coinselection.h>
 #include <wallet/transaction.h>
+#include <wallet/types.h>
 #include <wallet/wallet.h>
 
 #include <optional>
@@ -202,17 +203,6 @@ util::Result<SelectionResult> SelectCoins(const CWallet& wallet, CoinsResult& av
                                           const CAmount& nTargetValue, const CCoinControl& coin_control,
                                           const CoinSelectionParams& coin_selection_params) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet);
 
-struct CreatedTransactionResult
-{
-    CTransactionRef tx;
-    CAmount fee;
-    FeeCalculation fee_calc;
-    std::optional<unsigned int> change_pos;
-
-    CreatedTransactionResult(CTransactionRef _tx, CAmount _fee, std::optional<unsigned int> _change_pos, const FeeCalculation& _fee_calc)
-        : tx(_tx), fee(_fee), fee_calc(_fee_calc), change_pos(_change_pos) {}
-};
-
 /**
  * Create a new transaction paying the recipients with a set of coins
  * selected by SelectCoins(); Also create the change output, when needed

diff --git a/src/wallet/types.h b/src/wallet/types.h
@@ -13,6 +13,8 @@
 #ifndef BITCOIN_WALLET_TYPES_H
 #define BITCOIN_WALLET_TYPES_H
 
+#include <policy/fees.h>
+
 #include <type_traits>
 
 namespace wallet {
@@ -62,6 +64,18 @@ enum class AddressPurpose {
     SEND,
     REFUND, //!< Never set in current code may be present in older wallet databases
 };
+
+struct CreatedTransactionResult
+{
+    CTransactionRef tx;
+    CAmount fee;
+    FeeCalculation fee_calc;
+    std::optional<unsigned int> change_pos;
+
+    CreatedTransactionResult(CTransactionRef _tx, CAmount _fee, std::optional<unsigned int> _change_pos, const FeeCalculation& _fee_calc)
+            : tx(_tx), fee(_fee), fee_calc(_fee_calc), change_pos(_change_pos) {}
+};
+
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_TYPES_H