From 93bd00a0d529afa9ad34fac2f282a19ecbe29b98 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 25 Apr 2018 12:58:22 +0100 Subject: [PATCH] Add key_io includes to Zcash-specific code --- src/chainparams.cpp | 3 +-- src/init.cpp | 6 +++--- src/miner.cpp | 2 +- src/paymentdisclosure.cpp | 2 ++ src/test/rpc_wallet_tests.cpp | 2 +- src/wallet/asyncrpcoperation_mergetoaddress.cpp | 1 + src/wallet/asyncrpcoperation_mergetoaddress.h | 1 - src/wallet/asyncrpcoperation_sendmany.cpp | 1 + src/wallet/asyncrpcoperation_sendmany.h | 1 - src/wallet/asyncrpcoperation_shieldcoinbase.cpp | 1 + src/wallet/asyncrpcoperation_shieldcoinbase.h | 1 - src/wallet/rpcdisclosure.cpp | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2c9aed2ea..d75231ce3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -3,6 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "key_io.h" #include "main.h" #include "crypto/equihash.h" @@ -13,8 +14,6 @@ #include -#include "base58.h" - #include "chainparamsseeds.h" static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, const uint256& nNonce, const std::vector& nSolution, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward) diff --git a/src/init.cpp b/src/init.cpp index 06d5fc171..2962f3b9a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -11,9 +11,6 @@ #include "crypto/common.h" #include "addrman.h" #include "amount.h" -#ifdef ENABLE_MINING -#include "base58.h" -#endif #include "checkpoints.h" #include "compat/sanity.h" #include "consensus/upgrades.h" @@ -21,6 +18,9 @@ #include "httpserver.h" #include "httprpc.h" #include "key.h" +#ifdef ENABLE_MINING +#include "key_io.h" +#endif #include "main.h" #include "metrics.h" #include "miner.h" diff --git a/src/miner.cpp b/src/miner.cpp index 7c6e4140a..025d6efac 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -9,7 +9,6 @@ #endif #include "amount.h" -#include "base58.h" #include "chainparams.h" #include "consensus/consensus.h" #include "consensus/upgrades.h" @@ -18,6 +17,7 @@ #include "crypto/equihash.h" #endif #include "hash.h" +#include "key_io.h" #include "main.h" #include "metrics.h" #include "net.h" diff --git a/src/paymentdisclosure.cpp b/src/paymentdisclosure.cpp index e9a193cae..eb55a0536 100644 --- a/src/paymentdisclosure.cpp +++ b/src/paymentdisclosure.cpp @@ -3,6 +3,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "paymentdisclosure.h" + +#include "key_io.h" #include "util.h" std::string PaymentDisclosureInfo::ToString() const { diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 3c657a3db..0e09e5b14 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -5,7 +5,7 @@ #include "rpcserver.h" #include "rpcclient.h" -#include "base58.h" +#include "key_io.h" #include "main.h" #include "wallet/wallet.h" diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp index 7ac680186..aa8abf782 100644 --- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp +++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp @@ -8,6 +8,7 @@ #include "asyncrpcqueue.h" #include "core_io.h" #include "init.h" +#include "key_io.h" #include "main.h" #include "miner.h" #include "net.h" diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.h b/src/wallet/asyncrpcoperation_mergetoaddress.h index 3de54ca63..e6c8207e5 100644 --- a/src/wallet/asyncrpcoperation_mergetoaddress.h +++ b/src/wallet/asyncrpcoperation_mergetoaddress.h @@ -7,7 +7,6 @@ #include "amount.h" #include "asyncrpcoperation.h" -#include "base58.h" #include "paymentdisclosure.h" #include "primitives/transaction.h" #include "wallet.h" diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp index b6d30a4b1..e7aad3760 100644 --- a/src/wallet/asyncrpcoperation_sendmany.cpp +++ b/src/wallet/asyncrpcoperation_sendmany.cpp @@ -8,6 +8,7 @@ #include "consensus/upgrades.h" #include "core_io.h" #include "init.h" +#include "key_io.h" #include "main.h" #include "net.h" #include "netbase.h" diff --git a/src/wallet/asyncrpcoperation_sendmany.h b/src/wallet/asyncrpcoperation_sendmany.h index 1d2dc0f3d..e1151962a 100644 --- a/src/wallet/asyncrpcoperation_sendmany.h +++ b/src/wallet/asyncrpcoperation_sendmany.h @@ -7,7 +7,6 @@ #include "asyncrpcoperation.h" #include "amount.h" -#include "base58.h" #include "primitives/transaction.h" #include "zcash/JoinSplit.hpp" #include "zcash/Address.hpp" diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp index 69bde8526..9546a4491 100644 --- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp +++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp @@ -7,6 +7,7 @@ #include "consensus/upgrades.h" #include "core_io.h" #include "init.h" +#include "key_io.h" #include "main.h" #include "net.h" #include "netbase.h" diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.h b/src/wallet/asyncrpcoperation_shieldcoinbase.h index c7faf28e8..e63c54d7d 100644 --- a/src/wallet/asyncrpcoperation_shieldcoinbase.h +++ b/src/wallet/asyncrpcoperation_shieldcoinbase.h @@ -7,7 +7,6 @@ #include "asyncrpcoperation.h" #include "amount.h" -#include "base58.h" #include "primitives/transaction.h" #include "zcash/JoinSplit.hpp" #include "zcash/Address.hpp" diff --git a/src/wallet/rpcdisclosure.cpp b/src/wallet/rpcdisclosure.cpp index 7ca6086ae..cfc8262b0 100644 --- a/src/wallet/rpcdisclosure.cpp +++ b/src/wallet/rpcdisclosure.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "base58.h" #include "rpcserver.h" #include "init.h" +#include "key_io.h" #include "main.h" #include "script/script.h" #include "script/standard.h"