staterecovery: fix cli options regression

Consensys · Jan 16, 2025 · 75b164e · 75b164e
1 parent aeb8685
commit 75b164e
Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/docker/config/zkbesu-shomei/log4j-staterecovery.xml b/docker/config/zkbesu-shomei/log4j-staterecovery.xml
@@ -37,7 +37,7 @@
     <Logger name="linea.staterecover" level="INFO" additivity="false">
       <AppenderRef ref="Console"/>
     </Logger>
-    <Logger name="linea.staterecover.clients.ExecutionLayerInProcessClient" level="TRACE" additivity="false">
+    <Logger name="linea.staterecover.clients.ExecutionLayerInProcessClient" level="DEBUG" additivity="false">
       <AppenderRef ref="Console"/>
     </Logger>
     <Logger name="linea.plugin.staterecover.clients.l1" level="DEBUG" additivity="false">

diff --git a/...-recover/besu-plugin/src/main/kotlin/linea/staterecover/plugin/LineaStateRecoverPlugin.kt b/...-recover/besu-plugin/src/main/kotlin/linea/staterecover/plugin/LineaStateRecoverPlugin.kt
@@ -41,7 +41,7 @@ open class LineaStateRecoverPlugin : BesuPlugin {
     this.serviceManager = serviceManager
     serviceManager
       .getServiceOrThrow(PicoCLIOptions::class.java)
-      .addPicoCLIOptions(PluginCliOptions.cliOptionsPrefix, cliOptions)
+      .addPicoCLIOptions(PluginCliOptions.cliPluginPrefixName, cliOptions)
     log.debug("registered")
   }
 

diff --git a/state-recover/besu-plugin/src/main/kotlin/linea/staterecover/plugin/PluginOptions.kt b/state-recover/besu-plugin/src/main/kotlin/linea/staterecover/plugin/PluginOptions.kt
@@ -23,7 +23,8 @@ data class PluginConfig(
 
 class PluginCliOptions {
   companion object {
-    const val cliOptionsPrefix = "plugin-staterecovery"
+    const val cliPluginPrefixName = "staterecovery"
+    private const val cliOptionsPrefix = "plugin-$cliPluginPrefixName"
   }
 
   @CommandLine.Option(

diff --git a/...cases/src/integrationTest/kotlin/linea/staterecover/LineaSubmissionEventsClientIntTest.kt b/...cases/src/integrationTest/kotlin/linea/staterecover/LineaSubmissionEventsClientIntTest.kt
@@ -10,12 +10,11 @@ import linea.web3j.Web3JLogsSearcher
 import net.consensys.linea.BlockParameter
 import net.consensys.linea.testing.submission.AggregationAndBlobs
 import net.consensys.linea.testing.submission.loadBlobsAndAggregationsSortedAndGrouped
-import net.consensys.linea.testing.submission.submitBlobsAndAggregations
+import net.consensys.linea.testing.submission.submitBlobsAndAggregationsAndWaitExecution
 import net.consensys.zkevm.coordinator.clients.smartcontract.LineaRollupSmartContractClient
 import net.consensys.zkevm.domain.Aggregation
 import net.consensys.zkevm.ethereum.ContractsManager
 import net.consensys.zkevm.ethereum.Web3jClientManager
-import net.consensys.zkevm.ethereum.waitForTxReceipt
 import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.LogManager
 import org.assertj.core.api.Assertions.assertThat
@@ -87,16 +86,11 @@ class LineaSubmissionEventsClientIntTest {
   ) {
     setupTest(vertx)
 
-    val submissionTxHashes = submitBlobsAndAggregations(
+    submitBlobsAndAggregationsAndWaitExecution(
       contractClient = contractClient,
       aggregationsAndBlobs = aggregationsAndBlobs,
-      blobChunksSize = 6
-    )
-
-    // wait for all finalizations Txs to be mined
-    Web3jClientManager.l1Client.waitForTxReceipt(
-      txHash = submissionTxHashes.aggregationTxHashes.last(),
-      timeout = 2.minutes
+      blobChunksSize = 6,
+      l1Web3jClient = Web3jClientManager.l1Client
     )
 
     val expectedSubmissionEventsToFind: List<Pair<DataFinalizedV3, List<DataSubmittedV3>>> =