Spearated integrity from agreement.

Author: Biatbe13

simulator/src/main/java/byzzbench/simulator/BaseScenario.java

@@ -9,6 +9,7 @@
 import byzzbench.simulator.schedule.Schedule;
 import byzzbench.simulator.scheduler.Scheduler;
 import byzzbench.simulator.state.AgreementPredicate;
+import byzzbench.simulator.state.IntegrityPredicate;
 import byzzbench.simulator.state.LivenessPredicate;
 import byzzbench.simulator.state.adob.AdobDistributedState;
 import byzzbench.simulator.transport.Transport;
@@ -55,7 +56,7 @@ public abstract class BaseScenario implements Scenario {
     /**
      * The invariants that must be satisfied by the scenario at all times.
      */
-    private final List<ScenarioPredicate> invariants = List.of(new AgreementPredicate(), new LivenessPredicate());
+    private final List<ScenarioPredicate> invariants = List.of(new AgreementPredicate(), new IntegrityPredicate(), new LivenessPredicate());
     /**
      * The schedule of events in order of delivery.
      */

simulator/src/main/java/byzzbench/simulator/state/AgreementPredicate.java

@@ -4,7 +4,6 @@
 import byzzbench.simulator.Scenario;
 import byzzbench.simulator.ScenarioPredicate;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -31,22 +30,6 @@ public boolean test(Scenario scenarioExecutor) {
                 .max(Long::compareTo)
                 .orElse(0L);
 
-        // check for duplicate entries in each replica's commit log
-        for (Replica replica : replicas) {
-            CommitLog commitLog = replica.getCommitLog();
-            for (int i = 0; i < commitLog.getLength(); i++) {
-                for (int j = i + 1; j < commitLog.getLength(); j++) {
-                    if (commitLog.get(i) == null || commitLog.get(j) == null) {
-                        continue;
-                    }
-                    if (commitLog.get(i).equals(commitLog.get(j))) {
-                        System.out.println("Replica " + replica.getId() + " has duplicate entries at indices " + i + " and " + j);
-                        return false; 
-                    }
-                }
-            }
-        }
-
         // check if the Nth entry in the commit log of each replica is the same
         for (long i = lowestSequenceNumber; i <= highestSequenceNumber; i++) {
             final long index = i;

simulator/src/main/java/byzzbench/simulator/state/IntegrityPredicate.java

@@ -0,0 +1,41 @@
+package byzzbench.simulator.state;
+
+import byzzbench.simulator.Replica;
+import byzzbench.simulator.Scenario;
+import byzzbench.simulator.ScenarioPredicate;
+
+import java.util.Collection;
+
+public class IntegrityPredicate implements ScenarioPredicate {
+    @Override
+    public String getId() {
+        return "Integrity";
+    }
+
+    @Override
+    public boolean test(Scenario scenarioExecutor) {
+        Collection<Replica> replicas = scenarioExecutor.getReplicas().values().stream()
+                .filter(node -> !scenarioExecutor.isFaultyReplica(node.getId()))
+                .toList();
+
+
+        // check for duplicate entries in each replica's commit log
+        for (Replica replica : replicas) {
+            CommitLog commitLog = replica.getCommitLog();
+            for (int i = 0; i < commitLog.getLength(); i++) {
+                for (int j = i + 1; j < commitLog.getLength(); j++) {
+                    if (commitLog.get(i) == null || commitLog.get(j) == null) {
+                        continue;
+                    }
+                    if (commitLog.get(i).equals(commitLog.get(j))) {
+                        System.out.println("IntegrityPredicate: Duplicate vote!");
+                        System.out.println("Replica " + replica.getId() + " has duplicate entries at indices " + i + " and " + j);
+                        return false; 
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+}

simulator/src/main/resources/application.yml

@@ -16,7 +16,7 @@ springdoc:
 
 # ByzzBench configuration
 byzzbench:
-  autostart: true # Whether to start running scenarios automatically on startup
+  autostart: false # Whether to start running scenarios automatically on startup
   numScenarios: 4000
   #outputPath: /tmp/byzzbench # The path to write the output to
   outputSchedules: buggy # which schedules to write to file? one of 'all', 'buggy' or 'none'