Fixed a bug. Trying to make partitions heal

Author: AFNowakowski

simulator/src/main/java/byzzbench/simulator/Client.java

@@ -45,7 +45,7 @@ public class Client implements Serializable, Node {
     /**
      * The maximum number of requests that can be sent by the client.
      */
-    private final long maxRequests = 3;
+    private final long maxRequests = 10;
 
     /**
      * The replies received by the client.

simulator/src/main/java/byzzbench/simulator/faults/factories/ByzzFuzzScenarioFaultFactory.java

@@ -40,15 +40,15 @@ public List<Fault> generateFaults(FaultContext input) {
 
         // Create network faults
         for (int i = 1; i <= d; i++) {
-            int round = rand.nextInt(r) + 1;
+            int round = rand.nextInt(0, r + 1);
             Set<String> partition = SetSubsets.getRandomNonEmptySubset(replicaIds);
             Fault networkFault = new ByzzFuzzNetworkFault(partition, round);
             faults.add(networkFault);
         }
 
         // Create process faults
         for (int i = 1; i <= c; i++) {
-            int round = rand.nextInt(r) + 1;
+            int round = rand.nextInt(0, r + 1);
             String sender = replicaIds.stream().skip(rand.nextInt(replicaIds.size())).findFirst().orElseThrow();
             Set<String> recipientIds = SetSubsets.getRandomNonEmptySubset(replicaIds);
 

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/MessageLog.java

@@ -42,10 +42,22 @@ public class MessageLog {
 
     /**
      * Adds a message to the message log, maintaining the appropriate mappings.
+     *
+     * @param voteMessage the message to add
+     * @return true if the message was added successfully (not seen before), false otherwise
      */
     public boolean addMessage(GenericMessage voteMessage) {
-        // Add the message to the author's set
-        receivedMessages.computeIfAbsent(voteMessage.getAuthor(), k -> new TreeSet<>()).add(voteMessage);
+        // Get the set of received messages for the author
+        SortedSet<GenericMessage> authorMessages = receivedMessages
+                .computeIfAbsent(voteMessage.getAuthor(), k -> new TreeSet<>());
+
+        // Check if the message already exists
+        boolean isNewMessage = authorMessages.add(voteMessage);
+
+        if (!isNewMessage) {
+            // Message already exists, return false
+            return false;
+        }
 
         // Process the message based on its type
         Block block = voteMessage.getBlock() == null ? NULL_BLOCK : voteMessage.getBlock();
@@ -68,7 +80,7 @@ public boolean addMessage(GenericMessage voteMessage) {
             }
         }
 
-        return true;
+        return true; // Successfully added a new message
     }
 
     /**

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/TendermintReplica.java

@@ -488,7 +488,7 @@ private void broadcastGossipPrevote(PrevoteMessage prevoteMessage) {
     private void broadcastPrevote(long height, long round, Block block) {
 //        messageLog.sentPrevote();
         PrevoteMessage prevoteMessage = new PrevoteMessage(height, round, this.getId(), block);
-        broadcastMessage(prevoteMessage);
+        broadcastMessageIncludingSelf(prevoteMessage);
     }
 
     private void onTimeoutPrevote(long height, long round) {
@@ -609,7 +609,7 @@ private void broadcastGossipPrecommit(PrecommitMessage precommitMessage) {
 
     protected void broadcastPrecommit(long height, long round, Block block) {
         PrecommitMessage precommitMessage = new PrecommitMessage(height, round, this.getId(), block);
-        broadcastMessage(precommitMessage);
+        broadcastMessageIncludingSelf(precommitMessage);
     }
 
     private void onTimeoutPrecommit(long height, long round) {

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/TendermintScenarioExecutor.java

@@ -61,6 +61,6 @@ public Replica cloneReplica(Replica replica) {
 
     @Override
     public int maxFaultyReplicas(int n) {
-        return (n - 1) / 3;
+        return 1;
     }
 }

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/message/GossipMessage.java

@@ -1,14 +1,15 @@
 package byzzbench.simulator.protocols.tendermint.message;
 
 import byzzbench.simulator.transport.MessagePayload;
+import byzzbench.simulator.transport.messages.MessageWithRound;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.With;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class GossipMessage extends MessagePayload {
+public class GossipMessage extends MessagePayload implements MessageWithRound {
     private final String replicaId;
     private final GenericMessage gossipMessage;
 
@@ -17,4 +18,9 @@ public class GossipMessage extends MessagePayload {
     public String getType() {
         return "GOSSIP " + gossipMessage.getType();
     }
+
+    @Override
+    public long getRound() {
+        return gossipMessage.getRound();
+    }
 }

simulator/src/main/java/byzzbench/simulator/transport/Transport.java

@@ -266,7 +266,7 @@ public synchronized void deliverEvent(long eventId) throws Exception {
             }
         }
 
-        log.info("Delivered " + e);
+//        log.info("Delivered " + e);
     }
 
     /**