Make election-related messages not extend MessageWithRound

Author: adduta

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

@@ -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());

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

@@ -282,11 +282,11 @@ public boolean onSuspect(String sender, SuspectMessage suspectMessage, int quoru
     }
 
     public Pair onQuery(String sender, QueryMessage queryMessage, int quorum) {
-        if (queryMessages.containsKey(queryMessage.getViewNumber())) {
-            queryMessages.get(queryMessage.getViewNumber()).remove(queryMessage);
+        if (queryMessages.containsKey(queryMessage.getProposalNumber().getViewNumber())) {
+            queryMessages.get(queryMessage.getProposalNumber().getViewNumber()).remove(queryMessage);
         }
 
-        long messageViewNumber = queryMessage.getViewNumber();
+        long messageViewNumber = queryMessage.getProposalNumber().getViewNumber();
 
         // Ignore bad requests.
 //        if (messageViewNumber < this.replica.getViewNumber()) {

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

@@ -1,6 +1,7 @@
 package byzzbench.simulator.protocols.fab2.messages;
 
 import byzzbench.simulator.protocols.pbft_java.message.IPhaseMessage;
+import byzzbench.simulator.transport.MessagePayload;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -9,7 +10,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class NewViewChangeMessage extends IPhaseMessage {
+public class NewViewChangeMessage extends MessagePayload {
     @Getter
     private final long proposalNumber;
     private final String newLeaderId;
@@ -19,28 +20,29 @@ public NewViewChangeMessage(long viewNumber, String newLeaderId) {
         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/QueryMessage.java

@@ -16,30 +16,30 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class QueryMessage extends IPhaseMessage {
+public class QueryMessage extends MessagePayload {
     private final ProposalNumber proposalNumber;
 
     public String getType() {
         return "QUERY";
     }
 
-    @Override
-    public long getViewNumber() {
-        return proposalNumber.getViewNumber();
-    }
-
-    @Override
-    public long getSequenceNumber() {
-        return 0;
-    }
+//    @Override
+//    public long getViewNumber() {
+//        return proposalNumber.getViewNumber();
+//    }
+//
+//    @Override
+//    public long getSequenceNumber() {
+//        return 0;
+//    }
 
 //    @Override
 //    public long getRound() {
 //        return 0;
 //    }
 
-    @Override
-    public byte[] getDigest() {
-        return new byte[0];
-    }
+//    @Override
+//    public byte[] getDigest() {
+//        return new byte[0];
+//    }
 }

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

@@ -15,7 +15,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @With
-public class ReplyMessage extends IPhaseMessage {
+public class ReplyMessage extends MessagePayload {
     private final Pair valueAndProposalNumber;
     private final boolean isSigned;
     private final String sender;
@@ -25,24 +25,24 @@ public String getType() {
         return "RESPONSE";
     }
 
-    @Override
-    public long getViewNumber() {
-        return valueAndProposalNumber.getProposalNumber().getViewNumber();
-    }
-
-    @Override
-    public long getSequenceNumber() {
-//        return valueAndProposalNumber.getProposalNumber().getSequenceNumber();
-        return 0;
-    }
-
-    @Override
-    public long getRound() {
-        return 0;
-    }
-
-    @Override
-    public byte[] getDigest() {
-        return valueAndProposalNumber.getValue();
-    }
+//    @Override
+//    public long getViewNumber() {
+//        return valueAndProposalNumber.getProposalNumber().getViewNumber();
+//    }
+//
+//    @Override
+//    public long getSequenceNumber() {
+////        return valueAndProposalNumber.getProposalNumber().getSequenceNumber();
+//        return 0;
+//    }
+//
+//    @Override
+//    public long getRound() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public byte[] getDigest() {
+//        return valueAndProposalNumber.getValue();
+//    }
 }

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

@@ -12,7 +12,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 +21,23 @@ 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();
+//    }
+//
+//    @Override
+//    public long getSequenceNumber() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public long getRound() {
+//        return 0;
+//    }
+//
+//    @Override
+//    public byte[] getDigest() {
+//        return newLeaderId.getBytes();
+//    }
 }