From f6af5a17935c0ad297d6ebd6505f78652785813d Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 21 Oct 2024 16:44:50 -0500 Subject: [PATCH 1/5] Sort experimental checks --- build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 7026207ea71..b26b2a4d415 100644 --- a/build.gradle +++ b/build.gradle @@ -251,19 +251,19 @@ allprojects { check('ExperimentalCliOptionMustBeCorrectlyDisplayed', net.ltgt.gradle.errorprone.CheckSeverity.OFF) // These are experimental checks that we want enabled - check('MissingBraces', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('InsecureCryptoUsage', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('WildcardImport', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('ClassName', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('DeduplicateConstants', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('RedundantOverride', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('RedundantThrows', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('UnnecessarilyFullyQualified', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('FieldCanBeFinal', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('InitializeInline', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('ClassName', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('InsecureCryptoUsage', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('InterfaceWithOnlyStatics', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('PackageLocation', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('MethodInputParametersMustBeFinal', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - check('FieldCanBeFinal', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('MissingBraces', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('PackageLocation', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('RedundantOverride', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('RedundantThrows', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('UnnecessarilyFullyQualified', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('WildcardImport', net.ltgt.gradle.errorprone.CheckSeverity.WARN) } options.encoding = 'UTF-8' From 8ed1ebed99f6f7a542514415a2498b39e164d247 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 21 Oct 2024 16:45:09 -0500 Subject: [PATCH 2/5] Enable the UseCorrectAssertInTests check --- .../teku/test/acceptance/dsl/TekuNodeConfigBuilder.java | 3 ++- build.gradle | 1 + .../teku/networking/p2p/network/config/NetworkConfigTest.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java index 5ad12f151e5..77a645e8799 100644 --- a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java +++ b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java @@ -14,6 +14,7 @@ package tech.pegasys.teku.test.acceptance.dsl; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; import static tech.pegasys.teku.test.acceptance.dsl.Node.DATA_PATH; import static tech.pegasys.teku.test.acceptance.dsl.Node.JWT_SECRET_FILE_PATH; import static tech.pegasys.teku.test.acceptance.dsl.Node.METRICS_PORT; @@ -176,7 +177,7 @@ public TekuNodeConfigBuilder withTrustedSetupFromClasspath(final String trustedS LOG.debug("Xtrusted-setup={}", TRUSTED_SETUP_FILE); configMap.put("Xtrusted-setup", TRUSTED_SETUP_FILE); final URL trustedSetupResource = Eth2NetworkConfiguration.class.getResource(trustedSetup); - assert trustedSetupResource != null; + assertThat(trustedSetupResource).isNotNull(); configFileMap.put(copyToTmpFile(trustedSetupResource), TRUSTED_SETUP_FILE); return this; } diff --git a/build.gradle b/build.gradle index b26b2a4d415..84b93e4e11b 100644 --- a/build.gradle +++ b/build.gradle @@ -263,6 +263,7 @@ allprojects { check('RedundantOverride', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('RedundantThrows', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('UnnecessarilyFullyQualified', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('UseCorrectAssertInTests', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('WildcardImport', net.ltgt.gradle.errorprone.CheckSeverity.WARN) } diff --git a/networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/network/config/NetworkConfigTest.java b/networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/network/config/NetworkConfigTest.java index fc3509abead..a7606949d20 100644 --- a/networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/network/config/NetworkConfigTest.java +++ b/networking/p2p/src/test/java/tech/pegasys/teku/networking/p2p/network/config/NetworkConfigTest.java @@ -117,8 +117,8 @@ void checkDirectPeersConfigCreatedCorrectly() { final DirectPeerManager manager = optionalDirectPeerManager.get(); - assert manager.isDirectPeer(peerId1); - assert !manager.isDirectPeer(peerId2); + assertThat(manager.isDirectPeer(peerId1)).isTrue(); + assertThat(manager.isDirectPeer(peerId2)).isFalse(); } @Test From 74afe16ecef3c60a4c9cc5be6e6a05c227d72aa7 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 21 Oct 2024 16:49:43 -0500 Subject: [PATCH 3/5] Add three checks with no findings * StringFormatWithLiteral * TruthContainsExactlyElementsInUsage * UnnecessaryTestMethodPrefix --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 84b93e4e11b..39d7a3bf7d6 100644 --- a/build.gradle +++ b/build.gradle @@ -262,10 +262,12 @@ allprojects { check('PackageLocation', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('RedundantOverride', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('RedundantThrows', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('StringFormatWithLiteral', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('TruthContainsExactlyElementsInUsage', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('UnnecessarilyFullyQualified', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('UnnecessaryTestMethodPrefix', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('UseCorrectAssertInTests', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('WildcardImport', net.ltgt.gradle.errorprone.CheckSeverity.WARN) - } options.encoding = 'UTF-8' From 16dc733ed76358c5f00c5f8bfc71f261af17c9f0 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 21 Oct 2024 17:22:43 -0500 Subject: [PATCH 4/5] Enable the NonFinalStaticField check --- build.gradle | 1 + .../common/block/AbstractBlockProcessor.java | 1 + .../main/java/tech/pegasys/teku/bls/BLS.java | 1 + .../tech/pegasys/teku/bls/BLSConstants.java | 1 + .../infrastructure/io/JemallocDetector.java | 1 + ...lizableOneOfTypeDefinitionBuilderTest.java | 4 +- .../types/OneOfTypeTestTypeDefinition.java | 8 +- .../java/tech/pegasys/teku/kzg/CKZG4844.java | 1 + .../logging/LoggingConfigurator.java | 10 ++- .../ssz/SszCompositeListTest.java | 6 +- .../ssz/collections/SszBitlistTest.java | 76 +++++++++---------- 11 files changed, 62 insertions(+), 48 deletions(-) diff --git a/build.gradle b/build.gradle index 39d7a3bf7d6..cf37263fd83 100644 --- a/build.gradle +++ b/build.gradle @@ -259,6 +259,7 @@ allprojects { check('InterfaceWithOnlyStatics', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('MethodInputParametersMustBeFinal', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('MissingBraces', net.ltgt.gradle.errorprone.CheckSeverity.WARN) + check('NonFinalStaticField', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('PackageLocation', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('RedundantOverride', net.ltgt.gradle.errorprone.CheckSeverity.WARN) check('RedundantThrows', net.ltgt.gradle.errorprone.CheckSeverity.WARN) diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java index 89f38f02d82..587db7557c3 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java @@ -91,6 +91,7 @@ public abstract class AbstractBlockProcessor implements BlockProcessor { * Setting to false significantly speeds up state initialization */ @VisibleForTesting + @SuppressWarnings("NonFinalStaticField") public static BLSSignatureVerifier depositSignatureVerifier = DEFAULT_DEPOSIT_SIGNATURE_VERIFIER; private static final Logger LOG = LogManager.getLogger(); diff --git a/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLS.java b/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLS.java index a9abbd0cefb..94e6b32cfbc 100644 --- a/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLS.java +++ b/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLS.java @@ -41,6 +41,7 @@ public class BLS { private static final Logger LOG = LogManager.getLogger(); + @SuppressWarnings("NonFinalStaticField") private static BLS12381 blsImpl; static { diff --git a/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLSConstants.java b/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLSConstants.java index 352825f5e00..6bcce332e43 100644 --- a/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLSConstants.java +++ b/infrastructure/bls/src/main/java/tech/pegasys/teku/bls/BLSConstants.java @@ -27,6 +27,7 @@ public class BLSConstants { static final BigInteger CURVE_ORDER_BI = CURVE_ORDER_BYTES.toUnsignedBigInteger(ByteOrder.BIG_ENDIAN); + @SuppressWarnings("NonFinalStaticField") public static boolean verificationDisabled = false; public static void disableBLSVerification() { diff --git a/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java b/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java index ab364a0f618..51646430168 100644 --- a/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java +++ b/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java @@ -23,6 +23,7 @@ @SuppressWarnings("JavaCase") public class JemallocDetector { private static final Logger LOG = LogManager.getLogger(); + @SuppressWarnings("NonFinalStaticField") private static String _jemalloc; public static void logJemallocPresence() { diff --git a/infrastructure/json/src/test/java/tech/pegasys/teku/infrastructure/json/types/DeserializableOneOfTypeDefinitionBuilderTest.java b/infrastructure/json/src/test/java/tech/pegasys/teku/infrastructure/json/types/DeserializableOneOfTypeDefinitionBuilderTest.java index 3fd23cdaf81..fb6f1f7a88d 100644 --- a/infrastructure/json/src/test/java/tech/pegasys/teku/infrastructure/json/types/DeserializableOneOfTypeDefinitionBuilderTest.java +++ b/infrastructure/json/src/test/java/tech/pegasys/teku/infrastructure/json/types/DeserializableOneOfTypeDefinitionBuilderTest.java @@ -27,11 +27,11 @@ public class DeserializableOneOfTypeDefinitionBuilderTest { DeserializableOneOfTypeDefinition.object(OneOfTypeTestTypeDefinition.TestType.class) .description("meaningful description") .withType( - OneOfTypeTestTypeDefinition.TestObjA.isInstance, + OneOfTypeTestTypeDefinition.TestObjA.IS_INSTANCE, s -> s.contains("value1"), TYPE_A) .withType( - OneOfTypeTestTypeDefinition.TestObjB.isInstance, + OneOfTypeTestTypeDefinition.TestObjB.IS_INSTANCE, s -> s.contains("value2"), TYPE_B) .build(); diff --git a/infrastructure/json/src/testFixtures/java/tech/pegasys/teku/infrastructure/json/types/OneOfTypeTestTypeDefinition.java b/infrastructure/json/src/testFixtures/java/tech/pegasys/teku/infrastructure/json/types/OneOfTypeTestTypeDefinition.java index 83ded29ac48..d2222dd17c8 100644 --- a/infrastructure/json/src/testFixtures/java/tech/pegasys/teku/infrastructure/json/types/OneOfTypeTestTypeDefinition.java +++ b/infrastructure/json/src/testFixtures/java/tech/pegasys/teku/infrastructure/json/types/OneOfTypeTestTypeDefinition.java @@ -42,8 +42,8 @@ public interface TestType { SERIALIZABLE_ONE_OF_TYPE_DEFINITION = new SerializableOneOfTypeDefinitionBuilder() .description("meaningful description") - .withType(TestObjA.isInstance, TYPE_A) - .withType(TestObjB.isInstance, TYPE_B) + .withType(TestObjA.IS_INSTANCE, TYPE_A) + .withType(TestObjB.IS_INSTANCE, TYPE_B) .build(); public static class TestObjA implements TestType { @@ -82,7 +82,7 @@ public int hashCode() { return Objects.hash(name); } - static Predicate isInstance = testType -> testType instanceof TestObjA; + static final Predicate IS_INSTANCE = testType -> testType instanceof TestObjA; } public static class TestObjB implements TestType { @@ -104,6 +104,6 @@ public void setName(final String name) { this.name = name; } - static Predicate isInstance = testType -> testType instanceof TestObjB; + static final Predicate IS_INSTANCE = testType -> testType instanceof TestObjB; } } diff --git a/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/CKZG4844.java b/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/CKZG4844.java index 33b14a6fbd0..52a2d27b0a4 100644 --- a/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/CKZG4844.java +++ b/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/CKZG4844.java @@ -31,6 +31,7 @@ final class CKZG4844 implements KZG { // used for FK20 proof computations (PeerDAS) so can default to 0 for now private static final int PRECOMPUTE_DEFAULT = 0; + @SuppressWarnings("NonFinalStaticField") private static CKZG4844 instance; static synchronized CKZG4844 getInstance() { diff --git a/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java b/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java index 085d03da718..44280bba40d 100644 --- a/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java +++ b/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java @@ -51,16 +51,24 @@ public class LoggingConfigurator { private static final String FILE_MESSAGE_FORMAT = "%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n"; private static final AtomicBoolean COLOR = new AtomicBoolean(); + private static final StatusLogger STATUS_LOG = StatusLogger.getLogger(); + @SuppressWarnings("NonFinalStaticField") private static LoggingDestination destination; + @SuppressWarnings("NonFinalStaticField") private static boolean includeEvents; + @SuppressWarnings("NonFinalStaticField") private static boolean includeValidatorDuties; + @SuppressWarnings("NonFinalStaticField") private static boolean includeP2pWarnings; + @SuppressWarnings("NonFinalStaticField") private static String file; + @SuppressWarnings("NonFinalStaticField") private static String filePattern; + @SuppressWarnings("NonFinalStaticField") private static Level rootLogLevel = Level.INFO; + @SuppressWarnings("NonFinalStaticField") private static int dbOpAlertThresholdMillis; - private static final StatusLogger STATUS_LOG = StatusLogger.getLogger(); public static boolean isColorEnabled() { return COLOR.get(); diff --git a/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/SszCompositeListTest.java b/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/SszCompositeListTest.java index 5108cddcfc7..377b08ff7fe 100644 --- a/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/SszCompositeListTest.java +++ b/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/SszCompositeListTest.java @@ -35,7 +35,7 @@ public class SszCompositeListTest { - static SszSchema testType = + static final SszSchema TEST_TYPE = new SszSchema<>() { @Override @@ -126,7 +126,7 @@ public TestView(final TreeNode node) { @Override public SszSchema getSchema() { - return testType; + return TEST_TYPE; } @Override @@ -145,7 +145,7 @@ public SszMutableData createWritableCopy() { @Test public void simpleTest1() { - SszListSchema listType = SszListSchema.create(testType, 3); + SszListSchema listType = SszListSchema.create(TEST_TYPE, 3); SszMutableList list = listType.getDefault().createWritableCopy(); TreeNode n0 = list.commitChanges().getBackingNode(); list.set(0, new TestView(0x111)); diff --git a/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/collections/SszBitlistTest.java b/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/collections/SszBitlistTest.java index 207de309b75..bfa64d46f41 100644 --- a/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/collections/SszBitlistTest.java +++ b/infrastructure/ssz/src/test/java/tech/pegasys/teku/infrastructure/ssz/collections/SszBitlistTest.java @@ -41,46 +41,46 @@ public class SszBitlistTest implements SszPrimitiveListTestBase { - static Random random = new Random(1); - static SszBitlistSchema emptySchema = SszBitlistSchema.create(0); - static SszBitlistSchema schema = SszBitlistSchema.create(500); - static SszBitlistSchema hugeSchema = SszBitlistSchema.create(1L << 62); + static final Random RANDOM = new Random(1); + static final SszBitlistSchema EMPTY_SCHEMA = SszBitlistSchema.create(0); + static final SszBitlistSchema SCHEMA = SszBitlistSchema.create(500); + static final SszBitlistSchema HUGE_SCHEMA = SszBitlistSchema.create(1L << 62); static SszBitlist random(final SszBitlistSchema schema, final int size) { return schema.ofBits( - size, IntStream.range(0, size).filter(__ -> random.nextBoolean()).toArray()); + size, IntStream.range(0, size).filter(__ -> RANDOM.nextBoolean()).toArray()); } @Override public Stream sszData() { return Stream.of( - emptySchema.empty(), - schema.empty(), - hugeSchema.empty(), - random(schema, 1), - random(hugeSchema, 1), - random(schema, 2), - random(hugeSchema, 2), - random(schema, 254), - schema.ofBits(254), - schema.ofBits(254, IntStream.range(0, 254).toArray()), - random(hugeSchema, 254), - random(schema, 255), - schema.ofBits(255), - schema.ofBits(255, IntStream.range(0, 255).toArray()), - random(hugeSchema, 255), - random(schema, 256), - schema.ofBits(256), - schema.ofBits(256, IntStream.range(0, 256).toArray()), - random(hugeSchema, 256), - random(schema, 257), - random(hugeSchema, 257), - random(schema, 499), - random(schema, 500), - random(hugeSchema, 511), - random(hugeSchema, 512), - random(hugeSchema, 513), - random(hugeSchema, 10000)); + EMPTY_SCHEMA.empty(), + SCHEMA.empty(), + HUGE_SCHEMA.empty(), + random(SCHEMA, 1), + random(HUGE_SCHEMA, 1), + random(SCHEMA, 2), + random(HUGE_SCHEMA, 2), + random(SCHEMA, 254), + SCHEMA.ofBits(254), + SCHEMA.ofBits(254, IntStream.range(0, 254).toArray()), + random(HUGE_SCHEMA, 254), + random(SCHEMA, 255), + SCHEMA.ofBits(255), + SCHEMA.ofBits(255, IntStream.range(0, 255).toArray()), + random(HUGE_SCHEMA, 255), + random(SCHEMA, 256), + SCHEMA.ofBits(256), + SCHEMA.ofBits(256, IntStream.range(0, 256).toArray()), + random(HUGE_SCHEMA, 256), + random(SCHEMA, 257), + random(HUGE_SCHEMA, 257), + random(SCHEMA, 499), + random(SCHEMA, 500), + random(HUGE_SCHEMA, 511), + random(HUGE_SCHEMA, 512), + random(HUGE_SCHEMA, 513), + random(HUGE_SCHEMA, 10000)); } public Stream bitlistArgs() { @@ -149,8 +149,8 @@ void wrapBitSet_shouldDropBitsIfBitSetIsLarger() { bitSet.set(99); assertThat(bitSet.stream().count()).isEqualTo(1); - final SszBitlist sszBitlist = schema.wrapBitSet(10, bitSet); - final SszBitlist expectedSszBitlist = schema.ofBits(10); + final SszBitlist sszBitlist = SCHEMA.wrapBitSet(10, bitSet); + final SszBitlist expectedSszBitlist = SCHEMA.ofBits(10); assertThat(sszBitlist).isEqualTo(expectedSszBitlist); assertThat(sszBitlist.hashCode()).isEqualTo(expectedSszBitlist.hashCode()); @@ -161,7 +161,7 @@ void wrapBitSet_shouldDropBitsIfBitSetIsLarger() { @Test void wrapBitSet_shouldThrowIfSizeIsLargerThanSchemaMaxLength() { assertThatThrownBy( - () -> schema.wrapBitSet(Math.toIntExact(schema.getMaxLength() + 1), new BitSet())) + () -> SCHEMA.wrapBitSet(Math.toIntExact(SCHEMA.getMaxLength() + 1), new BitSet())) .isInstanceOf(IllegalArgumentException.class); } @@ -331,12 +331,12 @@ void testOrWithEmptyBitlist(final SszBitlist bitlist) { @Test void testEmptyHashTreeRoot() { - assertThat(emptySchema.empty().hashTreeRoot()) + assertThat(EMPTY_SCHEMA.empty().hashTreeRoot()) .isEqualTo(Hash.sha256(Bytes.concatenate(Bytes32.ZERO, Bytes32.ZERO))); - assertThat(schema.empty().hashTreeRoot()) + assertThat(SCHEMA.empty().hashTreeRoot()) .isEqualTo( Hash.sha256(Bytes.concatenate(TreeUtil.ZERO_TREES[1].hashTreeRoot(), Bytes32.ZERO))); - assertThat(hugeSchema.empty().hashTreeRoot()) + assertThat(HUGE_SCHEMA.empty().hashTreeRoot()) .isEqualTo( Hash.sha256( Bytes.concatenate(TreeUtil.ZERO_TREES[62 - 8].hashTreeRoot(), Bytes32.ZERO))); From 35d76c63a5678d7635b797a727ee1e6a3d32463f Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Mon, 21 Oct 2024 17:40:24 -0500 Subject: [PATCH 5/5] Run spotlessApply --- gradle/versions.gradle | 2 +- .../pegasys/teku/infrastructure/io/JemallocDetector.java | 1 + .../teku/infrastructure/logging/LoggingConfigurator.java | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index fc471b2a5c5..f7c4c174517 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -5,7 +5,7 @@ dependencyManagement { dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.17.2' dependency 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2' - dependencySet(group: 'com.google.errorprone', version: '2.31.0') { + dependencySet(group: 'com.google.errorprone', version: '2.34.0') { entry 'error_prone_annotation' entry 'error_prone_check_api' entry 'error_prone_core' diff --git a/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java b/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java index 51646430168..fc5a8241e1e 100644 --- a/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java +++ b/infrastructure/io/src/main/java/tech/pegasys/teku/infrastructure/io/JemallocDetector.java @@ -23,6 +23,7 @@ @SuppressWarnings("JavaCase") public class JemallocDetector { private static final Logger LOG = LogManager.getLogger(); + @SuppressWarnings("NonFinalStaticField") private static String _jemalloc; diff --git a/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java b/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java index 44280bba40d..a4465d47f7e 100644 --- a/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java +++ b/infrastructure/logging/src/main/java/tech/pegasys/teku/infrastructure/logging/LoggingConfigurator.java @@ -55,18 +55,25 @@ public class LoggingConfigurator { @SuppressWarnings("NonFinalStaticField") private static LoggingDestination destination; + @SuppressWarnings("NonFinalStaticField") private static boolean includeEvents; + @SuppressWarnings("NonFinalStaticField") private static boolean includeValidatorDuties; + @SuppressWarnings("NonFinalStaticField") private static boolean includeP2pWarnings; + @SuppressWarnings("NonFinalStaticField") private static String file; + @SuppressWarnings("NonFinalStaticField") private static String filePattern; + @SuppressWarnings("NonFinalStaticField") private static Level rootLogLevel = Level.INFO; + @SuppressWarnings("NonFinalStaticField") private static int dbOpAlertThresholdMillis;