Browse Source

Rename script.h/.cpp to scriptutils.h/.cpp (plus remove duplicated includes)

pull/1/head
jtimon 8 years ago committed by Pieter Wuille
parent
commit
86dbeea2cd
  1. 4
      src/Makefile.am
  2. 2
      src/base58.h
  3. 2
      src/bloom.cpp
  4. 2
      src/core.h
  5. 2
      src/core_read.cpp
  6. 2
      src/core_write.cpp
  7. 2
      src/crypter.cpp
  8. 2
      src/keystore.cpp
  9. 2
      src/main.h
  10. 2
      src/qt/transactiondesc.cpp
  11. 2
      src/scriptutils.cpp
  12. 4
      src/scriptutils.h
  13. 2
      src/test/DoS_tests.cpp
  14. 2
      src/test/base58_tests.cpp
  15. 2
      src/test/canonical_tests.cpp
  16. 2
      src/test/key_tests.cpp
  17. 2
      src/test/multisig_tests.cpp
  18. 4
      src/test/script_P2SH_tests.cpp
  19. 4
      src/test/script_tests.cpp
  20. 2
      src/test/scriptnum_tests.cpp
  21. 2
      src/test/sighash_tests.cpp
  22. 2
      src/test/sigopcount_tests.cpp
  23. 2
      src/test/transaction_tests.cpp

4
src/Makefile.am

@ -98,7 +98,7 @@ BITCOIN_CORE_H = \ @@ -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 = \ @@ -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.

2
src/base58.h

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
#include "chainparams.h"
#include "key.h"
#include "script.h"
#include "scriptutils.h"
#include <string>
#include <vector>

2
src/bloom.cpp

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "bloom.h"
#include "core.h"
#include "script.h"
#include "scriptutils.h"
#include <math.h>
#include <stdlib.h>

2
src/core.h

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
#ifndef BITCOIN_CORE_H
#define BITCOIN_CORE_H
#include "script.h"
#include "scriptutils.h"
#include "serialize.h"
#include "uint256.h"

2
src/core_read.cpp

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "core_io.h"
#include "core.h"
#include "serialize.h"
#include "script.h"
#include "scriptutils.h"
#include "util.h"
#include <boost/assign/list_of.hpp>

2
src/core_write.cpp

@ -4,7 +4,7 @@ @@ -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"

2
src/crypter.cpp

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
#include "crypter.h"
#include "script.h"
#include "scriptutils.h"
#include "util.h"
#include <string>

2
src/keystore.cpp

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
#include "crypter.h"
#include "key.h"
#include "script.h"
#include "scriptutils.h"
#include "util.h"
#include <boost/foreach.hpp>

2
src/main.h

@ -15,7 +15,7 @@ @@ -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"

2
src/qt/transactiondesc.cpp

@ -11,7 +11,7 @@ @@ -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"

2
src/script.cpp → src/scriptutils.cpp

@ -3,7 +3,7 @@ @@ -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"

4
src/script.h → src/scriptutils.h

@ -3,8 +3,8 @@ @@ -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"

2
src/test/DoS_tests.cpp

@ -12,7 +12,7 @@ @@ -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"

2
src/test/base58_tests.cpp

@ -9,7 +9,7 @@ @@ -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"

2
src/test/canonical_tests.cpp

@ -9,7 +9,7 @@ @@ -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 <boost/foreach.hpp>

2
src/test/key_tests.cpp

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "key.h"
#include "base58.h"
#include "script.h"
#include "scriptutils.h"
#include "uint256.h"
#include "util.h"

2
src/test/multisig_tests.cpp

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "key.h"
#include "keystore.h"
#include "main.h"
#include "script.h"
#include "scriptutils.h"
#include "uint256.h"
#include <boost/assign/std/vector.hpp>

4
src/test/script_P2SH_tests.cpp

@ -2,12 +2,10 @@ @@ -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 <vector>

4
src/test/script_tests.cpp

@ -2,15 +2,13 @@ @@ -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 <fstream>

2
src/test/scriptnum_tests.cpp

@ -3,7 +3,7 @@ @@ -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 <boost/test/unit_test.hpp>
#include <limits.h>
#include <stdint.h>

2
src/test/sighash_tests.cpp

@ -6,7 +6,7 @@ @@ -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"

2
src/test/sigopcount_tests.cpp

@ -3,7 +3,7 @@ @@ -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 <vector>

2
src/test/transaction_tests.cpp

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
#include "key.h"
#include "keystore.h"
#include "main.h"
#include "script.h"
#include "scriptutils.h"
#include "core_io.h"
#include <map>

Loading…
Cancel
Save