Implementation

Author: adduta

simulator/src/main/java/byzzbench/simulator/protocols/fab2/FastByzantineReplica.java

@@ -691,7 +691,7 @@ private void handleViewChangeMessage(String sender, ViewChangeMessage viewChange
             this.viewNumber = proposalNumber;
             this.leaderId = viewChangeMessage.getNewLeaderId();
             this.setView(this.viewNumber, this.leaderId);
-            this.proposalNumber = 1;
+            this.proposalNumber++;
             this.clearAllTimeouts();
             messageLog.acceptViewChange(viewChangeMessage);
             this.isCurrentlyLeader = true;
@@ -742,7 +742,7 @@ private void handleNewViewChangeMessage(String sender, NewViewChangeMessage newV
             return;
         }
 
-        log.info("Replica " + getId() + " is moving to the next view number: view " + newViewMessage.getViewNumber());
+        log.info("Replica " + getId() + " is moving to the next view number: view " + newViewMessage.getProposalNumber());
         this.viewNumber = proposalNumber;
         this.leaderId = newViewMessage.getNewLeaderId();
         this.setView(this.viewNumber, newViewMessage.getNewLeaderId());
@@ -758,7 +758,7 @@ private void handleNewViewChangeMessage(String sender, NewViewChangeMessage newV
         this.learnerTimeoutId = -1;
         this.forwards = 0;
         this.viewChangeRequests = 0;
-        this.proposalNumber = 1;
+        this.proposalNumber++;
 
         if (isProposer()) proposerOnStart();
         if (isLearner()) learnerOnStart();

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

@@ -188,7 +188,7 @@ public boolean onAccept(String senderId, AcceptMessage acceptMessage, int thresh
         }
 
         // Remove message from the acceptMessages map
-        if (acceptMessages.containsKey(proposalNumber)) acceptMessages.get(proposalNumber).remove(acceptMessage);
+//        if (acceptMessages.containsKey(proposalNumber)) acceptMessages.get(proposalNumber).remove(acceptMessage);
 
         return false;
     }

simulator/src/main/java/byzzbench/simulator/protocols/fab2/messages/IPhaseMessage.java

@@ -0,0 +1,11 @@
+package byzzbench.simulator.protocols.fab2.messages;
+
+import byzzbench.simulator.transport.MessagePayload;
+import byzzbench.simulator.transport.messages.MessageWithRound;
+
+public abstract class IPhaseMessage extends MessagePayload implements MessageWithRound {
+    public abstract String getType();
+    public abstract long getViewNumber();
+    public abstract long getSequenceNumber();
+    public long getRound() { return getSequenceNumber(); }
+}

simulator/src/main/java/byzzbench/simulator/protocols/fab2/messages/NewViewChangeMessage.java

@@ -1,46 +1,42 @@
 package byzzbench.simulator.protocols.fab2.messages;
 
 import byzzbench.simulator.protocols.pbft_java.message.IPhaseMessage;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.With;
+import byzzbench.simulator.transport.MessagePayload;
+import byzzbench.simulator.transport.messages.MessageWithRound;
+import lombok.*;
 
+@AllArgsConstructor
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class NewViewChangeMessage extends IPhaseMessage {
+public class NewViewChangeMessage extends MessagePayload {
     @Getter
     private final long proposalNumber;
     private final String newLeaderId;
 
-    public NewViewChangeMessage(long viewNumber, String newLeaderId) {
-        this.proposalNumber = viewNumber;
-        this.newLeaderId = newLeaderId;
-    }
-
-    @Override
-    public long getViewNumber() {
-        return proposalNumber;
-    }
-
     @Override
     public String getType() {
         return "NEW_VIEW";
     }
 
-    @Override
-    public long getSequenceNumber() {
-        return 0;
-    }
-
-    @Override
-    public long getRound() {
-        return 0;
-    }
-
-    @Override
-    public byte[] getDigest() {
-        return new byte[0];
-    }
+//    @Override
+//    public long getViewNumber() {
+//        return proposalNumber;
+//    }
+//
+//
+//    @Override
+//    public long getSequenceNumber() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public long getRound() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public byte[] getDigest() {
+//        return new byte[0];
+//    }
 }

simulator/src/main/java/byzzbench/simulator/protocols/fab2/messages/SuspectMessage.java

@@ -3,6 +3,7 @@
 import byzzbench.simulator.protocols.fab2.ProposalNumber;
 import byzzbench.simulator.protocols.pbft_java.message.IPhaseMessage;
 import byzzbench.simulator.transport.MessagePayload;
+import byzzbench.simulator.transport.messages.MessageWithRound;
 import lombok.*;
 
 /**
@@ -22,6 +23,11 @@ public String getType() {
         return "SUSPECT";
     }
 
+//    @Override
+//    public long getRound() {
+//        return 0;
+//    }
+//
 //    @Override
 //    public long getViewNumber() {
 //        return proposalNumber.getViewNumber();
@@ -34,10 +40,5 @@ public String getType() {
 //    public byte[] getDigest() {
 //        return suspectId.getBytes();
 //    }
-//
-//    @Override
-//    public long getRound() {
-//        return 0;
-//    }
 }
 

simulator/src/main/java/byzzbench/simulator/protocols/fab2/messages/ViewChangeMessage.java

@@ -3,6 +3,7 @@
 import byzzbench.simulator.protocols.fab2.ProposalNumber;
 import byzzbench.simulator.protocols.pbft_java.message.IPhaseMessage;
 import byzzbench.simulator.transport.MessagePayload;
+import byzzbench.simulator.transport.messages.MessageWithRound;
 import lombok.*;
 
 /**
@@ -12,7 +13,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class ViewChangeMessage extends IPhaseMessage {
+public class ViewChangeMessage extends MessagePayload {
     private final String senderId;
     private final ProposalNumber proposalNumber;
     private final String newLeaderId;
@@ -21,23 +22,24 @@ public String getType() {
         return "VIEW_CHANGE";
     }
 
-    @Override
-    public long getViewNumber() {
-        return proposalNumber.getViewNumber();
-    }
-
-    @Override
-    public long getSequenceNumber() {
-        return 0;
-    }
-
-    @Override
-    public long getRound() {
-        return 0;
-    }
-
-    @Override
-    public byte[] getDigest() {
-        return newLeaderId.getBytes();
-    }
+//    @Override
+//    public long getViewNumber() {
+//        return proposalNumber.getViewNumber();
+//    }
+//
+//    // This message should not take into consideration the sequence number
+//    @Override
+//    public long getSequenceNumber() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public long getRound() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public byte[] getDigest() {
+//        return newLeaderId.getBytes();
+//    }
 }