diff options
| author | Andrew Chow <github@achow101.com> | 2023-08-09 07:28:55 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-08-14 17:38:27 -0400 |
| commit | bacdb2e208531124e85ed2d4ea2a4b508fbb5088 (patch) | |
| tree | cda736244bff86f084188dae122ac0e430014046 | |
| parent | f3c9078b4cddec5581e52de5c216ae53984ec130 (diff) | |
| download | bitcoin-bacdb2e208531124e85ed2d4ea2a4b508fbb5088.tar.xz | |
Clean up script/standard.{h/cpp} includes
| -rw-r--r-- | src/key_io.cpp | 1 | ||||
| -rw-r--r-- | src/script/standard.cpp | 6 | ||||
| -rw-r--r-- | src/script/standard.h | 13 | ||||
| -rw-r--r-- | src/test/sigopcount_tests.cpp | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/key_io.cpp b/src/key_io.cpp index 30fd964232..b7fe4d2423 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -6,6 +6,7 @@ #include <base58.h> #include <bech32.h> +#include <script/interpreter.h> #include <script/standard.h> #include <util/strencodings.h> diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 6cbcf9a016..40ae381f0f 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -4,15 +4,13 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <script/standard.h> - -#include <crypto/sha256.h> -#include <hash.h> #include <pubkey.h> #include <script/interpreter.h> #include <script/script.h> -#include <util/strencodings.h> +#include <span.h> #include <string> +#include <algorithm> typedef std::vector<unsigned char> valtype; diff --git a/src/script/standard.h b/src/script/standard.h index 53987ed244..2b743776b4 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -7,16 +7,15 @@ #define BITCOIN_SCRIPT_STANDARD_H #include <attributes.h> -#include <pubkey.h> -#include <script/interpreter.h> -#include <uint256.h> -#include <util/hash_type.h> +#include <script/script.h> -#include <map> #include <string> -#include <variant> +#include <optional> +#include <utility> +#include <vector> -class CScript; +class CPubKey; +template <typename C> class Span; enum class TxoutType { NONSTANDARD, diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index e20b591c80..825413e023 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -8,6 +8,7 @@ #include <consensus/tx_verify.h> #include <key.h> #include <pubkey.h> +#include <script/interpreter.h> #include <script/script.h> #include <script/standard.h> #include <test/util/setup_common.h> |