From 86dbeea2cdd5749374c98afea3e4f5f49817f746 Mon Sep 17 00:00:00 2001 From: jtimon Date: Thu, 14 Aug 2014 13:54:05 +0200 Subject: [PATCH] Rename script.h/.cpp to scriptutils.h/.cpp (plus remove duplicated includes) --- src/Makefile.am | 4 ++-- src/base58.h | 2 +- src/bloom.cpp | 2 +- src/core.h | 2 +- src/core_read.cpp | 2 +- src/core_write.cpp | 2 +- src/crypter.cpp | 2 +- src/keystore.cpp | 2 +- src/main.h | 2 +- src/qt/transactiondesc.cpp | 2 +- src/{script.cpp => scriptutils.cpp} | 2 +- src/{script.h => scriptutils.h} | 4 ++-- src/test/DoS_tests.cpp | 2 +- src/test/base58_tests.cpp | 2 +- src/test/canonical_tests.cpp | 2 +- src/test/key_tests.cpp | 2 +- src/test/multisig_tests.cpp | 2 +- src/test/script_P2SH_tests.cpp | 4 +--- src/test/script_tests.cpp | 4 +--- src/test/scriptnum_tests.cpp | 2 +- src/test/sighash_tests.cpp | 2 +- src/test/sigopcount_tests.cpp | 2 +- src/test/transaction_tests.cpp | 2 +- 23 files changed, 25 insertions(+), 29 deletions(-) rename src/{script.cpp => scriptutils.cpp} (99%) rename src/{script.h => scriptutils.h} (99%) diff --git a/src/Makefile.am b/src/Makefile.am index 35fca6570f8..e6fc1fdbefa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,7 +98,7 @@ BITCOIN_CORE_H = \ rpcclient.h \ rpcprotocol.h \ rpcserver.h \ - script.h \ + scriptutils.h \ serialize.h \ sync.h \ threadsafety.h \ @@ -206,7 +206,7 @@ libbitcoin_common_a_SOURCES = \ keystore.cpp \ netbase.cpp \ protocol.cpp \ - script.cpp \ + scriptutils.cpp \ $(BITCOIN_CORE_H) # util: shared between all executables. diff --git a/src/base58.h b/src/base58.h index 70681f589a6..a4dc7267670 100644 --- a/src/base58.h +++ b/src/base58.h @@ -16,7 +16,7 @@ #include "chainparams.h" #include "key.h" -#include "script.h" +#include "scriptutils.h" #include #include diff --git a/src/bloom.cpp b/src/bloom.cpp index e34041336fb..07990beb15e 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -5,7 +5,7 @@ #include "bloom.h" #include "core.h" -#include "script.h" +#include "scriptutils.h" #include #include diff --git a/src/core.h b/src/core.h index cde8d8b3fe0..0df75670fdc 100644 --- a/src/core.h +++ b/src/core.h @@ -6,7 +6,7 @@ #ifndef BITCOIN_CORE_H #define BITCOIN_CORE_H -#include "script.h" +#include "scriptutils.h" #include "serialize.h" #include "uint256.h" diff --git a/src/core_read.cpp b/src/core_read.cpp index 57f1397f18b..41d8d6b4927 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -5,7 +5,7 @@ #include "core_io.h" #include "core.h" #include "serialize.h" -#include "script.h" +#include "scriptutils.h" #include "util.h" #include diff --git a/src/core_write.cpp b/src/core_write.cpp index e66e75515c3..e816611809a 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -4,7 +4,7 @@ #include "core_io.h" #include "univalue/univalue.h" -#include "script.h" +#include "scriptutils.h" #include "core.h" #include "serialize.h" #include "util.h" diff --git a/src/crypter.cpp b/src/crypter.cpp index 8aa2bb05177..ac5c8952e63 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -4,7 +4,7 @@ #include "crypter.h" -#include "script.h" +#include "scriptutils.h" #include "util.h" #include diff --git a/src/keystore.cpp b/src/keystore.cpp index 72ae9b0a30c..e273bbb1de9 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -7,7 +7,7 @@ #include "crypter.h" #include "key.h" -#include "script.h" +#include "scriptutils.h" #include "util.h" #include diff --git a/src/main.h b/src/main.h index 8c0a743e24d..1fc9b3ecf15 100644 --- a/src/main.h +++ b/src/main.h @@ -15,7 +15,7 @@ #include "core.h" #include "net.h" #include "pow.h" -#include "script.h" +#include "scriptutils.h" #include "sync.h" #include "txmempool.h" #include "uint256.h" diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 8258e719a36..d1feeef1794 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -11,7 +11,7 @@ #include "db.h" #include "main.h" #include "paymentserver.h" -#include "script.h" +#include "scriptutils.h" #include "transactionrecord.h" #include "timedata.h" #include "ui_interface.h" diff --git a/src/script.cpp b/src/scriptutils.cpp similarity index 99% rename from src/script.cpp rename to src/scriptutils.cpp index f3d423a4245..ce0d3b75375 100644 --- a/src/script.cpp +++ b/src/scriptutils.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 "script.h" +#include "scriptutils.h" #include "crypto/ripemd160.h" #include "crypto/sha1.h" diff --git a/src/script.h b/src/scriptutils.h similarity index 99% rename from src/script.h rename to src/scriptutils.h index d17cfe3fa45..44f18483c38 100644 --- a/src/script.h +++ b/src/scriptutils.h @@ -3,8 +3,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef H_BITCOIN_SCRIPT -#define H_BITCOIN_SCRIPT +#ifndef H_BITCOIN_SCRIPTUTILS +#define H_BITCOIN_SCRIPTUTILS #include "key.h" #include "utilstrencodings.h" diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 8fa38c3605f..a1134258917 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -12,7 +12,7 @@ #include "main.h" #include "net.h" #include "pow.h" -#include "script.h" +#include "scriptutils.h" #include "serialize.h" #include "util.h" diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 0ac3e9a3635..0587ddac849 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -9,7 +9,7 @@ #include "data/base58_keys_valid.json.h" #include "key.h" -#include "script.h" +#include "scriptutils.h" #include "uint256.h" #include "util.h" diff --git a/src/test/canonical_tests.cpp b/src/test/canonical_tests.cpp index a9798623ea8..2d2a6007401 100644 --- a/src/test/canonical_tests.cpp +++ b/src/test/canonical_tests.cpp @@ -9,7 +9,7 @@ #include "data/sig_noncanonical.json.h" #include "data/sig_canonical.json.h" #include "random.h" -#include "script.h" +#include "scriptutils.h" #include "util.h" #include diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 864d90128c7..c6bf0db3af3 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -5,7 +5,7 @@ #include "key.h" #include "base58.h" -#include "script.h" +#include "scriptutils.h" #include "uint256.h" #include "util.h" diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 02c6d095f2a..2e45a7a0229 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -5,7 +5,7 @@ #include "key.h" #include "keystore.h" #include "main.h" -#include "script.h" +#include "scriptutils.h" #include "uint256.h" #include diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 51ff1ffbc94..d27fc715986 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -2,12 +2,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "script.h" - #include "key.h" #include "keystore.h" #include "main.h" -#include "script.h" +#include "scriptutils.h" #include diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 77c44501ab3..a8ccd505980 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -2,15 +2,13 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "script.h" - #include "data/script_invalid.json.h" #include "data/script_valid.json.h" #include "key.h" #include "keystore.h" #include "main.h" -#include "script.h" +#include "scriptutils.h" #include "core_io.h" #include diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp index cd194cc4d98..c3cd41cf845 100644 --- a/src/test/scriptnum_tests.cpp +++ b/src/test/scriptnum_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "bignum.h" -#include "script.h" +#include "scriptutils.h" #include #include #include diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index bff151cddaa..53f4d443c4b 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -6,7 +6,7 @@ #include "main.h" #include "random.h" #include "serialize.h" -#include "script.h" +#include "scriptutils.h" #include "util.h" #include "version.h" diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 722f14a9897..963ccf560d3 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "key.h" -#include "script.h" +#include "scriptutils.h" #include "uint256.h" #include diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 03919e7c7d3..2b5161b0cf6 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -8,7 +8,7 @@ #include "key.h" #include "keystore.h" #include "main.h" -#include "script.h" +#include "scriptutils.h" #include "core_io.h" #include