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.
This commit is contained in:
Russell Yanofsky 2020-01-24 17:02:41 -05:00
parent 1dde238f2c
commit 3ce16ad2f9
2 changed files with 5 additions and 4 deletions

View File

@ -14,7 +14,6 @@
#include <functional>
#include <map>
#include <memory>
#include <psbt.h>
#include <stdint.h>
#include <string>
#include <tuple>
@ -25,12 +24,13 @@ class CCoinControl;
class CFeeRate;
class CKey;
class CWallet;
enum isminetype : unsigned int;
enum class FeeReason;
typedef uint8_t isminefilter;
enum class OutputType;
enum class TransactionError;
enum isminetype : unsigned int;
struct CRecipient;
struct PartiallySignedTransaction;
typedef uint8_t isminefilter;
namespace interfaces {

View File

@ -20,6 +20,7 @@
#include <interfaces/handler.h>
#include <interfaces/node.h>
#include <key_io.h>
#include <psbt.h>
#include <ui_interface.h>
#include <util/system.h> // for GetBoolArg
#include <wallet/coincontrol.h>