Skip to content

Commit 9237bda

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24179: fuzz: Speed up script fuzz target
fa68429 fuzz: Speed up script fuzz target (MarcoFalke) Pull request description: Currently the script fuzz target takes the longest time (5000 seconds, aka 80 minutes, see https://cirrus-ci.com/task/5651378755338240?logs=ci#L4501). Fix this by making it twice as fast. Instead of running all possible combinations for all fuzz inputs, consume a bool and decide at runtime which path to take. I moved the new calls to the end to not invalidate existing fuzz inputs. ACKs for top commit: prusnak: ACK fa68429 Tree-SHA512: 5e408255f96f9e92e472f4e8a8a0f8d8814bad444ac0ff7d5db5ed84a59a861135ffe5e04d81f479b0695cb17e4d7af005734959dd4aa9328bdc5acc98f36665
2 parents eacc0e8 + fa68429 commit 9237bda

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/test/fuzz/script.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,6 @@ FUZZ_TARGET_INIT(script, initialize_script)
102102
(void)script.IsPushOnly();
103103
(void)script.GetSigOpCount(/* fAccurate= */ false);
104104

105-
(void)FormatScript(script);
106-
(void)ScriptToAsmStr(script, false);
107-
(void)ScriptToAsmStr(script, true);
108-
109-
UniValue o1(UniValue::VOBJ);
110-
ScriptPubKeyToUniv(script, o1, true);
111-
UniValue o2(UniValue::VOBJ);
112-
ScriptPubKeyToUniv(script, o2, false);
113-
UniValue o3(UniValue::VOBJ);
114-
ScriptToUniv(script, o3);
115-
116105
{
117106
const std::vector<uint8_t> bytes = ConsumeRandomLengthByteVector(fuzzed_data_provider);
118107
CompressedScript compressed_script;
@@ -178,4 +167,12 @@ FUZZ_TARGET_INIT(script, initialize_script)
178167
Assert(dest == GetScriptForDestination(tx_destination_2));
179168
}
180169
}
170+
171+
(void)FormatScript(script);
172+
(void)ScriptToAsmStr(script, /*fAttemptSighashDecode=*/fuzzed_data_provider.ConsumeBool());
173+
174+
UniValue o1(UniValue::VOBJ);
175+
ScriptPubKeyToUniv(script, o1, /*include_hex=*/fuzzed_data_provider.ConsumeBool());
176+
UniValue o3(UniValue::VOBJ);
177+
ScriptToUniv(script, o3);
181178
}

0 commit comments

Comments
 (0)