Use required plugins in ATs to not register tracer plugins (#91)

Signed-off-by: Fabio Di Fabio <[email protected]>
Consensys · Oct 3, 2024 · fcd99a4 · fcd99a4
1 parent 624b99d
commit fcd99a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/BlockGasLimitTest.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/BlockGasLimitTest.java
@@ -41,8 +41,7 @@ public List<String> getTestCliOptions() {
   @Override
   @BeforeEach
   public void setup() throws Exception {
-    minerNode = besu.createMinerNodeWithExtraCliOptions("miner1", getTestCliOptions());
-    cluster.start(minerNode);
+    super.setup();
     minerNode.execute(minerTransactions.minerStop());
   }
 

diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java
@@ -121,7 +121,14 @@ private BesuNode createCliqueNodeWithExtraCliOptionsAndRpcApis(
             .jsonRpcTxPool()
             .genesisConfigProvider(
                 validators -> Optional.of(provideGenesisConfig(validators, cliqueOptions)))
-            .extraCLIOptions(extraCliOptions);
+            .extraCLIOptions(extraCliOptions)
+            .requestedPlugins(
+                List.of(
+                    "LineaExtraDataPlugin",
+                    "LineaEstimateGasEndpointPlugin",
+                    "LineaSetExtraDataEndpointPlugin",
+                    "LineaTransactionPoolValidatorPlugin",
+                    "LineaTransactionSelectorPlugin"));
 
     return besu.create(nodeConfBuilder.build());
   }

diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/TestCommandLineOptionsBuilder.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/TestCommandLineOptionsBuilder.java
@@ -40,13 +40,6 @@ public TestCommandLineOptionsBuilder() {
     cliOptions.setProperty(
         "--plugin-linea-l1l2-bridge-contract=", "0x00000000000000000000000000000000DEADBEEF");
     cliOptions.setProperty("--plugin-linea-l1l2-bridge-topic=", "0x123456");
-    // temporarily specify tracer mandatory options, until we improve the ATs to accept a list of
-    // enabled plugins
-    cliOptions.setProperty("--plugin-linea-conflated-trace-generation-traces-output-path=", ".");
-    cliOptions.setProperty("--plugin-linea-rpc-concurrent-requests-limit=", "1");
-    cliOptions.setProperty("--plugin-linea-tracer-readiness-server-port=", "1234");
-    cliOptions.setProperty("--plugin-linea-tracer-readiness-server-host=", "localhost");
-    cliOptions.setProperty("--plugin-linea-tracer-readiness-max-blocks-behind=", "1");
   }
 
   public TestCommandLineOptionsBuilder set(String option, String value) {