Merge remote-tracking branch 'origin/main' into hBFT-reproducing-known-violation

Author: Biatbe13

simulator/src/main/java/byzzbench/simulator/controller/SimulatorController.java

@@ -537,6 +537,11 @@ public SortedSet<String> getAutomaticFaults() {
                 .collect(Collectors.toCollection(TreeSet::new));
     }
 
+    @DeleteMapping("/automatic-faults")
+    public void deleteAutomaticFaults() {
+        simulatorService.getScenario().getTransport().getAutomaticFaults().clear();
+    }
+
     @GetMapping("/enabled-network-faults")
     public SortedSet<String> getEnabledNetworkFaults() {
         return simulatorService

simulator/src/main/java/byzzbench/simulator/protocols/pbft_java/PbftJavaReplica.java

@@ -561,7 +561,8 @@ public void recvCheckpoint(CheckpointMessage checkpoint) {
      */
     public void sendCheckpoint(CheckpointMessage checkpoint) {
         // PBFT 4.3 - Multicast checkpoint
-        this.broadcastMessage(checkpoint);
+        // FIXME: not implemented
+        //this.broadcastMessage(checkpoint);
     }
 
     /**

webui/components/Schedule/ScheduleMenu.tsx

@@ -1,8 +1,7 @@
 import {
   changeScenario,
+  deleteAutomaticFaults,
   deliverMessage,
-  enableNetworkFault,
-  GenericFaultEvent,
   getEvent,
   mutateMessage,
   MutateMessageEvent,
@@ -35,6 +34,10 @@ export const ScheduleMenu = ({ title, schedule }: ScheduleMenuProps) => {
           onClick={async () => {
             console.log("Materializing Schedule: ", schedule);
             await changeScenario({ scenarioId: schedule.scenarioId }, {});
+            // remove all pre-scheduled faults.
+            // we are going to replay event-by-event.
+            await deleteAutomaticFaults();
+
             let i = 0;
             let hasNotifiedMismatchedEvents = false;
 
@@ -85,9 +88,10 @@ export const ScheduleMenu = ({ title, schedule }: ScheduleMenuProps) => {
                   );
                   break;
                 case "GenericFault":
-                  await enableNetworkFault(
+                  // Ignore these: messages that were dropped are already dropped anyways
+                  /*await enableNetworkFault(
                     (event as GenericFaultEvent).payload!.id!,
-                  );
+                  );*/
                   break;
                 default:
                   console.error("Unknown event type", event);