[Feat] GoogleJavaFormat rules for Spotless (#1109)

* add google javaformat

* add googleJavaSpotless to libs catalog
This commit is contained in:
kyzooghost
2025-06-06 18:08:36 +10:00
committed by GitHub
parent 62b422b634
commit c6550573d3
122 changed files with 2425 additions and 2393 deletions

View File

@@ -17,7 +17,6 @@ package linea.plugin.acc.test.utils;
import java.io.ByteArrayOutputStream;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import lombok.SneakyThrows;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Core;

View File

@@ -16,7 +16,6 @@ package linea.plugin.acc.test;
import java.math.BigInteger;
import java.util.List;
import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.stream.Stream;
import linea.plugin.acc.test.tests.web3j.generated.EcAdd;
import linea.plugin.acc.test.tests.web3j.generated.EcMul;
import linea.plugin.acc.test.tests.web3j.generated.EcPairing;

View File

@@ -15,7 +15,6 @@
package linea.plugin.acc.test;
import java.math.BigInteger;
import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -21,7 +21,6 @@ import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import linea.plugin.acc.test.tests.web3j.generated.ExcludedPrecompiles;
import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;

View File

@@ -20,6 +20,9 @@ import static net.consensys.linea.metrics.LineaMetricCategory.SEQUENCER_PROFITAB
import static net.consensys.linea.metrics.LineaMetricCategory.TX_POOL_PROFITABILITY;
import static org.assertj.core.api.Assertions.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.math.BigInteger;
import java.net.URI;
@@ -36,10 +39,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import linea.plugin.acc.test.tests.web3j.generated.AcceptanceTestToken;
import linea.plugin.acc.test.tests.web3j.generated.DummyAdder;
import linea.plugin.acc.test.tests.web3j.generated.EcAdd;

View File

@@ -15,14 +15,13 @@
package linea.plugin.acc.test;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.hyperledger.besu.consensus.clique.CliqueExtraData;
import org.hyperledger.besu.datatypes.Address;

View File

@@ -16,7 +16,6 @@ package linea.plugin.acc.test;
import java.math.BigInteger;
import java.util.List;
import org.bouncycastle.crypto.digests.KeccakDigest;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;

View File

@@ -19,7 +19,6 @@ import static linea.plugin.acc.test.LineaPluginTestBase.getResourcePath;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.web3j.tx.gas.DefaultGasProvider;
/** This class is used to build a list of command line options for testing. */

View File

@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import linea.plugin.acc.test.tests.web3j.generated.SimpleStorage;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;

View File

@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import linea.plugin.acc.test.tests.web3j.generated.SimpleStorage;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;

View File

@@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.math.BigInteger;
import java.util.List;
import java.util.stream.IntStream;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
import org.junit.jupiter.api.Test;

View File

@@ -17,7 +17,6 @@ package linea.plugin.acc.test;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import linea.plugin.acc.test.tests.web3j.generated.DummyAdder;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;

View File

@@ -17,7 +17,6 @@ package linea.plugin.acc.test;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import linea.plugin.acc.test.tests.web3j.generated.DummyAdder;
import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
import org.junit.jupiter.api.Test;

View File

@@ -21,7 +21,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.math.BigInteger;
import java.util.List;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import org.apache.tuweni.bytes.Bytes32;

View File

@@ -17,7 +17,6 @@ package linea.plugin.acc.test.extradata;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;

View File

@@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import java.util.Optional;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import org.apache.tuweni.bytes.Bytes32;

View File

@@ -19,7 +19,6 @@ import static org.web3j.crypto.Hash.sha3;
import java.io.IOException;
import java.math.BigInteger;
import java.util.Arrays;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.tests.web3j.generated.AcceptanceTestToken;
import linea.plugin.acc.test.tests.web3j.generated.MulmodExecutor;

View File

@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;

View File

@@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigInteger;
import java.util.List;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import linea.plugin.acc.test.tests.web3j.generated.DummyAdder;

View File

@@ -17,6 +17,7 @@ package linea.plugin.acc.test.rpc.linea;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
import static org.assertj.core.api.Assertions.assertThat;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.IOException;
import java.math.BigInteger;
import java.net.URI;
@@ -27,8 +28,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonInclude;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import linea.plugin.acc.test.tests.web3j.generated.SimpleStorage;

View File

@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.IntStream;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import linea.plugin.acc.test.tests.web3j.generated.ExcludedPrecompiles;

View File

@@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.web3j.crypto.Hash.sha3;
import java.util.List;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import org.apache.tuweni.bytes.Bytes;

View File

@@ -30,11 +30,6 @@ import static net.consensys.linea.bundles.BundleForwarder.RETRY_COUNT_HEADER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.tomakehurst.wiremock.http.Fault;
@@ -45,6 +40,10 @@ import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.github.tomakehurst.wiremock.matching.MatchResult;
import com.github.tomakehurst.wiremock.matching.StringValuePattern;
import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;

View File

@@ -20,7 +20,6 @@ import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import linea.plugin.acc.test.tests.web3j.generated.ModExp;

View File

@@ -19,7 +19,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.List;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import linea.plugin.acc.test.tests.web3j.generated.AcceptanceTestToken;
import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;

View File

@@ -19,7 +19,6 @@ import static org.web3j.crypto.Hash.sha3;
import java.math.BigInteger;
import java.util.Arrays;
import linea.plugin.acc.test.tests.web3j.generated.AcceptanceTestToken;
import linea.plugin.acc.test.tests.web3j.generated.RevertExample;
import org.hyperledger.besu.datatypes.Wei;

View File

@@ -16,6 +16,7 @@ package linea.plugin.acc.test.rpc.linea;
import static org.assertj.core.api.Assertions.assertThat;
import com.google.common.base.Strings;
import java.io.IOException;
import java.math.BigInteger;
import java.net.URI;
@@ -23,8 +24,6 @@ import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.List;
import com.google.common.base.Strings;
import linea.plugin.acc.test.LineaPluginTestBase;
import linea.plugin.acc.test.TestCommandLineOptionsBuilder;
import net.consensys.linea.config.LineaProfitabilityCliOptions;

View File

@@ -25,7 +25,6 @@ import java.lang.ProcessBuilder.Redirect;
import java.math.BigInteger;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import lombok.extern.slf4j.Slf4j;
import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Blockchain;

View File

@@ -17,13 +17,12 @@ package org.hyperledger.besu.tests.acceptance.dsl;
import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
import java.util.Optional;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.util.Optional;
import okhttp3.Call;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;

View File

@@ -16,7 +16,6 @@
package org.hyperledger.besu.tests.acceptance.dsl;
import java.util.concurrent.TimeUnit;
import org.awaitility.Awaitility;
import org.awaitility.core.ThrowingRunnable;

View File

@@ -18,7 +18,6 @@ package net.consensys.linea;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bundles.BundlePoolService;
import net.consensys.linea.bundles.LineaLimitedBundlePool;

View File

@@ -15,7 +15,6 @@
package net.consensys.linea.bl;
import java.math.BigDecimal;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaProfitabilityConfiguration;
import net.consensys.linea.utils.Compressor;

View File

@@ -16,6 +16,10 @@ package net.consensys.linea.bundles;
import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import java.io.IOException;
import java.net.URL;
import java.util.OptionalLong;
@@ -23,11 +27,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

View File

@@ -16,13 +16,12 @@ package net.consensys.linea.bundles;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT;
import java.util.List;
import java.util.Optional;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.List;
import java.util.Optional;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.parameters.UnsignedLongParameter;

View File

@@ -16,7 +16,6 @@ package net.consensys.linea.bundles;
import java.util.List;
import java.util.UUID;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.plugin.services.BesuService;

View File

@@ -15,13 +15,12 @@
package net.consensys.linea.bundles;
import com.google.auto.service.AutoService;
import java.net.URL;
import java.time.Duration;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.google.auto.service.AutoService;
import net.consensys.linea.AbstractLineaRequiredPlugin;
import net.consensys.linea.utils.PriorityThreadPoolExecutor;
import okhttp3.OkHttpClient;

View File

@@ -17,6 +17,16 @@ package net.consensys.linea.bundles;
import static java.util.Collections.emptyList;
import com.fasterxml.jackson.databind.MappingIterator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SequenceWriter;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalCause;
import com.github.benmanes.caffeine.cache.Scheduler;
import com.google.auto.service.AutoService;
import com.google.common.annotations.VisibleForTesting;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -33,17 +43,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.fasterxml.jackson.databind.MappingIterator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SequenceWriter;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalCause;
import com.github.benmanes.caffeine.cache.Scheduler;
import com.google.auto.service.AutoService;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import org.apache.tuweni.bytes.Bytes;
import org.hyperledger.besu.datatypes.Hash;

View File

@@ -15,15 +15,14 @@
package net.consensys.linea.bundles;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.SequencedMap;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;

View File

@@ -15,11 +15,10 @@
package net.consensys.linea.config;
import com.google.common.base.MoreObjects;
import java.net.URL;
import java.util.Set;
import java.util.stream.Collectors;
import com.google.common.base.MoreObjects;
import net.consensys.linea.plugins.LineaCliOptions;
import picocli.CommandLine;

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.config;
import java.net.URL;
import java.util.Set;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;

View File

@@ -15,10 +15,9 @@
package net.consensys.linea.config;
import java.math.BigDecimal;
import com.google.common.base.MoreObjects;
import jakarta.validation.constraints.Positive;
import java.math.BigDecimal;
import net.consensys.linea.plugins.LineaCliOptions;
import picocli.CommandLine;

View File

@@ -14,9 +14,8 @@
*/
package net.consensys.linea.config;
import java.net.URL;
import com.google.common.base.MoreObjects;
import java.net.URL;
import net.consensys.linea.plugins.LineaCliOptions;
import picocli.CommandLine.Option;

View File

@@ -16,7 +16,6 @@
package net.consensys.linea.config;
import java.net.URL;
import lombok.Builder;
import net.consensys.linea.plugins.LineaOptionsConfiguration;

View File

@@ -15,9 +15,8 @@
package net.consensys.linea.config;
import java.math.BigDecimal;
import com.google.common.base.MoreObjects;
import java.math.BigDecimal;
import net.consensys.linea.plugins.LineaCliOptions;
import picocli.CommandLine;

View File

@@ -16,7 +16,6 @@
package net.consensys.linea.config;
import java.math.BigDecimal;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

View File

@@ -15,7 +15,6 @@
package net.consensys.linea.config.converters;
import java.math.BigInteger;
import org.apache.tuweni.bytes.Bytes;
import org.hyperledger.besu.datatypes.Wei;
import picocli.CommandLine;

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.extradata;
import java.util.function.Consumer;
import java.util.function.Function;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaProfitabilityConfiguration;
import org.apache.commons.lang3.mutable.MutableLong;

View File

@@ -17,9 +17,8 @@ package net.consensys.linea.extradata;
import static net.consensys.linea.metrics.LineaMetricCategory.PRICING_CONF;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.auto.service.AutoService;
import java.util.concurrent.atomic.AtomicBoolean;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.AbstractLineaRequiredPlugin;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -15,6 +15,9 @@
package net.consensys.linea.jsonrpc;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.DirectoryStream;
@@ -36,10 +39,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaNodeType;

View File

@@ -15,13 +15,12 @@
package net.consensys.linea.jsonrpc;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.time.Instant;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import net.consensys.linea.config.LineaNodeType;
import net.consensys.linea.sequencer.modulelimit.ModuleLimitsValidationResult;
import org.hyperledger.besu.datatypes.Transaction;

View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.function.DoubleSupplier;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.hyperledger.besu.plugin.services.MetricsSystem;

View File

@@ -16,7 +16,6 @@ package net.consensys.linea.metrics;
import java.util.Locale;
import java.util.Optional;
import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
public enum LineaMetricCategory implements MetricCategory {

View File

@@ -16,7 +16,6 @@ package net.consensys.linea.rpc.methods;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bundles.BundlePoolService;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;

View File

@@ -20,15 +20,14 @@ import static net.consensys.linea.sequencer.modulelimit.ModuleLineCountValidator
import static net.consensys.linea.zktracer.Fork.LONDON;
import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity.create;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bl.TransactionProfitabilityCalculator;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -14,14 +14,13 @@
*/
package net.consensys.linea.rpc.methods;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import java.time.Duration;
import java.time.Instant;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bundles.BundleParameter;

View File

@@ -19,7 +19,6 @@ import static net.consensys.linea.extradata.LineaExtraDataException.ErrorType.FA
import static net.consensys.linea.extradata.LineaExtraDataException.ErrorType.INVALID_ARGUMENT;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.extradata.LineaExtraDataException;
import net.consensys.linea.extradata.LineaExtraDataHandler;

View File

@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import org.apache.tuweni.bytes.Bytes;
import org.hyperledger.besu.datatypes.Address;
import org.hyperledger.besu.datatypes.Transaction;

View File

@@ -14,14 +14,13 @@
*/
package net.consensys.linea.sequencer.modulelimit;
import com.google.common.io.Resources;
import java.io.File;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.google.common.io.Resources;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTracerConfiguration;
import org.apache.tuweni.toml.Toml;

View File

@@ -19,7 +19,6 @@ import java.util.Arrays;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import net.consensys.linea.config.LineaProfitabilityConfiguration;
import net.consensys.linea.config.LineaTransactionPoolValidatorConfiguration;
import net.consensys.linea.jsonrpc.JsonRpcManager;

View File

@@ -18,6 +18,7 @@ package net.consensys.linea.sequencer.txpoolvalidation;
import static net.consensys.linea.metrics.LineaMetricCategory.TX_POOL_PROFITABILITY;
import static net.consensys.linea.sequencer.modulelimit.ModuleLineCountValidator.createLimitModules;
import com.google.auto.service.AutoService;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -25,8 +26,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.auto.service.AutoService;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.AbstractLineaRequiredPlugin;
import net.consensys.linea.config.LineaRejectedTxReportingConfiguration;

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.sequencer.txpoolvalidation.metrics;
import static net.consensys.linea.metrics.LineaMetricCategory.TX_POOL_PROFITABILITY;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bl.TransactionProfitabilityCalculator;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -16,7 +16,6 @@ package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.hyperledger.besu.datatypes.Address;

View File

@@ -15,7 +15,6 @@
package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTransactionPoolValidatorConfiguration;

View File

@@ -15,7 +15,6 @@
package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTransactionPoolValidatorConfiguration;

View File

@@ -15,7 +15,6 @@
package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bl.TransactionProfitabilityCalculator;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -23,7 +23,6 @@ import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTransactionPoolValidatorConfiguration;
import net.consensys.linea.jsonrpc.JsonRpcManager;

View File

@@ -18,7 +18,6 @@ package net.consensys.linea.sequencer.txselection;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bundles.BundlePoolService;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -18,9 +18,8 @@ package net.consensys.linea.sequencer.txselection;
import static net.consensys.linea.metrics.LineaMetricCategory.SEQUENCER_PROFITABILITY;
import static net.consensys.linea.sequencer.modulelimit.ModuleLineCountValidator.createLimitModules;
import java.util.Optional;
import com.google.auto.service.AutoService;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.AbstractLineaRequiredPlugin;
import net.consensys.linea.config.LineaRejectedTxReportingConfiguration;

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.sequencer.txselection.selectors;
import static java.lang.Boolean.TRUE;
import java.time.Instant;
import net.consensys.linea.bundles.TransactionBundle;
import org.hyperledger.besu.plugin.data.TransactionProcessingResult;
import org.hyperledger.besu.plugin.data.TransactionSelectionResult;

View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bundles.BundlePoolService;
import net.consensys.linea.bundles.TransactionBundle;

View File

@@ -19,14 +19,13 @@ import static net.consensys.linea.sequencer.txselection.LineaTransactionSelectio
import static net.consensys.linea.sequencer.txselection.LineaTransactionSelectionResult.TX_UNPROFITABLE_UPFRONT;
import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
import com.google.common.annotations.VisibleForTesting;
import java.util.EnumMap;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.bl.TransactionProfitabilityCalculator;
import net.consensys.linea.config.LineaProfitabilityConfiguration;

View File

@@ -21,14 +21,13 @@ import static net.consensys.linea.sequencer.txselection.LineaTransactionSelectio
import static net.consensys.linea.zktracer.Fork.LONDON;
import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
import com.google.common.annotations.VisibleForTesting;
import java.math.BigInteger;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTracerConfiguration;
import net.consensys.linea.config.LineaTransactionSelectorConfiguration;

View File

@@ -21,7 +21,6 @@ import java.util.concurrent.RunnableFuture;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import lombok.EqualsAndHashCode;
import lombok.Getter;

View File

@@ -15,12 +15,11 @@
package net.consensys.linea.bundles;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import java.math.BigInteger;
import java.util.List;
import java.util.Optional;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import org.hyperledger.besu.crypto.KeyPair;
import org.hyperledger.besu.crypto.SECPPrivateKey;
import org.hyperledger.besu.crypto.SECPPublicKey;

View File

@@ -36,6 +36,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.lenient;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.github.tomakehurst.wiremock.matching.StringValuePattern;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.MalformedURLException;
@@ -50,11 +54,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.github.tomakehurst.wiremock.matching.StringValuePattern;
import net.consensys.linea.bundles.BundleForwarder.SendBundleResponse;
import net.consensys.linea.config.LineaBundleConfiguration;
import net.consensys.linea.utils.PriorityThreadPoolExecutor;

View File

@@ -38,7 +38,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import lombok.Getter;
import net.consensys.linea.bundles.BundlePoolService.TransactionBundleAddedListener;
import net.consensys.linea.bundles.BundlePoolService.TransactionBundleRemovedListener;

View File

@@ -18,11 +18,10 @@ package net.consensys.linea.bundles;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.List;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
import java.util.List;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.ethereum.core.Transaction;
import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;

View File

@@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThatNoException;
import java.net.MalformedURLException;
import java.net.URI;
import org.hyperledger.besu.services.PicoCLIOptionsImpl;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -25,6 +25,8 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
import static org.mockito.Mockito.when;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
@@ -32,9 +34,6 @@ import java.nio.file.Path;
import java.time.Instant;
import java.util.List;
import java.util.Optional;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import net.consensys.linea.config.LineaNodeType;
import net.consensys.linea.config.LineaRejectedTxReportingConfiguration;
import org.apache.tuweni.bytes.Bytes;

View File

@@ -28,6 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import static org.mockito.Mockito.when;
import com.github.tomakehurst.wiremock.http.Fault;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.github.tomakehurst.wiremock.stubbing.Scenario;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
@@ -37,11 +41,6 @@ import java.time.Instant;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import com.github.tomakehurst.wiremock.http.Fault;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import com.github.tomakehurst.wiremock.stubbing.Scenario;
import net.consensys.linea.config.LineaNodeType;
import net.consensys.linea.config.LineaRejectedTxReportingConfiguration;
import org.apache.tuweni.bytes.Bytes;

View File

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.UUID;
import net.consensys.linea.bundles.LineaLimitedBundlePool;
import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException;
import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;

View File

@@ -31,7 +31,6 @@ import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import net.consensys.linea.bundles.BundleParameter;
import net.consensys.linea.bundles.LineaLimitedBundlePool;
import net.consensys.linea.bundles.TransactionBundle;

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.sequencer.modulelimit;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Map;
import org.junit.jupiter.api.Test;
class ModuleLineCountValidatorTest {

View File

@@ -17,7 +17,6 @@ package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.tuweni.bytes.Bytes;

View File

@@ -16,7 +16,6 @@
package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTransactionPoolValidatorCliOptions;

View File

@@ -16,7 +16,6 @@
package net.consensys.linea.sequencer.txpoolvalidation.validators;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaTransactionPoolValidatorCliOptions;

View File

@@ -20,7 +20,6 @@ import static org.mockito.Mockito.when;
import java.math.BigInteger;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaProfitabilityCliOptions;

View File

@@ -30,6 +30,8 @@ import static org.awaitility.Awaitility.await;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import java.io.IOException;
import java.math.BigInteger;
import java.net.MalformedURLException;
@@ -39,9 +41,6 @@ import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.consensys.linea.config.LineaNodeType;

View File

@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
import net.consensys.linea.bundles.BundlePoolService;
import net.consensys.linea.bundles.LineaLimitedBundlePool;
import net.consensys.linea.bundles.TransactionBundle;

View File

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import java.time.Instant;
import java.util.List;
import java.util.Optional;
import net.consensys.linea.bundles.TransactionBundle;
import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.datatypes.Wei;

View File

@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import net.consensys.linea.bundles.TransactionBundle;
import net.consensys.linea.sequencer.txselection.selectors.MaxBundleGasPerBlockTransactionSelector.BundleGasTracker;
import org.apache.tuweni.bytes.Bytes32;

View File

@@ -23,7 +23,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.Optional;
import net.consensys.linea.config.LineaProfitabilityCliOptions;
import net.consensys.linea.config.LineaProfitabilityConfiguration;
import net.consensys.linea.config.LineaTransactionSelectorCliOptions;

View File

@@ -27,7 +27,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
import net.consensys.linea.config.LineaTracerConfiguration;
import net.consensys.linea.config.LineaTransactionSelectorConfiguration;
import net.consensys.linea.plugins.config.LineaL1L2BridgeSharedConfiguration;

View File

@@ -21,7 +21,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import org.hyperledger.besu.util.Subscribers;

View File

@@ -125,6 +125,7 @@ allprojects {
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
googleJavaFormat(libs.versions.googleJavaFormat.get())
}
}
}

View File

@@ -51,4 +51,5 @@ vertx = "4.5.14"
web3j = "4.12.2"
# Other
googleJavaFormat = "1.27.0"
dependencyLicenseReport = "2.9"

View File

@@ -1,16 +1,14 @@
package linea.blob;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import org.junit.jupiter.api.Test;
public class CompressorJavaAccessTest {
@Test
public void shouldBeJavaCallerFriendly() {
var compressor = GoBackedBlobCompressor.getInstance(
BlobCompressorVersion.V1_2,
102400);
var compressor = GoBackedBlobCompressor.getInstance(BlobCompressorVersion.V1_2, 102400);
var compressedSize = compressor.compressedSize(new byte[1000]);
assertThat(compressedSize).isBetween(0, 1000);

View File

@@ -6,8 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ManualLoadTest {
private final static Logger logger = LoggerFactory.getLogger(ManualLoadTest.class);
private static final Logger logger = LoggerFactory.getLogger(ManualLoadTest.class);
/**
* Call main method by passing arguments like '-ft 2 -nbTx 2'
@@ -20,25 +19,25 @@ public class ManualLoadTest {
var options = getOptions();
var parser = new DefaultParser();
try {
// parse the command line arguments
CommandLine cmd = parser.parse(options, args);
try {
// parse the command line arguments
CommandLine cmd = parser.parse(options, args);
if (cmd.hasOption("help")) {
String header = "Tools to generate load on an ethereum network.";
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("LoadTesting", header, options, "", true);
return;
}
if (cmd.hasOption("request")) {
TestExecutor testExecutor = new TestExecutor(cmd.getOptionValue("request"), cmd.getOptionValue("pk"));
testExecutor.test();
}
} catch (ParseException e) {
logger.info("Failed to parse command line properties." + e);
if (cmd.hasOption("help")) {
String header = "Tools to generate load on an ethereum network.";
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("LoadTesting", header, options, "", true);
return;
}
if (cmd.hasOption("request")) {
TestExecutor testExecutor =
new TestExecutor(cmd.getOptionValue("request"), cmd.getOptionValue("pk"));
testExecutor.test();
}
} catch (ParseException e) {
logger.info("Failed to parse command line properties." + e);
}
}
private static Options getOptions() {
@@ -50,5 +49,4 @@ public class ManualLoadTest {
return options;
}
}

Some files were not shown because too many files have changed in this diff Show More