Remove all but one circular dep: coinselection <-> wallet

ElementsProject · Mar 20, 2019 · f56de12 · f56de12
1 parent 5c3481a
commit f56de12
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/src/asset.cpp b/src/asset.cpp
@@ -1,9 +1,5 @@
 
 #include <asset.h>
-#include <assetsdir.h>
-#include <core_io.h>
-#include <policy/policy.h>
-
 
 CAmountMap& operator+=(CAmountMap& a, const CAmountMap& b)
 {

diff --git a/src/asset.h b/src/asset.h
@@ -2,9 +2,7 @@
 #ifndef BITCOIN_ASSET_H
 #define BITCOIN_ASSET_H
 
-#include <stdint.h>
 #include <uint256.h>
-#include <stdlib.h>
 
 #include <amount.h>
 #include <serialize.h>

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -33,9 +33,6 @@
 #include <blind.h>
 #include <issuance.h>
 #include <rpc/util.h>
-#ifdef ENABLE_WALLET
-#include <wallet/rpcwallet.h>
-#endif
 
 #include <future>
 #include <stdint.h>

diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
@@ -40,6 +40,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
     "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil"
     "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
+    "wallet/coinselection -> wallet/wallet -> wallet/coinselection"
 )
 
 EXIT_CODE=0