From 0fe75ca5807f7638c2ba4da62d92375fa9db35f6 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 14 Oct 2024 15:09:30 +1000 Subject: [PATCH] log plugin name at registration; remove override of getName() method Signed-off-by: Sally MacFarlane --- .../net/consensys/linea/AbstractLineaRequiredPlugin.java | 5 ++++- .../consensys/linea/extradata/LineaExtraDataPlugin.java | 8 -------- .../LineaTransactionPoolValidatorPlugin.java | 6 ------ .../txselection/LineaTransactionSelectorPlugin.java | 6 ------ 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java b/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java index 5f4f1d6b..26423735 100644 --- a/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java @@ -36,7 +36,10 @@ public abstract class AbstractLineaRequiredPlugin extends AbstractLineaPrivateOp public void register(final BesuContext context) { super.register(context); try { - log.info("Registering Linea plugin {}", this.getClass().getName()); + log.info( + "Registering Linea plugin of type {} with name {}", + this.getClass().getName(), + this.getName()); blockchainService = context diff --git a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java index ed100ec3..d87317f9 100644 --- a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java @@ -15,8 +15,6 @@ package net.consensys.linea.extradata; -import java.util.Optional; - import com.google.auto.service.AutoService; import lombok.extern.slf4j.Slf4j; import net.consensys.linea.AbstractLineaRequiredPlugin; @@ -29,15 +27,9 @@ @Slf4j @AutoService(BesuPlugin.class) public class LineaExtraDataPlugin extends AbstractLineaRequiredPlugin { - public static final String NAME = "linea"; private BesuContext besuContext; private RpcEndpointService rpcEndpointService; - @Override - public Optional getName() { - return Optional.of(NAME); - } - @Override public void doRegister(final BesuContext context) { besuContext = context; diff --git a/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java b/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java index 98c45653..410e83e9 100644 --- a/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java @@ -46,17 +46,11 @@ @Slf4j @AutoService(BesuPlugin.class) public class LineaTransactionPoolValidatorPlugin extends AbstractLineaRequiredPlugin { - public static final String NAME = "linea"; private BesuConfiguration besuConfiguration; private TransactionPoolValidatorService transactionPoolValidatorService; private TransactionSimulationService transactionSimulationService; private Optional rejectedTxJsonRpcManager = Optional.empty(); - @Override - public Optional getName() { - return Optional.of(NAME); - } - @Override public void doRegister(final BesuContext context) { besuConfiguration = diff --git a/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java b/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java index a84754e7..69b60e97 100644 --- a/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java @@ -38,16 +38,10 @@ @Slf4j @AutoService(BesuPlugin.class) public class LineaTransactionSelectorPlugin extends AbstractLineaRequiredPlugin { - public static final String NAME = "linea"; private TransactionSelectionService transactionSelectionService; private Optional rejectedTxJsonRpcManager = Optional.empty(); private BesuConfiguration besuConfiguration; - @Override - public Optional getName() { - return Optional.of(NAME); - } - @Override public void doRegister(final BesuContext context) { transactionSelectionService =