[MOVEONLY] consensus: move amount.h into consensus

Move amount.h to consensus/amount.h.
Renames, adds missing and removes uneeded includes.

Author: fanquake

src/Makefile.am

@@ -498,9 +498,9 @@ crypto_libbitcoin_crypto_shani_a_SOURCES = crypto/sha256_shani.cpp
 libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_consensus_a_SOURCES = \
-  amount.h \
   arith_uint256.cpp \
   arith_uint256.h \
+  consensus/amount.h \
   consensus/merkle.cpp \
   consensus/merkle.h \
   consensus/params.h \

src/bitcoin-tx.cpp

@@ -8,6 +8,7 @@
 
 #include <clientversion.h>
 #include <coins.h>
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <core_io.h>
 #include <key_io.h>

src/amount.h renamed to src/consensus/amount.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_AMOUNT_H
-#define BITCOIN_AMOUNT_H
+#ifndef BITCOIN_CONSENSUS_AMOUNT_H
+#define BITCOIN_CONSENSUS_AMOUNT_H
 
 #include <stdint.h>
 
@@ -25,4 +25,4 @@ static const CAmount COIN = 100000000;
 static const CAmount MAX_MONEY = 21000000 * COIN;
 inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
 
-#endif //  BITCOIN_AMOUNT_H
+#endif //  BITCOIN_CONSENSUS_AMOUNT_H

src/consensus/tx_check.cpp

@@ -4,6 +4,7 @@
 
 #include <consensus/tx_check.h>
 
+#include <consensus/amount.h>
 #include <primitives/transaction.h>
 #include <consensus/validation.h>
 

src/consensus/tx_verify.cpp

@@ -4,6 +4,7 @@
 
 #include <consensus/tx_verify.h>
 
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>

src/consensus/tx_verify.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
 #define BITCOIN_CONSENSUS_TX_VERIFY_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 
 #include <stdint.h>
 #include <vector>

src/core_io.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_CORE_IO_H
 #define BITCOIN_CORE_IO_H
 
-#include <amount.h>
+#include <consensus/amount.h>
 #include <attributes.h>
 
 #include <string>

src/core_write.cpp

@@ -4,6 +4,7 @@
 
 #include <core_io.h>
 
+#include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <key_io.h>

src/init.cpp

@@ -10,12 +10,12 @@
 #include <init.h>
 
 #include <addrman.h>
-#include <amount.h>
 #include <banman.h>
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <compat/sanity.h>
+#include <consensus/amount.h>
 #include <deploymentstatus.h>
 #include <fs.h>
 #include <hash.h>

src/interfaces/node.h

@@ -5,7 +5,7 @@
 #ifndef BITCOIN_INTERFACES_NODE_H
 #define BITCOIN_INTERFACES_NODE_H
 
-#include <amount.h>     // For CAmount
+#include <consensus/amount.h>
 #include <external_signer.h>
 #include <net.h>        // For NodeId
 #include <net_types.h>  // For banmap_t