aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/base58.h2
-rw-r--r--src/bloom.cpp2
-rw-r--r--src/core.h2
-rw-r--r--src/core_read.cpp2
-rw-r--r--src/core_write.cpp2
-rw-r--r--src/crypter.cpp2
-rw-r--r--src/keystore.cpp2
-rw-r--r--src/main.h2
-rw-r--r--src/qt/transactiondesc.cpp2
-rw-r--r--src/scriptutils.cpp (renamed from src/script.cpp)2
-rw-r--r--src/scriptutils.h (renamed from src/script.h)4
-rw-r--r--src/test/DoS_tests.cpp2
-rw-r--r--src/test/base58_tests.cpp2
-rw-r--r--src/test/canonical_tests.cpp2
-rw-r--r--src/test/key_tests.cpp2
-rw-r--r--src/test/multisig_tests.cpp2
-rw-r--r--src/test/script_P2SH_tests.cpp4
-rw-r--r--src/test/script_tests.cpp4
-rw-r--r--src/test/scriptnum_tests.cpp2
-rw-r--r--src/test/sighash_tests.cpp2
-rw-r--r--src/test/sigopcount_tests.cpp2
-rw-r--r--src/test/transaction_tests.cpp2
23 files changed, 25 insertions, 29 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 35fca6570f..e6fc1fdbef 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 70681f589a..a4dc726767 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 <string>
#include <vector>
diff --git a/src/bloom.cpp b/src/bloom.cpp
index e34041336f..07990beb15 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 <math.h>
#include <stdlib.h>
diff --git a/src/core.h b/src/core.h
index cde8d8b3fe..0df75670fd 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 57f1397f18..41d8d6b492 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 <boost/assign/list_of.hpp>
diff --git a/src/core_write.cpp b/src/core_write.cpp
index e66e75515c..e816611809 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 8aa2bb0517..ac5c8952e6 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 <string>
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 72ae9b0a30..e273bbb1de 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 <boost/foreach.hpp>
diff --git a/src/main.h b/src/main.h
index 8c0a743e24..1fc9b3ecf1 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 8258e719a3..d1feeef179 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
index f3d423a424..ce0d3b7537 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
index d17cfe3fa4..44f18483c3 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 8fa38c3605..a113425891 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 0ac3e9a363..0587ddac84 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 a9798623ea..2d2a600740 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 <boost/foreach.hpp>
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index 864d90128c..c6bf0db3af 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 02c6d095f2..2e45a7a022 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 <boost/assign/std/vector.hpp>
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
index 51ff1ffbc9..d27fc71598 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 <vector>
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 77c44501ab..a8ccd50598 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 <fstream>
diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp
index cd194cc4d9..c3cd41cf84 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 <boost/test/unit_test.hpp>
#include <limits.h>
#include <stdint.h>
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index bff151cdda..53f4d443c4 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 722f14a989..963ccf560d 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 <vector>
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 03919e7c7d..2b5161b0cf 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 <map>
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-09 12:01:55 +0000