GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Gregory Sanders 2019-03-20 10:10:43 -04:00
parent 5c3481a91e
commit f56de12cdd
4 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/asset.cpp
View file

@ -1,9 +1,5 @@
#include <asset.h> #include <asset.h>
#include <assetsdir.h>
#include <core_io.h>
#include <policy/policy.h>
CAmountMap& operator+=(CAmountMap& a, const CAmountMap& b) CAmountMap& operator+=(CAmountMap& a, const CAmountMap& b)
{ {

2
src/asset.h
View file

@ -2,9 +2,7 @@
#ifndef BITCOIN_ASSET_H #ifndef BITCOIN_ASSET_H
#define BITCOIN_ASSET_H #define BITCOIN_ASSET_H
#include <stdint.h>
#include <uint256.h> #include <uint256.h>
#include <stdlib.h>
#include <amount.h> #include <amount.h>
#include <serialize.h> #include <serialize.h>

3
src/rpc/rawtransaction.cpp
View file

@ -33,9 +33,6 @@
#include <blind.h> #include <blind.h>
#include <issuance.h> #include <issuance.h>
#include <rpc/util.h> #include <rpc/util.h>
#ifdef ENABLE_WALLET
#include <wallet/rpcwallet.h>
#endif
#include <future> #include <future>
#include <stdint.h> #include <stdint.h>

1
test/lint/lint-circular-dependencies.sh
View file

@ -40,6 +40,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage" "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
"qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil" "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil"
"qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage" "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
"wallet/coinselection -> wallet/wallet -> wallet/coinselection"
) )
EXIT_CODE=0 EXIT_CODE=0