fix conflicts

Author: joaomlneto

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

@@ -12,12 +12,10 @@
 /**
  * Represents a client in the system. Each client has a unique identifier.
  * The client is responsible for sending requests to the replicas in the system.
- *
- * @param <T> The type of the entries in the commit log of each {@link Replica}.
  */
 @Getter
 @RequiredArgsConstructor
-public class Client<T extends Serializable> implements Serializable {
+public class Client implements Serializable {
     /**
      * The unique ID of the client.
      */
@@ -27,7 +25,7 @@ public class Client<T extends Serializable> implements Serializable {
      * The transport layer for the client.
      */
     @JsonIgnore
-    private final transient Transport<T> transport;
+    private final transient Transport transport;
 
     private final long maxRequests = 1;
 

simulator/src/main/java/byzzbench/simulator/LeaderBasedProtocolReplica.java

@@ -4,20 +4,17 @@
 import byzzbench.simulator.transport.Transport;
 import lombok.Getter;
 
-import java.io.Serializable;
-import java.util.Set;
+import java.util.SortedSet;
 
 /**
  * Abstract class for a replica that is part of a leader-based protocol.
- *
- * @param <T> The type of the entries in the commit log.
  */
 @Getter
-public abstract class LeaderBasedProtocolReplica<T extends Serializable> extends Replica<T> {
+public abstract class LeaderBasedProtocolReplica extends Replica {
     private long viewNumber = -1;
     private String leaderId;
 
-    protected LeaderBasedProtocolReplica(String nodeId, Set<String> nodeIds, Transport<T> transport, CommitLog<T> commitLog) {
+    protected LeaderBasedProtocolReplica(String nodeId, SortedSet<String> nodeIds, Transport transport, CommitLog commitLog) {
         super(nodeId, nodeIds, transport, commitLog);
     }
 

simulator/src/main/java/byzzbench/simulator/Replica.java

@@ -1,6 +1,7 @@
 package byzzbench.simulator;
 
 import byzzbench.simulator.state.CommitLog;
+import byzzbench.simulator.state.LogEntry;
 import byzzbench.simulator.transport.MessagePayload;
 import byzzbench.simulator.transport.Transport;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -12,20 +13,18 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
-import java.util.Set;
+import java.util.SortedSet;
 
 /**
  * Superclass for all replicas in the system.
  * <p>
  * Each replica has a unique node ID, a set of known node IDs in the system, a
  * reference to the {@link Transport} layer, and a {@link CommitLog}.
- *
- * @param <T> The type of the entries in the commit log of each {@link Replica}.
  */
 @Log
 @Getter
 @ToString
-public abstract class Replica<T extends Serializable> implements Serializable {
+public abstract class Replica implements Serializable {
     /**
      * The message digest algorithm to use for hashing messages.
      */
@@ -44,7 +43,7 @@ public abstract class Replica<T extends Serializable> implements Serializable {
      * The commit log for this replica.
      */
     @Getter
-    private final transient CommitLog<T> commitLog;
+    private final transient CommitLog commitLog;
 
     /**
      * The unique ID of the replica.
@@ -55,13 +54,13 @@ public abstract class Replica<T extends Serializable> implements Serializable {
      * The set of known node IDs in the system (excludes client IDs).
      */
     @JsonIgnore
-    private final transient Set<String> nodeIds;
+    private final transient SortedSet<String> nodeIds;
 
     /**
      * The transport layer for this replica.
      */
     @JsonIgnore
-    private final transient Transport<T> transport;
+    private final transient Transport transport;
 
     /**
      * The observers of this replica.
@@ -77,8 +76,8 @@ public abstract class Replica<T extends Serializable> implements Serializable {
      * @param transport the transport layer
      * @param commitLog the commit log
      */
-    protected Replica(String nodeId, Set<String> nodeIds, Transport<T> transport,
-                      CommitLog<T> commitLog) {
+    protected Replica(String nodeId, SortedSet<String> nodeIds, Transport transport,
+                      CommitLog commitLog) {
         this.nodeId = nodeId;
         this.nodeIds = nodeIds;
         this.transport = transport;
@@ -104,7 +103,7 @@ protected void sendMessage(MessagePayload message, String recipient) {
      * @param recipients the recipients of the message
      */
     protected void multicastMessage(MessagePayload message,
-                                    Set<String> recipients) {
+                                    SortedSet<String> recipients) {
         message.sign(this.nodeId);
         this.transport.multicast(this.nodeId, recipients, message);
 
@@ -116,9 +115,9 @@ protected void multicastMessage(MessagePayload message,
      * @param message the message to broadcast
      */
     protected void broadcastMessage(MessagePayload message) {
-        Set<String> otherNodes = this.nodeIds.stream()
+        SortedSet<String> otherNodes = this.nodeIds.stream()
                 .filter(otherNodeId -> !otherNodeId.equals(this.nodeId))
-                .collect(java.util.stream.Collectors.toSet());
+                .collect(java.util.stream.Collectors.toCollection(java.util.TreeSet::new));
 
             message.sign(this.nodeId);
             this.transport.multicast(this.nodeId, otherNodes, message);
@@ -184,7 +183,7 @@ public abstract void handleMessage(String sender, MessagePayload message)
      *
      * @param operation the operation to commit
      */
-    public void commitOperation(T operation) {
+    public void commitOperation(LogEntry operation) {
         this.commitLog.add(operation);
         this.notifyObserversLocalCommit(operation);
     }

simulator/src/main/java/byzzbench/simulator/ScenarioExecutor.java

@@ -8,34 +8,35 @@
 import byzzbench.simulator.state.LivenessPredicate;
 import byzzbench.simulator.state.adob.AdobDistributedState;
 import byzzbench.simulator.transport.Transport;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.extern.java.Log;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 /**
  * Abstract class for running a scenario, which consists of a set of {@link
  * Replica} and a {@link Transport} layer.
- *
- * @param <T> The type of the entries in the commit log of each {@link Replica}.
  */
 @Getter
 @ToString
-public abstract class ScenarioExecutor<T extends Serializable> {
+@Log
+public abstract class ScenarioExecutor {
     /**
      * The transport layer for the scenario.
      */
     @ToString.Exclude
-    protected final Transport<T> transport;
+    protected final Transport transport;
     /**
      * The scheduler for the scenario.
      */
-    protected final BaseScheduler<T> scheduler;
+    protected final BaseScheduler scheduler;
     /**
      * The AdoB oracle for the scenario, which keeps track of the distributed state.
      */
@@ -63,8 +64,8 @@ public abstract class ScenarioExecutor<T extends Serializable> {
      */
     protected ScenarioExecutor(String id, MessageMutatorService messageMutatorService, SchedulesService schedulesService) {
         this.id = id;
-        this.transport = new Transport<>(this, messageMutatorService, schedulesService);
-        this.scheduler = new RandomScheduler<>(messageMutatorService, transport);
+        this.transport = new Transport(this, schedulesService);
+        this.scheduler = new RandomScheduler(messageMutatorService, transport);
         this.setup();
 
         // AdoB must be initialized after the setup method is called
@@ -79,16 +80,15 @@ public void reset() {
         this.setupScenario();
         this.adobOracle.reset();
         this.runScenario();
-        System.out.println("Scenario reset");
-        System.out.println(this);
+        log.log(Level.INFO,"Scenario reset: %s", this.toString());
     }
 
     /**
      * Adds a node to the scenario.
      *
      * @param replica The node to add.
      */
-    public void addNode(Replica<T> replica) {
+    public void addNode(Replica replica) {
         this.transport.addNode(replica);
         replica.addObserver(this.adobOracle);
     }
@@ -102,6 +102,21 @@ public final void setupScenario() {
         this.setup();
     }
 
+    public final void loadParameters(JsonNode parameters) {
+        // get num clients
+        if (parameters.has("numClients")) {
+            this.numClients = parameters.get("numClients").asInt();
+        }
+
+        this.loadParameters(parameters);
+    }
+
+    /**
+     * Loads the parameters for the scenario from a JSON object.
+     * @param parameters The JSON object containing the parameters for the scenario.
+     */
+    public abstract void loadScenarioParameters(JsonNode parameters);
+
     /**
      * Logic to set up the scenario - must be implemented by subclasses.
      */

simulator/src/main/java/byzzbench/simulator/TerminationCondition.java

@@ -1,6 +1,11 @@
 package byzzbench.simulator;
 
 
-public abstract class TerminationCondition {
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import java.io.Serializable;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true)
+public abstract class TerminationCondition implements Serializable {
     public abstract boolean shouldTerminate();
 }