Last two commits rendered most of the constructors in TOMMessage useless, so...

Last two commits rendered most of the constructors in TOMMessage useless, so they were removed from the rest of the code.

src/bftsmart/communication/server/Test.java

@@ -20,6 +20,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import bftsmart.communication.SystemMessage;
 import bftsmart.reconfiguration.ServerViewController;
 import bftsmart.tom.core.messages.TOMMessage;
+import bftsmart.tom.core.messages.TOMMessageType;
 import bftsmart.tom.util.Storage;
 
 public class Test {
@@ -60,7 +61,7 @@ public class Test {
             if(id == 0) {
                 long time = System.nanoTime();
 
-                scl.send(targets, new TOMMessage(id,0,i,msg.getBytes(),0), true);
+                scl.send(targets, new TOMMessage(id,0,0, i,msg.getBytes(),0,TOMMessageType.ORDERED_REQUEST), true);
                 int rec = 0;
 
                 while(rec < n-1) {
@@ -72,7 +73,7 @@ public class Test {
                 System.out.println("Roundtrip "+((System.nanoTime()-time)/1000.0)+" us");
             } else {
                 TOMMessage m = (TOMMessage) inQueue.take();
-                scl.send(new int[]{m.getSender()}, new TOMMessage(id,0,i,m.getContent(),0), true);
+                scl.send(new int[]{m.getSender()}, new TOMMessage(id,0,0,i,m.getContent(),0,TOMMessageType.ORDERED_REQUEST), true);
             }
         }
 
@@ -84,7 +85,7 @@ public class Test {
             if(id == 0) {
                 long time = System.nanoTime();
 
-                scl.send(targets, new TOMMessage(id,0,i,msg.getBytes(),0), true);
+                scl.send(targets, new TOMMessage(id,0,0,i,msg.getBytes(),0,TOMMessageType.ORDERED_REQUEST), true);
                 int rec = 0;
 
                 while(rec < n-1) {
@@ -95,7 +96,7 @@ public class Test {
                 st.store(System.nanoTime()-time);
             } else {
                 TOMMessage m = (TOMMessage) inQueue.take();
-                scl.send(new int[]{m.getSender()}, new TOMMessage(id,0,i,m.getContent(),0), true);
+                scl.send(new int[]{m.getSender()}, new TOMMessage(id,0,0,i,m.getContent(),0,TOMMessageType.ORDERED_REQUEST), true);
             }
         }
 

src/bftsmart/communication/server/TestSerialization.java

@@ -21,6 +21,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
 import bftsmart.tom.core.messages.TOMMessage;
+import bftsmart.tom.core.messages.TOMMessageType;
 
 
 
@@ -31,7 +32,7 @@ public class TestSerialization {
      */
     public static void main(String[] args) throws Exception {
         // TODO code application logic here
-        TOMMessage tm = new TOMMessage(0,0,0,new String("abc").getBytes(),0);
+        TOMMessage tm = new TOMMessage(0,0,0,0, new String("abc").getBytes(),0, TOMMessageType.ORDERED_REQUEST);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream(4);
         DataOutputStream oos = new DataOutputStream(baos);

src/bftsmart/tom/core/DeliveryThread.java

@@ -302,7 +302,7 @@ public final class DeliveryThread extends Thread {
             for (int i = 0; i < dests.length; i++) {
                 tomLayer.getCommunication().send(new int[]{dests[i].getSender()},
                         new TOMMessage(controller.getStaticConf().getProcessId(),
-                        dests[i].getSession(), dests[i].getSequence(), response,
+                        dests[i].getSession(), dests[i].getSequence(), dests[i].getOperationId(), response,
                         controller.getCurrentViewId(),TOMMessageType.RECONFIG));
             }
 

src/bftsmart/tom/core/messages/TOMMessage.java

@@ -84,20 +84,6 @@ public class TOMMessage extends SystemMessage implements Externalizable, Compara
 	public TOMMessage() {
 	}
 
-
-	/**
-	 * Creates a new instance of TOMMessage
-	 *
-	 * @param sender ID of the process which sent the message
-	 * @param session Session id of the sender
-	 * @param sequence Sequence number defined by the client
-	 * @param content Content of the message
-	 * @param view ViewId of the message
-	 */
-	public TOMMessage(int sender, int session, int sequence, byte[] content, int view) {
-		this(sender,session,sequence,content, view, TOMMessageType.ORDERED_REQUEST);
-	}
-
 	/**
 	 * Creates a new instance of TOMMessage
 	 *
@@ -108,9 +94,9 @@ public class TOMMessage extends SystemMessage implements Externalizable, Compara
 	 * @param view ViewId of the message
 	 * @param type Type of the request
 	 */
-	public TOMMessage(int sender, int session, int sequence, byte[] content, int view, TOMMessageType type) {
-		this(sender, session, sequence, -1, content, view, type);
-	}
+	//public TOMMessage(int sender, int session, int sequence, byte[] content, int view, TOMMessageType type) {
+	//	this(sender, session, sequence, -1, content, view, type);
+	//}
 
 	/**
 	 * Creates a new instance of TOMMessage. This one has an operationId parameter