Merge branch 'hBFT' of https://github.com/joaomlneto/byzzbench into hBFT

Author: Biatbe13

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

@@ -314,7 +314,7 @@ public synchronized void deliverEvent(long eventId) throws Exception {
 
         // if it is a MessageEvent and there is no connectivity between the nodes, drop it
         if (e instanceof MessageEvent m && !router.haveConnectivity(m.getSenderId(), m.getRecipientId())) {
-            log.info("Dropped: " + m.getSenderId() + "->" + m.getRecipientId() + ": " + m.getPayload());
+            ////log.info("Dropped: " + m.getSenderId() + "->" + m.getRecipientId() + ": " + m.getPayload());
             m.setStatus(Event.Status.DROPPED);
             return;
         }
@@ -341,7 +341,7 @@ public synchronized void deliverEvent(long eventId) throws Exception {
             }
         }
 
-        log.info("Delivered " + e);
+        //log.info("Delivered " + e);
     }
 
     /**
@@ -361,7 +361,7 @@ public synchronized void dropEvent(long eventId) {
         }
         e.setStatus(Event.Status.DROPPED);
         this.observers.forEach(o -> o.onEventDropped(e));
-        log.info("Dropped: " + e);
+        //log.info("Dropped: " + e);
     }
 
     /**
@@ -432,7 +432,7 @@ public synchronized void applyMutation(long eventId, Fault fault) {
         this.scenario.getSchedule().appendEvent(mutateMessageEvent);
         this.observers.forEach(o -> o.onMessageMutation(mutateMessageEvent.getPayload()));
 
-        log.info("Mutated: " + m);
+        //log.info("Mutated: " + m);
     }
 
     public synchronized void applyFault(String faultId) {
@@ -485,7 +485,7 @@ public synchronized long setTimeout(Node node, Runnable runnable,
                 .build();
         this.appendEvent(timeoutEvent);
         this.observers.forEach(o -> o.onTimeout(timeoutEvent));
-        log.info("Timeout set for " + node.getId() + " in " + timeout + "ms: " + timeoutEvent);
+        //log.info("Timeout set for " + node.getId() + " in " + timeout + "ms: " + timeoutEvent);
         return timeoutEvent.getEventId();
     }
 
@@ -503,8 +503,8 @@ public synchronized long setTimeout(Replica replica, Runnable runnable,
         this.observers.forEach(o -> o.onTimeout(timeoutEvent));
 
 
-        log.info(description + " timeout set for " + replica.getId() + " in " +
-                timeout + "ms: " + timeoutEvent);
+        //log.info(description + " timeout set for " + replica.getId() + " in " +
+                //timeout + "ms: " + timeoutEvent);
         return timeoutEvent.getEventId();
     }
 
@@ -523,8 +523,8 @@ public synchronized long setClientTimeout(String clientId, Runnable runnable,
         this.observers.forEach(o -> o.onTimeout(timeoutEvent));
 
 
-        log.info("Timeout set for " + clientId + " in " +
-                timeout + "ms: " + timeoutEvent);
+        //log.info("Timeout set for " + clientId + " in " +
+                //timeout + "ms: " + timeoutEvent);
         return timeoutEvent.getEventId();
     }
 

simulator/src/main/resources/application.yml

@@ -23,7 +23,7 @@ byzzbench:
 
   scheduler:
     id: "byzzfuzz" # The ID of the scheduler to use
-    executionMode: async # async (default, any message delivered) or sync (communication-closure hypothesis, FIFO)
+    executionMode: sync # async (default, any message delivered) or sync (communication-closure hypothesis, FIFO)
     maxDropMessages: 0 # Maximum number of messages to drop per scenario
     maxMutateMessages: 0 # Maximum number of messages to mutate per scenario
     deliverTimeoutWeight: 1 # The weight for scheduler to trigger a timeout
@@ -35,7 +35,7 @@ byzzbench:
       # ByzzFuzz
       numRoundsWithProcessFaults: 1
       numRoundsWithNetworkFaults: 1
-      numRoundsWithFaults: 8
+      numRoundsWithFaults: 2
       # Twins
       numReplicas: 1
       numTwinsPerReplica: 2
@@ -47,6 +47,6 @@ byzzbench:
     scheduledFaults:
       factories: [ ]
     termination: # Success condition for the scenario - terminates it when all conditions are met
-      minEvents: 500 # check if N events have been scheduled. If so, can terminate
-      minRounds: 8 # check if N rounds have elapsed. If so, can terminate
+      minEvents: 100 # check if N events have been scheduled. If so, can terminate
+      minRounds: 2 # check if N rounds have elapsed. If so, can terminate
       samplingFrequency: 30 # check if should terminate every N scheduler decisions