diff --git a/.bazelrc b/.bazelrc index e1e52661aa33..01ccc67b2ce9 100644 --- a/.bazelrc +++ b/.bazelrc @@ -39,16 +39,15 @@ build --define kafka_enabled=false test --define kafka_enabled=false run --define kafka_enabled=false -# Enable blst by default, we use a config so that our fuzzer stops complaining. -build --config=blst_enabled -test --config=blst_enabled -run --config=blst_enabled +build --define blst_disabled=false +test --define blst_disabled=false +run --define blst_disabled=false build:kafka_enabled --define kafka_enabled=true build:kafka_enabled --define gotags=kafka_enabled -build:blst_enabled --define blst_enabled=true -build:blst_enabled --define gotags=blst_enabled +build:blst_disabled --define blst_disabled=true +build:blst_disabled --define gotags=blst_disabled # Release flags build:release --compilation_mode=opt @@ -84,7 +83,7 @@ build:fuzz --linkopt -Wl,--no-as-needed build:fuzz --define=gc_goopts=-d=libfuzzer,checkptr build:fuzz --run_under=//tools:fuzz_wrapper build:fuzz --compilation_mode=opt -build:fuzz --define=blst_enabled=false +build:fuzz --define=blst_disabled=true test:fuzz --local_test_jobs="HOST_CPUS*.5" diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index af134b4c9642..5e7592ecd4d8 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -44,7 +44,7 @@ jobs: - name: Build # Use blst tag to allow go and bazel builds for blst. - run: go build -v --tags=blst_enabled ./... + run: go build -v ./... # Tests run via Bazel for now... # - name: Test diff --git a/shared/bls/blst/BUILD.bazel b/shared/bls/blst/BUILD.bazel index e6d9d6f35b5b..59d648745bd9 100644 --- a/shared/bls/blst/BUILD.bazel +++ b/shared/bls/blst/BUILD.bazel @@ -2,70 +2,70 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test") load("@bazel_skylib//lib:selects.bzl", "selects") load("@prysm//tools/go:def.bzl", "go_library") -# Build with --define=blst_enabled=false to exclude blst library. +# Build with --define=blst_disabled=true to exclude blst library. config_setting( - name = "blst_enabled_linux_amd64", + name = "linux_amd64", constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) config_setting( - name = "blst_enabled_darwin_amd64", + name = "darwin_amd64", constraint_values = [ "@platforms//os:osx", "@platforms//cpu:x86_64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) config_setting( - name = "blst_enabled_windows_amd64", + name = "windows_amd64", constraint_values = [ "@platforms//os:windows", "@platforms//cpu:x86_64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) config_setting( - name = "blst_enabled_linux_arm64", + name = "linux_arm64", constraint_values = [ "@platforms//os:linux", "@platforms//cpu:aarch64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) config_setting( - name = "blst_enabled_android_amd64", + name = "android_amd64", constraint_values = [ "@platforms//os:android", "@platforms//cpu:x86_64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) config_setting( - name = "blst_enabled_android_arm64", + name = "android_arm64", constraint_values = [ "@platforms//os:android", "@platforms//cpu:aarch64", ], values = { - "define": "blst_enabled=true", + "define": "blst_disabled=false", }, ) @@ -76,12 +76,12 @@ go_library( srcs = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "aliases.go", "doc.go", @@ -100,12 +100,12 @@ go_library( ], deps = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "//shared/bls/common:go_default_library", "//shared/featureconfig:go_default_library", @@ -124,12 +124,12 @@ go_test( name = "go_default_test", srcs = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "public_key_test.go", "secret_key_test.go", @@ -138,12 +138,12 @@ go_test( }), deps = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "//shared/bls/blst:go_default_library", "//shared/bls/common:go_default_library", @@ -160,12 +160,12 @@ go_test( name = "go_signature_test", srcs = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "signature_test.go", ], @@ -174,12 +174,12 @@ go_test( embed = [":go_default_library"], deps = selects.with_or({ ( - ":blst_enabled_linux_amd64", - ":blst_enabled_linux_arm64", - ":blst_enabled_darwin_amd64", - ":blst_enabled_windows_amd64", - ":blst_enabled_android_amd64", - ":blst_enabled_android_arm64", + ":linux_amd64", + ":linux_arm64", + ":darwin_amd64", + ":windows_amd64", + ":android_amd64", + ":android_arm64", ): [ "//shared/bls/common:go_default_library", "//shared/bytesutil:go_default_library", diff --git a/shared/bls/blst/aliases.go b/shared/bls/blst/aliases.go index 01909db94408..ce47bcfc45f2 100644 --- a/shared/bls/blst/aliases.go +++ b/shared/bls/blst/aliases.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/bls_benchmark_test.go b/shared/bls/blst/bls_benchmark_test.go index 7d17e0e32753..c51426ff110d 100644 --- a/shared/bls/blst/bls_benchmark_test.go +++ b/shared/bls/blst/bls_benchmark_test.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst_test diff --git a/shared/bls/blst/doc.go b/shared/bls/blst/doc.go index 5c03488edc32..4cc206d742af 100644 --- a/shared/bls/blst/doc.go +++ b/shared/bls/blst/doc.go @@ -4,5 +4,4 @@ // // This implementation uses the library written by Supranational, blst. // -// Only linux_amd64 is supported at the moment. package blst diff --git a/shared/bls/blst/init.go b/shared/bls/blst/init.go index 59d189a33f29..5461565b7f8c 100644 --- a/shared/bls/blst/init.go +++ b/shared/bls/blst/init.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/public_key.go b/shared/bls/blst/public_key.go index 1e618cd1ba86..18f164b97ea8 100644 --- a/shared/bls/blst/public_key.go +++ b/shared/bls/blst/public_key.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/public_key_test.go b/shared/bls/blst/public_key_test.go index 8166b2fa05d2..bfae3025f995 100644 --- a/shared/bls/blst/public_key_test.go +++ b/shared/bls/blst/public_key_test.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst_test diff --git a/shared/bls/blst/secret_key.go b/shared/bls/blst/secret_key.go index 0368a2f46b76..c457f4da9ee4 100644 --- a/shared/bls/blst/secret_key.go +++ b/shared/bls/blst/secret_key.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/secret_key_test.go b/shared/bls/blst/secret_key_test.go index 721175c1250c..1f70cac89aaa 100644 --- a/shared/bls/blst/secret_key_test.go +++ b/shared/bls/blst/secret_key_test.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst_test diff --git a/shared/bls/blst/signature.go b/shared/bls/blst/signature.go index 2359a0673d59..cde5a201a634 100644 --- a/shared/bls/blst/signature.go +++ b/shared/bls/blst/signature.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/signature_test.go b/shared/bls/blst/signature_test.go index 4f1f2bb89d56..24d06540ae1c 100644 --- a/shared/bls/blst/signature_test.go +++ b/shared/bls/blst/signature_test.go @@ -1,5 +1,5 @@ // +build linux,amd64 linux,arm64 darwin,amd64 windows,amd64 -// +build blst_enabled +// +build !blst_disabled package blst diff --git a/shared/bls/blst/stub.go b/shared/bls/blst/stub.go index 3044c9d66c04..d7880967fe3e 100644 --- a/shared/bls/blst/stub.go +++ b/shared/bls/blst/stub.go @@ -1,4 +1,4 @@ -// +build !blst_enabled +// +build blst_disabled libfuzzer package blst @@ -7,7 +7,7 @@ import ( ) // This stub file exists until build issues can be resolved for libfuzz. -const err = "blst is only supported on linux,darwin,windows with blst_enabled gotag" +const err = "blst is only supported on linux,darwin,windows" // SecretKey -- stub type SecretKey struct{}