No description provided.
Miniscript updates #89
pull darosior wants to merge 1 commits into bitcoin-core:main from darosior:miniscript_updates changing 1730 files +1687 −0-
darosior commented at 11:43 AM on June 9, 2022: member
-
darosior commented at 11:44 AM on June 9, 2022: member
Oh, you've added some inputs for miniscript_string already. Interestingly it doesn't seem to conflict. I still need to merge mines in yours though.
-
maflcko commented at 12:11 PM on June 9, 2022: contributor
It should never conflict, as the filenames are simply the hash of the file content
-
maflcko commented at 12:11 PM on June 9, 2022: contributor
Though, it looks like you deleted my inputs? :sweat_smile:
-
darosior commented at 12:12 PM on June 9, 2022: member
Hmm i merged them, but maybe i somehow messed up the merge
-
Base corpus for the miniscript_string target ec97c409b8
-
maflcko commented at 12:17 PM on June 9, 2022: contributor
Oh, maybe you moved all inputs (mine + yours) into a new folder and then merged the new folder into an empty folder? In that case not all inputs that were there originally are taken over.
-
darosior commented at 12:21 PM on June 9, 2022: member
I think i merged your folder into mine. What i'm doing now is merging both yours and mines at the same time in an empty folder:
FUZZ=.... ./empty_folder ./my_miniscript_script ./existing_miniscript_scriptDoes that sound right?EDIT: it's worse :sob:Also i'm using a branch from https://github.com/bitcoin/bitcoin/pull/24860#discussion_r893376746 that doesn't have the slowness of current master. I guess it shouldn't wreck the coverage, but maybe i should use master instead?
- darosior force-pushed on Jun 9, 2022
-
maflcko commented at 12:28 PM on June 9, 2022: contributor
Generally I try to make adding inputs append-only.
You can achieve that by checking out the current main and then merging into the main folders.
For example,
FUZZ=miniscript_string ./src/test/fuzz/fuzz -merge=1 ../btc_qa_assets/fuzz_seed_corpus/miniscript_string ./temp_ms_s/or./test/fuzz/test_runner.py -l DEBUG -j 9 --m_dir ../btc_qa_assets/oss_fuzz_inputs/ ../btc_qa_assets/fuzz_seed_corpus. -
darosior commented at 12:31 PM on June 9, 2022: member
Ok, that's what i was going to ask. :)
I ended up doing essentially what you said with one more step (merging into an empty dir and moving the seeds of the empty dir to
fuzz_seed_corpus/miniscript_script/). - maflcko merged this on Jun 9, 2022
- maflcko closed this on Jun 9, 2022
- darosior deleted the branch on Jun 9, 2022
-
maflcko commented at 4:35 PM on September 20, 2022: contributor
This was re-reverted (aka now merged) in aea795691ccb463ea6a6d071bf426acdf889ea5f