Merge pull request #5306

laanwj · laanwj · commit a0417b8cc840 · 2014-12-03T12:05:43.000+01:00
d227011 MOVEONLY: core/ -> primitives/ (Luke Dashjr)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -87,8 +87,8 @@ BITCOIN_CORE_H = \
   coins.h \
   compat.h \
   compressor.h \
-  core/block.h \
-  core/transaction.h \
+  primitives/block.h \
+  primitives/transaction.h \
   core_io.h \
   crypter.h \
   db.h \
@@ -235,8 +235,8 @@ libbitcoin_common_a_SOURCES = \
   chainparams.cpp \
   coins.cpp \
   compressor.cpp \
-  core/block.cpp \
-  core/transaction.cpp \
+  primitives/block.cpp \
+  primitives/transaction.cpp \
   core_read.cpp \
   core_write.cpp \
   eccryptoverify.cpp \
@@ -350,7 +350,7 @@ bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 if BUILD_BITCOIN_LIBS
 include_HEADERS = script/bitcoinconsensus.h
 libbitcoinconsensus_la_SOURCES = \
-  core/transaction.cpp \
+  primitives/transaction.cpp \
   crypto/hmac_sha512.cpp \
   crypto/sha1.cpp \
   crypto/sha256.cpp \
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -4,7 +4,7 @@
 
 #include "base58.h"
 #include "clientversion.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "core_io.h"
 #include "keystore.h"
 #include "main.h" // for MAX_BLOCK_SIZE
diff --git a/src/bloom.cpp b/src/bloom.cpp
@@ -4,7 +4,7 @@
 
 #include "bloom.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "hash.h"
 #include "script/script.h"
 #include "script/standard.h"
diff --git a/src/chain.h b/src/chain.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_CHAIN_H
 #define BITCOIN_CHAIN_H
 
-#include "core/block.h"
+#include "primitives/block.h"
 #include "pow.h"
 #include "tinyformat.h"
 #include "uint256.h"
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -8,7 +8,7 @@
 
 #include "chainparamsbase.h"
 #include "checkpoints.h"
-#include "core/block.h"
+#include "primitives/block.h"
 #include "protocol.h"
 #include "uint256.h"
 
diff --git a/src/coincontrol.h b/src/coincontrol.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_COINCONTROL_H
 #define BITCOIN_COINCONTROL_H
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 
 /** Coin Control Features. */
 class CCoinControl
diff --git a/src/compressor.h b/src/compressor.h
@@ -6,7 +6,7 @@
 #ifndef BITCOIN_COMPRESSOR_H
 #define BITCOIN_COMPRESSOR_H
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "script/script.h"
 #include "serialize.h"
 
diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -4,8 +4,8 @@
 
 #include "core_io.h"
 
-#include "core/block.h"
-#include "core/transaction.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "script/script.h"
 #include "serialize.h"
 #include "streams.h"
diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -5,7 +5,7 @@
 #include "core_io.h"
 
 #include "base58.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "script/script.h"
 #include "script/standard.h"
 #include "serialize.h"
diff --git a/src/main.h b/src/main.h
@@ -14,8 +14,8 @@
 #include "chain.h"
 #include "chainparams.h"
 #include "coins.h"
-#include "core/block.h"
-#include "core/transaction.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "net.h"
 #include "pow.h"
 #include "script/script.h"
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -6,8 +6,8 @@
 #include "miner.h"
 
 #include "amount.h"
-#include "core/block.h"
-#include "core/transaction.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "hash.h"
 #include "main.h"
 #include "net.h"
diff --git a/src/net.cpp b/src/net.cpp
@@ -12,7 +12,7 @@
 #include "addrman.h"
 #include "chainparams.h"
 #include "clientversion.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "ui_interface.h"
 
 #ifdef WIN32
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -7,7 +7,7 @@
 
 #include "chain.h"
 #include "chainparams.h"
-#include "core/block.h"
+#include "primitives/block.h"
 #include "uint256.h"
 #include "util.h"
 
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core/block.h"
+#include "primitives/block.h"
 
 #include "hash.h"
 #include "tinyformat.h"
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -3,10 +3,10 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_CORE_BLOCK_H
-#define BITCOIN_CORE_BLOCK_H
+#ifndef BITCOIN_PRIMITIVES_BLOCK_H
+#define BITCOIN_PRIMITIVES_BLOCK_H
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "serialize.h"
 #include "uint256.h"
 
@@ -165,4 +165,4 @@ struct CBlockLocator
     }
 };
 
-#endif // BITCOIN_CORE_BLOCK_H
+#endif // BITCOIN_PRIMITIVES_BLOCK_H
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 
 #include "hash.h"
 #include "tinyformat.h"
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.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_CORE_TRANSACTION_H
-#define BITCOIN_CORE_TRANSACTION_H
+#ifndef BITCOIN_PRIMITIVES_TRANSACTION_H
+#define BITCOIN_PRIMITIVES_TRANSACTION_H
 
 #include "amount.h"
 #include "script/script.h"
@@ -273,4 +273,4 @@ struct CMutableTransaction
     uint256 GetHash() const;
 };
 
-#endif // BITCOIN_CORE_TRANSACTION_H
+#endif // BITCOIN_PRIMITIVES_TRANSACTION_H
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
@@ -4,7 +4,7 @@
 
 #include "bitcoinunits.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 
 #include <QStringList>
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -9,7 +9,7 @@
 #include "qvalidatedlineedit.h"
 #include "walletmodel.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "init.h"
 #include "main.h"
 #include "protocol.h"
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core/block.h"
-#include "core/transaction.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "main.h"
 #include "rpcserver.h"
 #include "streams.h"
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "base58.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "core_io.h"
 #include "init.h"
 #include "keystore.h"
diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp
@@ -5,7 +5,7 @@
 
 #include "bitcoinconsensus.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "script/interpreter.h"
 #include "version.h"
 
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -5,7 +5,7 @@
 
 #include "interpreter.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "crypto/ripemd160.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
@@ -5,7 +5,7 @@
 
 #include "script/sign.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "key.h"
 #include "keystore.h"
 #include "script/standard.h"
diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "main.h"
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -5,7 +5,7 @@
 #include "util.h"
 
 #include "clientversion.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -10,7 +10,7 @@
 
 #include "amount.h"
 #include "coins.h"
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "sync.h"
 
 class CAutoFile;
diff --git a/src/undo.h b/src/undo.h
@@ -7,7 +7,7 @@
 #define BITCOIN_UNDO_H
 
 #include "compressor.h" 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "serialize.h"
 
 /** Undo information for a CTxIn
diff --git a/src/utilmoneystr.cpp b/src/utilmoneystr.cpp
@@ -5,7 +5,7 @@
 
 #include "utilmoneystr.h"
 
-#include "core/transaction.h"
+#include "primitives/transaction.h"
 #include "tinyformat.h"
 #include "utilstrencodings.h"
 
diff --git a/src/wallet.h b/src/wallet.h
@@ -7,8 +7,8 @@
 #define BITCOIN_WALLET_H
 
 #include "amount.h"
-#include "core/block.h"
-#include "core/transaction.h"
+#include "primitives/block.h"
+#include "primitives/transaction.h"
 #include "crypter.h"
 #include "key.h"
 #include "keystore.h"
