From 02a93f401cb47789c9cb3924a306f1e854765847 Mon Sep 17 00:00:00 2001 From: eum602 Date: Thu, 6 Jul 2023 11:58:53 -0500 Subject: [PATCH] fix code format --- .../besu/config/GenesisConfigOptions.java | 2 -- .../besu/config/JsonGenesisConfigOptions.java | 16 ++++++---------- .../besu/config/StubGenesisConfigOptions.java | 11 +++-------- .../org/hyperledger/besu/datatypes/Address.java | 13 +++++++------ .../mainnet/ProtocolScheduleBuilder.java | 2 -- gradle/versions.gradle | 1 - 6 files changed, 16 insertions(+), 29 deletions(-) diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java index caf339f42cd..41f385fc4f5 100644 --- a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java @@ -394,8 +394,6 @@ default boolean isConsensusMigration() { */ OptionalLong getThanosBlockNumber(); - OptionalLong getLacchainPostQuantumBlockNumber(); - /** * Block number to activate Magneto on Classic networks. * diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java index 5d0370c0c3b..f9cf0696290 100644 --- a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java @@ -14,9 +14,9 @@ */ package org.hyperledger.besu.config; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.google.common.collect.ImmutableMap; -import org.apache.tuweni.units.bigints.UInt256; +import static java.util.Collections.emptyMap; +import static java.util.Objects.isNull; + import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.datatypes.Wei; @@ -31,8 +31,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static java.util.Collections.emptyMap; -import static java.util.Objects.isNull; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.collect.ImmutableMap; +import org.apache.tuweni.units.bigints.UInt256; /** The Json genesis config options. */ public class JsonGenesisConfigOptions implements GenesisConfigOptions { @@ -364,11 +365,6 @@ public OptionalLong getThanosBlockNumber() { return getOptionalLong("thanosblock"); } - @Override - public OptionalLong getLacchainPostQuantumBlockNumber() { - return getOptionalLong("lacchainpqblock"); - } - @Override public OptionalLong getMagnetoBlockNumber() { return getOptionalLong("magnetoblock"); diff --git a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java index c991901a770..949205e9b04 100644 --- a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java @@ -14,8 +14,6 @@ */ package org.hyperledger.besu.config; -import com.google.common.collect.ImmutableMap; -import org.apache.tuweni.units.bigints.UInt256; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.datatypes.Wei; @@ -28,6 +26,9 @@ import java.util.OptionalInt; import java.util.OptionalLong; +import com.google.common.collect.ImmutableMap; +import org.apache.tuweni.units.bigints.UInt256; + /** The Stub genesis config options. */ public class StubGenesisConfigOptions implements GenesisConfigOptions, Cloneable { @@ -41,7 +42,6 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions, Cloneable private OptionalLong istanbulBlockNumber = OptionalLong.empty(); private OptionalLong muirGlacierBlockNumber = OptionalLong.empty(); private OptionalLong berlinBlockNumber = OptionalLong.empty(); - private final OptionalLong lacchainPostQuantumBlockNumber = OptionalLong.empty(); private OptionalLong londonBlockNumber = OptionalLong.empty(); private OptionalLong arrowGlacierBlockNumber = OptionalLong.empty(); private OptionalLong grayGlacierBlockNumber = OptionalLong.empty(); @@ -301,11 +301,6 @@ public OptionalLong getThanosBlockNumber() { return thanosBlockNumber; } - @Override - public OptionalLong getLacchainPostQuantumBlockNumber() { - return lacchainPostQuantumBlockNumber; - } - @Override public OptionalLong getMagnetoBlockNumber() { return magnetoBlockNumber; diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java index 18b973cabc1..c68058e9796 100644 --- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java +++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java @@ -14,17 +14,18 @@ */ package org.hyperledger.besu.datatypes; -import com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.tuweni.bytes.Bytes; -import org.apache.tuweni.bytes.Bytes32; -import org.apache.tuweni.bytes.DelegatingBytes; +import static com.google.common.base.Preconditions.checkArgument; +import static org.hyperledger.besu.crypto.Hash.keccak256; + import org.hyperledger.besu.crypto.SECPPublicKey; import org.hyperledger.besu.ethereum.rlp.RLP; import org.hyperledger.besu.ethereum.rlp.RLPException; import org.hyperledger.besu.ethereum.rlp.RLPInput; -import static com.google.common.base.Preconditions.checkArgument; -import static org.hyperledger.besu.crypto.Hash.keccak256; +import com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.tuweni.bytes.Bytes; +import org.apache.tuweni.bytes.Bytes32; +import org.apache.tuweni.bytes.DelegatingBytes; /** A 160-bits account address. */ public class Address extends DelegatingBytes { diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java index 92f8e8026f8..786fdd35976 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java @@ -309,8 +309,6 @@ private Stream> createMilestones( config.getGrayGlacierBlockNumber(), specFactory.grayGlacierDefinition(config)), blockNumberMilestone( config.getMergeNetSplitBlockNumber(), specFactory.parisDefinition(config)), - blockNumberMilestone( - config.getLacchainPostQuantumBlockNumber(), specFactory.lacchainDefinition()), // Timestamp Forks timestampMilestone(config.getShanghaiTime(), specFactory.shanghaiDefinition(config)), timestampMilestone(config.getCancunTime(), specFactory.cancunDefinition(config)), diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 2036c4300d5..46ebb9c992b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -222,7 +222,6 @@ dependencyManagement { dependency 'org.openquantumsafe:liboqs-java:1.1-SNAPSHOT' dependency 'org.testcontainers:testcontainers:1.17.6' - dependency 'org.openquantumsafe:liboqs-java:1.1-SNAPSHOT' dependency 'org.web3j:quorum:4.9.5' dependencySet(group: 'org.web3j', version: '4.9.7') {