diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-03-30 20:07:04 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-30 20:07:53 +0200 |
| commit | 267b60f800cb298d6700ae54fdace595c0e80313 (patch) | |
| tree | 8d6db85b07895b10e8c9b8508e7f057705548f5f /src/test/fuzz/script_flags.cpp | |
| parent | f9e86d89660002d3dd17211d8b030a47b95d2fa2 (diff) | |
| parent | fa4926cca68db2433e579d9b4a642248a9314673 (diff) | |
| download | bitcoin-267b60f800cb298d6700ae54fdace595c0e80313.tar.xz | |
Merge #21553: fuzz: Misc refactor
fa4926cca68db2433e579d9b4a642248a9314673 fuzz: [refactor] Use IsValidFlagCombination in signature_checker fuzz target (MarcoFalke)
eeee8f5be1d4ccfb7e237248be5c6bef45b0fbb8 fuzz: Removed unused try-catch in coins_view (MarcoFalke)
fa98f3f66ecb0a0c6805dcdcf828f12a1a11c3e6 fuzz: [refactor] Use ConsumeScript in signature_checker fuzz target (MarcoFalke)
Pull request description:
Some small refactors to remove unused and redundant fuzz code
ACKs for top commit:
practicalswift:
cr re-ACK fa4926cca68db2433e579d9b4a642248a9314673
Tree-SHA512: eb07a2140caad7b31495b76385fc7634cf5b6daa4947f430ebb127eb1375583dc11e541a0a42d0e5d93d430480b8a815b93974450fd5ed897528a2d47c752f86
Diffstat (limited to 'src/test/fuzz/script_flags.cpp')
| -rw-r--r-- | src/test/fuzz/script_flags.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/test/fuzz/script_flags.cpp b/src/test/fuzz/script_flags.cpp index 561230707c..387f9c069c 100644 --- a/src/test/fuzz/script_flags.cpp +++ b/src/test/fuzz/script_flags.cpp @@ -5,13 +5,11 @@ #include <pubkey.h> #include <script/interpreter.h> #include <streams.h> +#include <test/util/script.h> #include <version.h> #include <test/fuzz/fuzz.h> -/** Flags that are not forbidden by an assert */ -static bool IsValidFlagCombination(unsigned flags); - void initialize_script_flags() { static const ECCVerifyHandle verify_handle; @@ -74,10 +72,3 @@ FUZZ_TARGET_INIT(script_flags, initialize_script_flags) return; } } - -static bool IsValidFlagCombination(unsigned flags) -{ - if (flags & SCRIPT_VERIFY_CLEANSTACK && ~flags & (SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS)) return false; - if (flags & SCRIPT_VERIFY_WITNESS && ~flags & SCRIPT_VERIFY_P2SH) return false; - return true; -} |