From 3ce16ad2f91d1e2edc7e7bdc5a19f72aa8c3e739 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Fri, 24 Jan 2020 17:02:41 -0500 Subject: 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. --- src/interfaces/wallet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interfaces/wallet.h') diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index d4280e8091..935fc6992e 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -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 { -- cgit v1.2.3