Move Gloas spec tests into their own packages

changelog/kasey_spectest-gloas-packages.md

@@ -0,0 +1,5 @@
+### Changed
+
+- Gloas spec tests moved into their own `mainnet/gloas` and `minimal/gloas`
+  packages, and `download_spectests.bzl` can now take spec test data from a
+  local directory or tarball instead of downloading a release.

hack/update-go-spectest.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+. "$(dirname "$0")"/common.sh
+
+# Script to copy generated spectest packages from the bazel build folder back to
+# the source tree (the "generate-and-commit" workflow, mirroring
+# update-go-ssz.sh). Each ssz_gen_spectest target emits a tree-artifact
+# directory containing a methodical_test.go file and a testdata/ fixture tree;
+# this script builds those targets and copies each generated directory over the
+# matching location in the source tree.
+
+bazel query 'kind(ssz_gen_spectest, //testing/...)' | xargs bazel build $@
+
+bin="$(bazel info bazel-bin)"
+searchstring="/bin/"
+
+# Locate each generated package by its marker file and mirror the whole
+# directory (methodical_test.go + testdata/) back to source. The destination is
+# cleared first so fixtures no longer produced (e.g. after a config or release
+# change) don't linger -- the tree-artifact has no stable file list. BUILD.bazel
+# is (re)generated by gazelle after this script runs, so removing it here is
+# fine. Uses cp rather than rsync to avoid a new system dependency.
+while IFS= read -d $'\0' -r marker; do
+    src_dir="$(dirname "$marker")"
+    destination="${src_dir#*$searchstring}"
+    color "34" "$destination"
+    rm -rf "$destination"
+    mkdir -p "$destination"
+    cp -R "$src_dir"/. "$destination"/
+    # bazel outputs are read-only; make the copies writable in the source tree.
+    chmod -R u+w "$destination"
+done < <($findutil -L "$bin"/ -type f -name "methodical_test.go" -print0)

testing/spectest/BUILD.bazel

@@ -0,0 +1,14 @@
+load("//tools:methodical.bzl", "ssz_gen_spectest")
+
+# Generates the methodical-ssz spec test package into testing/spectest/methodical
+# (out_dir lands the tree-artifact directory at this package's path). It is run,
+# and its output copied back into the source tree, by hack/update-go-spectest.sh
+# -- the generate-and-commit workflow that mirrors hack/update-go-ssz.sh. The
+# fixtures come from the un-extracted release tarball exposed by the
+# consensus_spec_tests repo rule (see tools/download_spectests.bzl).
+ssz_gen_spectest(
+    name = "methodical_spectest",
+    config_file = "methodical-spectest.yaml",
+    out_dir = "methodical",
+    release_tarball = "@consensus_spec_tests//:mainnet.tar.gz",
+)

testing/spectest/README.md

@@ -32,3 +32,50 @@ bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_VER
 ```
 bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_VERSION=nightly-21422848633
 ```
+
+## Using local spectest data
+
+To run spectests against data you already have on disk (e.g. for offline work,
+or to test an unreleased spec build) instead of downloading it, use either of the
+following `--repo_env` flags. A source can be a tarball **or an already-unpacked
+directory tree**. Both flags take precedence over `CONSENSUS_SPEC_TESTS_VERSION`
+and require no network access. All paths must be **absolute**.
+
+The "flavors" are the three upstream consensus-specs presets: `mainnet` and `minimal`
+(preset-specific configs) and `general` (preset-independent tests: SSZ generic, BLS,
+KZG). You usually only need one at a time.
+
+**A directory.** Point `CONSENSUS_SPEC_TESTS_DIR` at a directory and, for each
+flavor, the rule uses the first of these it finds, skipping flavors that are absent:
+
+- `<dir>/<flavor>.tar.gz` — a release-style tarball
+- `<dir>/tests/<flavor>/` — an unpacked tree keeping the upstream `tests/` prefix
+- `<dir>/<flavor>/` — an unpacked tree with the prefix stripped
+
+So both a directory of tarballs and a directory of already-extracted tests work:
+
+```
+bazel test //... --test_tag_filters=spectest --repo_env=CONSENSUS_SPEC_TESTS_DIR=/abs/path/to/specs
+```
+
+**A single flavor with any name.** Point a specific flavor at an arbitrarily-named
+tarball or directly at an unpacked flavor tree with `CONSENSUS_SPEC_TESTS_<FLAVOR>`
+(`GENERAL`, `MAINNET`, or `MINIMAL`):
+
+```
+bazel test //testing/spectest/mainnet:go_default_test --test_tag_filters=spectest \
+  --repo_env=CONSENSUS_SPEC_TESTS_MAINNET=/abs/path/to/my-mainnet.tar.gz
+```
+
+The two mechanisms can be combined; a per-flavor override wins over the directory
+entry for that flavor. When you supply only some flavors, scope the test target to
+the matching preset (e.g. `//testing/spectest/mainnet/...`) rather than `//...`, since
+the other flavors' filegroups will be empty.
+
+Notes:
+- Unpacked directories are symlinked in, so no large copy is made. The raw
+  `@consensus_spec_tests//:<flavor>.tar.gz` target (used by methodical-ssz
+  `gen-spectest`) only exists when you supply an actual tarball, not an unpacked dir.
+- Bazel keys the repository rule on the value of the env var, not the contents of the
+  files. If you change data at the same path, run `bazel sync --configure` (or change
+  the path) to force a re-fetch.

testing/spectest/mainnet/BUILD.bazel

@@ -199,48 +199,6 @@ go_test(
         "fulu__sanity__blocks_test.go",
         "fulu__sanity__slots_test.go",
         "fulu__ssz_static__ssz_static_test.go",
-        "gloas__epoch_processing__effective_balance_updates_test.go",
-        "gloas__epoch_processing__eth1_data_reset_test.go",
-        "gloas__epoch_processing__historical_summaries_update_test.go",
-        "gloas__epoch_processing__inactivity_updates_test.go",
-        "gloas__epoch_processing__justification_and_finalization_test.go",
-        "gloas__epoch_processing__participation_flag_updates_test.go",
-        "gloas__epoch_processing__pending_consolidations_test.go",
-        "gloas__epoch_processing__pending_deposits_churn_test.go",
-        "gloas__epoch_processing__pending_deposits_test.go",
-        "gloas__epoch_processing__process_builder_pending_payments_test.go",
-        "gloas__epoch_processing__proposer_lookahead_test.go",
-        "gloas__epoch_processing__randao_mixes_reset_test.go",
-        "gloas__epoch_processing__registry_updates_test.go",
-        "gloas__epoch_processing__rewards_and_penalties_test.go",
-        "gloas__epoch_processing__slashings_reset_test.go",
-        "gloas__epoch_processing__slashings_test.go",
-        "gloas__finality__finality_test.go",
-        "gloas__fork__upgrade_to_gloas_test.go",
-        "gloas__fork_transition__transition_test.go",
-        "gloas__forkchoice__forkchoice_test.go",
-        "gloas__operations__attestation_test.go",
-        "gloas__operations__attester_slashing_test.go",
-        "gloas__operations__block_header_test.go",
-        "gloas__operations__bls_to_execution_change_test.go",
-        "gloas__operations__builder_deposit_request_test.go",
-        "gloas__operations__builder_exit_request_test.go",
-        "gloas__operations__consolidation_test.go",
-        "gloas__operations__deposit_requests_test.go",
-        "gloas__operations__execution_payload_header_test.go",
-        "gloas__operations__parent_execution_payload_test.go",
-        "gloas__operations__payload_attestation_test.go",
-        "gloas__operations__proposer_slashing_test.go",
-        "gloas__operations__sync_committee_test.go",
-        "gloas__operations__voluntary_exit_churn_test.go",
-        "gloas__operations__voluntary_exit_test.go",
-        "gloas__operations__withdrawal_request_test.go",
-        "gloas__operations__withdrawals_test.go",
-        "gloas__random_test.go",
-        "gloas__rewards_test.go",
-        "gloas__sanity__blocks_test.go",
-        "gloas__sanity__slots_test.go",
-        "gloas__ssz_static__ssz_static_test.go",
         "phase0__epoch_processing__effective_balance_updates_test.go",
         "phase0__epoch_processing__epoch_processing_test.go",
         "phase0__epoch_processing__eth1_data_reset_test.go",
@@ -319,13 +277,6 @@ go_test(
         "//testing/spectest/shared/fulu/rewards:go_default_library",
         "//testing/spectest/shared/fulu/sanity:go_default_library",
         "//testing/spectest/shared/fulu/ssz_static:go_default_library",
-        "//testing/spectest/shared/gloas/epoch_processing:go_default_library",
-        "//testing/spectest/shared/gloas/finality:go_default_library",
-        "//testing/spectest/shared/gloas/fork:go_default_library",
-        "//testing/spectest/shared/gloas/operations:go_default_library",
-        "//testing/spectest/shared/gloas/rewards:go_default_library",
-        "//testing/spectest/shared/gloas/sanity:go_default_library",
-        "//testing/spectest/shared/gloas/ssz_static:go_default_library",
         "//testing/spectest/shared/phase0/epoch_processing:go_default_library",
         "//testing/spectest/shared/phase0/finality:go_default_library",
         "//testing/spectest/shared/phase0/operations:go_default_library",

testing/spectest/mainnet/gloas/BUILD.bazel

@@ -0,0 +1,63 @@
+load("@prysm//tools/go:def.bzl", "go_test")
+
+go_test(
+    name = "go_default_test",
+    size = "large",
+    srcs = [
+        "gloas__epoch_processing__effective_balance_updates_test.go",
+        "gloas__epoch_processing__eth1_data_reset_test.go",
+        "gloas__epoch_processing__historical_summaries_update_test.go",
+        "gloas__epoch_processing__inactivity_updates_test.go",
+        "gloas__epoch_processing__justification_and_finalization_test.go",
+        "gloas__epoch_processing__participation_flag_updates_test.go",
+        "gloas__epoch_processing__pending_consolidations_test.go",
+        "gloas__epoch_processing__pending_deposits_churn_test.go",
+        "gloas__epoch_processing__pending_deposits_test.go",
+        "gloas__epoch_processing__process_builder_pending_payments_test.go",
+        "gloas__epoch_processing__proposer_lookahead_test.go",
+        "gloas__epoch_processing__randao_mixes_reset_test.go",
+        "gloas__epoch_processing__registry_updates_test.go",
+        "gloas__epoch_processing__rewards_and_penalties_test.go",
+        "gloas__epoch_processing__slashings_reset_test.go",
+        "gloas__epoch_processing__slashings_test.go",
+        "gloas__finality__finality_test.go",
+        "gloas__fork__upgrade_to_gloas_test.go",
+        "gloas__fork_transition__transition_test.go",
+        "gloas__forkchoice__forkchoice_test.go",
+        "gloas__operations__attestation_test.go",
+        "gloas__operations__attester_slashing_test.go",
+        "gloas__operations__block_header_test.go",
+        "gloas__operations__bls_to_execution_change_test.go",
+        "gloas__operations__builder_deposit_request_test.go",
+        "gloas__operations__builder_exit_request_test.go",
+        "gloas__operations__consolidation_test.go",
+        "gloas__operations__deposit_requests_test.go",
+        "gloas__operations__execution_payload_header_test.go",
+        "gloas__operations__parent_execution_payload_test.go",
+        "gloas__operations__payload_attestation_test.go",
+        "gloas__operations__proposer_slashing_test.go",
+        "gloas__operations__sync_committee_test.go",
+        "gloas__operations__voluntary_exit_churn_test.go",
+        "gloas__operations__voluntary_exit_test.go",
+        "gloas__operations__withdrawal_request_test.go",
+        "gloas__operations__withdrawals_test.go",
+        "gloas__random_test.go",
+        "gloas__rewards_test.go",
+        "gloas__sanity__blocks_test.go",
+        "gloas__sanity__slots_test.go",
+        "gloas__ssz_static__ssz_static_test.go",
+    ],
+    data = ["@consensus_spec_tests//:test_data"],
+    tags = ["spectest"],
+    deps = [
+        "//runtime/version:go_default_library",
+        "//testing/spectest/shared/common/forkchoice:go_default_library",
+        "//testing/spectest/shared/gloas/epoch_processing:go_default_library",
+        "//testing/spectest/shared/gloas/finality:go_default_library",
+        "//testing/spectest/shared/gloas/fork:go_default_library",
+        "//testing/spectest/shared/gloas/operations:go_default_library",
+        "//testing/spectest/shared/gloas/rewards:go_default_library",
+        "//testing/spectest/shared/gloas/sanity:go_default_library",
+        "//testing/spectest/shared/gloas/ssz_static:go_default_library",
+    ],
+)

testing/spectest/mainnet/gloas__epoch_processing__effective_balance_updates_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__effective_balance_updates_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__eth1_data_reset_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__eth1_data_reset_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__historical_summaries_update_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__historical_summaries_update_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__inactivity_updates_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__inactivity_updates_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__justification_and_finalization_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__justification_and_finalization_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__participation_flag_updates_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__participation_flag_updates_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__pending_consolidations_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__pending_consolidations_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__pending_deposits_churn_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__pending_deposits_churn_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__pending_deposits_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__pending_deposits_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__process_builder_pending_payments_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__process_builder_pending_payments_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__proposer_lookahead_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__proposer_lookahead_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__randao_mixes_reset_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__randao_mixes_reset_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__registry_updates_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__registry_updates_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__rewards_and_penalties_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__rewards_and_penalties_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__slashings_reset_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__slashings_reset_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__epoch_processing__slashings_test.go → testing/spectest/mainnet/gloas/gloas__epoch_processing__slashings_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__finality__finality_test.go → testing/spectest/mainnet/gloas/gloas__finality__finality_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__fork__upgrade_to_gloas_test.go → testing/spectest/mainnet/gloas/gloas__fork__upgrade_to_gloas_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__fork_transition__transition_test.go → testing/spectest/mainnet/gloas/gloas__fork_transition__transition_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__forkchoice__forkchoice_test.go → testing/spectest/mainnet/gloas/gloas__forkchoice__forkchoice_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__attestation_test.go → testing/spectest/mainnet/gloas/gloas__operations__attestation_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__attester_slashing_test.go → testing/spectest/mainnet/gloas/gloas__operations__attester_slashing_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__block_header_test.go → testing/spectest/mainnet/gloas/gloas__operations__block_header_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__bls_to_execution_change_test.go → testing/spectest/mainnet/gloas/gloas__operations__bls_to_execution_change_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__builder_deposit_request_test.go → testing/spectest/mainnet/gloas/gloas__operations__builder_deposit_request_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__builder_exit_request_test.go → testing/spectest/mainnet/gloas/gloas__operations__builder_exit_request_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__consolidation_test.go → testing/spectest/mainnet/gloas/gloas__operations__consolidation_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"

testing/spectest/mainnet/gloas__operations__deposit_requests_test.go → testing/spectest/mainnet/gloas/gloas__operations__deposit_requests_test.go

@@ -1,4 +1,4 @@
-package mainnet
+package gloas
 
 import (
 	"testing"