Skip to content

Commit a53e989

Browse files
committed
refactor: Nuke walletmodel circular dependency
1 parent 49c4211 commit a53e989

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/qt/paymentserver.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@
3737
#endif
3838

3939
#include <qt/sendcoinsrecipient.h>
40-
#include <qt/walletmodel.h>
4140

4241
#include <QObject>
4342
#include <QString>
4443

4544
class OptionsModel;
4645

46+
namespace interfaces {
47+
class Node;
48+
} // namespace interfaces
49+
4750
QT_BEGIN_NAMESPACE
4851
class QApplication;
4952
class QByteArray;

src/qt/transactiondesc.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
#include <consensus/consensus.h>
1717
#include <interfaces/node.h>
18+
#include <interfaces/wallet.h>
1819
#include <key_io.h>
19-
#include <validation.h>
20+
#include <policy/policy.h>
2021
#include <script/script.h>
2122
#include <util/system.h>
22-
#include <policy/policy.h>
23+
#include <validation.h>
2324
#include <wallet/ismine.h>
2425

2526
#include <stdint.h>

test/lint/lint-circular-dependencies.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
1818
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
1919
"qt/bitcoingui -> qt/walletview -> qt/bitcoingui"
2020
"qt/clientmodel -> qt/peertablemodel -> qt/clientmodel"
21-
"qt/paymentserver -> qt/walletmodel -> qt/paymentserver"
2221
"qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
2322
"qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
2423
"qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"

0 commit comments

Comments
 (0)