Skip to content

Commit 3ce16ad

Browse files
committed
refactor: Use psbt forward declaration
Also clean up forward other forward declarations in interfaces/wallet.h with !sort Original motivation for this change was to fix a circular dependencies lint error: "interfaces/chain.h -> interfaces/wallet.h -> psbt -> node/transaction -> node/context -> interfaces/chain.h" from an earlier commit in this PR adding a "interfaces/chain.h -> interfaces/wallet.h" include. Now, the wallet include is no longer added, but it is still good to clean up the psbt include for efficiency, and to sort the forward declarations.
1 parent 1dde238 commit 3ce16ad

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/interfaces/wallet.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <functional>
1515
#include <map>
1616
#include <memory>
17-
#include <psbt.h>
1817
#include <stdint.h>
1918
#include <string>
2019
#include <tuple>
@@ -25,12 +24,13 @@ class CCoinControl;
2524
class CFeeRate;
2625
class CKey;
2726
class CWallet;
28-
enum isminetype : unsigned int;
2927
enum class FeeReason;
30-
typedef uint8_t isminefilter;
31-
3228
enum class OutputType;
29+
enum class TransactionError;
30+
enum isminetype : unsigned int;
3331
struct CRecipient;
32+
struct PartiallySignedTransaction;
33+
typedef uint8_t isminefilter;
3434

3535
namespace interfaces {
3636

src/qt/walletmodel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <interfaces/handler.h>
2121
#include <interfaces/node.h>
2222
#include <key_io.h>
23+
#include <psbt.h>
2324
#include <ui_interface.h>
2425
#include <util/system.h> // for GetBoolArg
2526
#include <wallet/coincontrol.h>

0 commit comments

Comments
 (0)