diff options
| author | Hennadii Stepanov <[email protected]> | 2019-11-19 12:08:01 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <[email protected]> | 2019-11-19 17:05:35 +0200 |
| commit | a53e9895db7617c879858ca27e38e6aaf35f6075 (patch) | |
| tree | f5680d13d73889e873934c7041add7266a8824bd | |
| parent | refactor: Nuke walletmodeltransaction circular dep (diff) | |
| download | discoin-a53e9895db7617c879858ca27e38e6aaf35f6075.tar.xz discoin-a53e9895db7617c879858ca27e38e6aaf35f6075.zip | |
refactor: Nuke walletmodel circular dependency
| -rw-r--r-- | src/qt/paymentserver.h | 5 | ||||
| -rw-r--r-- | src/qt/transactiondesc.cpp | 5 | ||||
| -rwxr-xr-x | test/lint/lint-circular-dependencies.sh | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index f4cb995e4..6d4ce4a7e 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -37,13 +37,16 @@ #endif #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <QObject> #include <QString> class OptionsModel; +namespace interfaces { +class Node; +} // namespace interfaces + QT_BEGIN_NAMESPACE class QApplication; class QByteArray; diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 318b0756c..9a93798ae 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -15,11 +15,12 @@ #include <consensus/consensus.h> #include <interfaces/node.h> +#include <interfaces/wallet.h> #include <key_io.h> -#include <validation.h> +#include <policy/policy.h> #include <script/script.h> #include <util/system.h> -#include <policy/policy.h> +#include <validation.h> #include <wallet/ismine.h> #include <stdint.h> diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index 7807953c1..8b320832f 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -18,7 +18,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "qt/bitcoingui -> qt/walletframe -> qt/bitcoingui" "qt/bitcoingui -> qt/walletview -> qt/bitcoingui" "qt/clientmodel -> qt/peertablemodel -> qt/clientmodel" - "qt/paymentserver -> qt/walletmodel -> qt/paymentserver" "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel" "qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog" "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel" |