Remove deprecated tx-pool-future-max-by-account option (#5361)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
pull/4427/head
Fabio Di Fabio 2 years ago committed by GitHub
parent 560c5489bf
commit 40da7a9aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 20
      besu/src/main/java/org/hyperledger/besu/cli/options/unstable/TransactionPoolOptions.java

@ -5,6 +5,7 @@
### Breaking Changes
- Remove IBFT 1.0 feature (deprecated in 23.1.0-beta) [#5302](https://github.com/hyperledger/besu/pull/5302)
- Remove GoQuorum-compatible privacy feature (deprecated in 23.1.0-beta) [#5303](https://github.com/hyperledger/besu/pull/5303)
- Remove deprecated `tx-pool-future-max-by-account` option, see instead: `tx-pool-limit-by-account-percentage` [#5361](https://github.com/hyperledger/besu/pull/5361)
### Additions and Improvements
- Update most dependencies to latest version [#5269](https://github.com/hyperledger/besu/pull/5269)

@ -14,9 +14,6 @@
*/
package org.hyperledger.besu.cli.options.unstable;
import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
import org.hyperledger.besu.Besu;
import org.hyperledger.besu.cli.converter.FractionConverter;
import org.hyperledger.besu.cli.options.CLIOptions;
import org.hyperledger.besu.cli.options.OptionParser;
@ -27,15 +24,11 @@ import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine;
/** The Transaction pool Cli options. */
public class TransactionPoolOptions
implements CLIOptions<ImmutableTransactionPoolConfiguration.Builder> {
private static final Logger LOG = LoggerFactory.getLogger(Besu.class);
private static final String TX_MESSAGE_KEEP_ALIVE_SEC_FLAG =
"--Xincoming-tx-messages-keep-alive-seconds";
@ -87,13 +80,6 @@ public class TransactionPoolOptions
private Float txPoolLimitByAccountPercentage =
TransactionPoolConfiguration.LIMIT_TXPOOL_BY_ACCOUNT_PERCENTAGE;
@CommandLine.Option(
hidden = true,
names = {"--tx-pool-future-max-by-account"},
description = "Deprecated parameter, see instead: --tx-pool-limit-by-account-percentage")
@SuppressWarnings({"FieldCanBeFinal", "UnusedVariable"})
private Integer maxFutureTransactionsByAccount = -1;
private TransactionPoolOptions() {}
/**
@ -123,12 +109,6 @@ public class TransactionPoolOptions
@Override
public ImmutableTransactionPoolConfiguration.Builder toDomainObject() {
if (maxFutureTransactionsByAccount > 0) {
LOG.warn(
DEPRECATION_WARNING_MSG,
"--tx-pool-future-max-by-account",
"--tx-pool-limit-by-account-percentage");
}
return ImmutableTransactionPoolConfiguration.builder()
.strictTransactionReplayProtectionEnabled(strictTxReplayProtectionEnabled)
.txMessageKeepAliveSeconds(txMessageKeepAliveSeconds)

Loading…
Cancel
Save