git mv fuzz_seed_corpus fuzz_corpora #205

1. 
   maflcko commented at 3:59 pm on September 3, 2024: contributor

   Fixes https://github.com/bitcoin-core/qa-assets/issues/200
2. git mv fuzz_seed_corpus fuzz_corpora f8138af6b7
3. 
   maflcko commented at 4:03 pm on September 3, 2024: contributor

   Needs to be reviewed locally. For example, by calling

   0git mv fuzz_seed_corpus fuzz_corpora  # Recreate the move
   1git diff f8138af6b7c0b53a9e926112d211d9a6780531e1  # Show the remaining changes
   

4. 
   murchandamus commented at 4:28 pm on September 3, 2024: contributor

   ACK f8138af6b7c0b53a9e926112d211d9a6780531e1

   I recreated this PR locally, and moved the corpora. I got the same result for the corpora, plus the renaming of qa-assets/fuzz_seed_corpus to qa-assets/fuzz_corpora in a number of scripts. I then checked out f8138af6b7c0b53a9e926112d211d9a6780531e1 and verified that no instances of qa-assets/fuzz_seed_corpus remained in the scripts and all of its instances now appeared as qa-assets/fuzz_corpora.

5. 
   maflcko commented at 6:48 pm on September 3, 2024: contributor

   CI needs to be re-run after https://github.com/bitcoin/bitcoin/pull/30804 is merged
6. 
   brunoerg commented at 8:18 pm on September 3, 2024: contributor

   ACK f8138af6b7c0b53a9e926112d211d9a6780531e1

   I tested as described in #205 (comment). The diff returned only the following:

    0-    - mv ./{.git,fuzz_corpora} ./bitcoin-core/ci/scratch/qa-assets/
    1+    - mv ./{.git,fuzz_seed_corpus} ./bitcoin-core/ci/scratch/qa-assets/
    2   ci_script:
    3     - cd ./bitcoin-core
    4     - ./ci/test_run_all.sh
    5diff --git a/README.md b/README.md
    6index 1983a58dec3..ff1b159ca38 100644
    7--- a/README.md
    8+++ b/README.md
    9@@ -4,7 +4,7 @@ Bitcoin Core related blobs used for quality assurance.
   10 
   11 ## Fuzz inputs
   12 
   13-`qa-assets/fuzz_corpora` contains one input corpus per fuzz target (one
   14+`qa-assets/fuzz_seed_corpus` contains one input corpus per fuzz target (one
   15 folder per target named the same as each target).
   16 
   17 ### Contributing inputs
   18diff --git a/contrib/touched-files-check/src/main.rs b/contrib/touched-files-check/src/main.rs
   19index 761fc204cf2..42221d6912c 100644
   20--- a/contrib/touched-files-check/src/main.rs
   21+++ b/contrib/touched-files-check/src/main.rs
   22@@ -6,16 +6,16 @@ fn check(touched_files: &str) -> Result<(), String> {
   23             (l.next().unwrap(), l.next().unwrap())
   24         };
   25         println!("Touched file: {status} {file}");
   26-        let fuzz_corpora_dir = "fuzz_corpora/";
   27+        let fuzz_seed_corpora_dir = "fuzz_seed_corpus/";
   28         if only_inputs.is_none() {
   29-            only_inputs = Some(file.starts_with(fuzz_corpora_dir));
   30+            only_inputs = Some(file.starts_with(fuzz_seed_corpora_dir));
   31         }
   32-        if only_inputs.unwrap() != file.starts_with(fuzz_corpora_dir) {
   33+        if only_inputs.unwrap() != file.starts_with(fuzz_seed_corpora_dir) {
   34             return Err(format!(
   35-                "All files in this pull request should either be fuzz inputs in the directory {fuzz_corpora_dir} or only files outside that dir."
   36+                "All files in this pull request should either be fuzz inputs in the directory {fuzz_seed_corpora_dir} or only files outside that dir."
   37             ));
   38         }
   39-        if file.starts_with(fuzz_corpora_dir) && status != "A" {
   40+        if file.starts_with(fuzz_seed_corpora_dir) && status != "A" {
   41             return Err(format!(
   42                 "File status for fuzz input is not 'A' (for add): '{status}' '{file}'"
   43             ));
   44@@ -41,15 +41,15 @@ fn main() {
   45 fn test_check() {
   46     assert_eq!(check("M README.md"), Ok(()));
   47     assert_eq!(
   48-        check("B fuzz_corpora/foo/bar").unwrap_err(),
   49-        "File status for fuzz input is not 'A' (for add): 'B' 'fuzz_corpora/foo/bar'",
   50+        check("B fuzz_seed_corpus/foo/bar").unwrap_err(),
   51+        "File status for fuzz input is not 'A' (for add): 'B' 'fuzz_seed_corpus/foo/bar'",
   52     );
   53     assert_eq!(
   54-        check("A fuzz_corpora/foo/bar1\nA fuzz_corpora/foo/bar2"),
   55+        check("A fuzz_seed_corpus/foo/bar1\nA fuzz_seed_corpus/foo/bar2"),
   56         Ok(()),
   57     );
   58     assert_eq!(
   59-        check("M README.md\nA fuzz_corpora/foo/bar3").unwrap_err(),
   60-        "All files in this pull request should either be fuzz inputs in the directory fuzz_corpora/ or only files outside that dir.",
   61+        check("M README.md\nA fuzz_seed_corpus/foo/bar3").unwrap_err(),
   62+        "All files in this pull request should either be fuzz inputs in the directory fuzz_seed_corpus/ or only files outside that dir.",
   63     );
   64 }
   65diff --git a/download_oss_fuzz_inputs.py b/download_oss_fuzz_inputs.py
   66index 7bed5c9bb5a..e054d561a82 100755
   67--- a/download_oss_fuzz_inputs.py
   68+++ b/download_oss_fuzz_inputs.py
   69@@ -5,7 +5,7 @@ import os
   70 import subprocess
   71 
   72 
   73-FUZZ_INPUTS_DIR = "fuzz_corpora"
   74+FUZZ_INPUTS_DIR = "fuzz_seed_corpus"
   75 ZIP_NAME = "public.zip"
   76 BOLD = ("\033[0m", "\033[1m")
   

   Moving back to fuzz_seed_corpus and running the diff again now shows all the moves.

7. 
   fanquake commented at 1:04 pm on September 4, 2024: member

   CI needs to be re-run after https://github.com/bitcoin/bitcoin/pull/30804 is merged

   Kicked.

8. maflcko merged this on Sep 4, 2024
9. maflcko closed this on Sep 4, 2024

   ---

Contributors
maflcko murchandamus brunoerg fanquake