Test Clique mines a block only when txs are present, if create empty …

…blocks is false Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
hyperledger · Nov 22, 2023 · 3669fed · 3669fed
1 parent 1c18e7d
commit 3669fed
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 55 deletions.
diff --git a/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
@@ -379,7 +379,9 @@ public BesuNode createCliqueNode(final String name) throws IOException {
             .build());
   }
 
-  public BesuNode createCliqueNoEmptyBlockNode(final String name) throws IOException {
+  public BesuNode createCliqueNode(
+      final String name, final GenesisConfigurationFactory.CliqueOptions cliqueOptions)
+      throws IOException {
     return create(
         new BesuNodeConfigurationBuilder()
             .name(name)
@@ -388,7 +390,9 @@ public BesuNode createCliqueNoEmptyBlockNode(final String name) throws IOExcepti
             .webSocketConfiguration(node.createWebSocketEnabledConfig())
             .devMode(false)
             .genesisConfigProvider(
-                GenesisConfigurationFactory::createCliqueNoEmptyBlocksGenesisConfig)
+                validators ->
+                    GenesisConfigurationFactory.createCliqueGenesisConfig(
+                        validators, cliqueOptions))
             .build());
   }
 

diff --git a/...ger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/...ger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
@@ -46,16 +46,17 @@ private GenesisConfigurationFactory() {
 
   public static Optional<String> createCliqueGenesisConfig(
       final Collection<? extends RunnableNode> validators) {
-    final String template = readGenesisFile("/clique/clique.json");
-    return updateGenesisExtraData(
-        validators, template, CliqueExtraData::createGenesisExtraDataString);
+    return createCliqueGenesisConfig(validators, CliqueOptions.DEFAULT);
   }
 
-  public static Optional<String> createCliqueNoEmptyBlocksGenesisConfig(
-      final Collection<? extends RunnableNode> validators) {
-    final String template = readGenesisFile("/clique/clique-no-empty-blocks.json");
+  public static Optional<String> createCliqueGenesisConfig(
+      final Collection<? extends RunnableNode> validators, final CliqueOptions cliqueOptions) {
+    final String template = readGenesisFile("/clique/clique.json.tpl");
+
     return updateGenesisExtraData(
-        validators, template, CliqueExtraData::createGenesisExtraDataString);
+        validators,
+        updateGenesisCliqueOptions(template, cliqueOptions),
+        CliqueExtraData::createGenesisExtraDataString);
   }
 
   public static Optional<String> createIbft2GenesisConfig(
@@ -145,6 +146,14 @@ private static Optional<String> updateGenesisExtraData(
     return Optional.of(genesis);
   }
 
+  private static String updateGenesisCliqueOptions(
+      final String template, final CliqueOptions cliqueOptions) {
+    return template
+        .replace("%blockperiodseconds%", String.valueOf(cliqueOptions.blockPeriodSeconds))
+        .replace("%epochlength%", String.valueOf(cliqueOptions.epochLength))
+        .replace("%createemptyblocks%", String.valueOf(cliqueOptions.createEmptyBlocks));
+  }
+
   @SuppressWarnings("UnstableApiUsage")
   public static String readGenesisFile(final String filepath) {
     try {
@@ -154,4 +163,8 @@ public static String readGenesisFile(final String filepath) {
       throw new IllegalStateException("Unable to get test genesis config " + filepath);
     }
   }
+
+  public record CliqueOptions(int blockPeriodSeconds, int epochLength, boolean createEmptyBlocks) {
+    public static final CliqueOptions DEFAULT = new CliqueOptions(10, 30000, true);
+  }
 }
diff --git a/...rc/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java b/...rc/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java
@@ -17,6 +17,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory.CliqueOptions;
 
 import java.io.IOException;
 
@@ -44,12 +45,33 @@ public void shouldMineTransactionsOnSingleNode() throws IOException {
 
   @Test
   public void shouldNotMineBlocksIfNoTransactionsOnSingleNode() throws IOException {
-    final BesuNode minerNode = besu.createCliqueNoEmptyBlockNode("miner1");
+    final var cliqueOptionsNoEmptyBlocks =
+        new CliqueOptions(
+            CliqueOptions.DEFAULT.blockPeriodSeconds(), CliqueOptions.DEFAULT.epochLength(), false);
+    final BesuNode minerNode = besu.createCliqueNode("miner1", cliqueOptionsNoEmptyBlocks);
     cluster.start(minerNode);
 
     cluster.verify(clique.noNewBlockCreated(minerNode));
   }
 
+  @Test
+  public void shouldMineBlocksOnlyWhenTransactionsArePresentWhenCreateEmptyBlockIsFalse()
+      throws IOException {
+    final var cliqueOptionsNoEmptyBlocks =
+        new CliqueOptions(
+            CliqueOptions.DEFAULT.blockPeriodSeconds(), CliqueOptions.DEFAULT.epochLength(), false);
+    final BesuNode minerNode = besu.createCliqueNode("miner1", cliqueOptionsNoEmptyBlocks);
+    cluster.start(minerNode);
+
+    final Account sender = accounts.createAccount("account1");
+
+    cluster.verify(clique.noNewBlockCreated(minerNode));
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50));
+
+    minerNode.verify(clique.blockIsCreatedByProposer(minerNode));
+  }
+
   @Test
   public void shouldMineTransactionsOnMultipleNodes() throws IOException {
     final BesuNode minerNode1 = besu.createCliqueNode("miner1");

diff --git a/acceptance-tests/tests/src/test/resources/clique/clique.json b/acceptance-tests/tests/src/test/resources/clique/clique.json
diff --git a/...ources/clique/clique-no-empty-blocks.json → ...src/test/resources/clique/clique.json.tpl b/...ources/clique/clique-no-empty-blocks.json → ...src/test/resources/clique/clique.json.tpl
@@ -8,9 +8,9 @@
     "constantinopleBlock": 6,
     "petersburgBlock": 7,
     "clique": {
-      "blockperiodseconds": 10,
-      "epochlength": 30000,
-      "createemptyblocks": false
+      "blockperiodseconds": %blockperiodseconds%,
+      "epochlength": %epochlength%,
+      "createemptyblocks": %createemptyblocks%
     }
   },
   "nonce": "0x0",