From 0d8e522e9313bfd74a09e1e34a3767e0732dafed Mon Sep 17 00:00:00 2001
From: Vladimir Eliezer Tokarev <vladimirelitokarev@gmail.com>
Date: Fri, 22 Jan 2016 07:35:30 -0800
Subject: [PATCH] Changed the SimpleRegistry to work with
 UnsignedBulletinBoardMessage The basicMessage is not needed

---
 .../BulletinBoardClientIntegrationTest.java   |  19 ++---
 bulletin-board-server/meerkat                 | Bin 0 -> 9216 bytes
 .../src/main/java/meerkat/SimpleRegistry.java |  73 ++++++------------
 3 files changed, 34 insertions(+), 58 deletions(-)
 create mode 100644 bulletin-board-server/meerkat

diff --git a/bulletin-board-client/src/test/java/BulletinBoardClientIntegrationTest.java b/bulletin-board-client/src/test/java/BulletinBoardClientIntegrationTest.java
index dda76c7..9ce1ee4 100644
--- a/bulletin-board-client/src/test/java/BulletinBoardClientIntegrationTest.java
+++ b/bulletin-board-client/src/test/java/BulletinBoardClientIntegrationTest.java
@@ -4,20 +4,18 @@ import meerkat.bulletinboard.BulletinBoardClient.ClientCallback;
 import meerkat.bulletinboard.ThreadedBulletinBoardClient;
 import meerkat.protobuf.BulletinBoardAPI.*;
 import meerkat.protobuf.Crypto;
-
-import meerkat.protobuf.Voting.*;
+import meerkat.protobuf.Voting.BulletinBoardClientParams;
 import meerkat.util.BulletinBoardMessageComparator;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.number.OrderingComparison.*;
-
 import java.util.*;
 import java.util.concurrent.Semaphore;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.number.OrderingComparison.greaterThanOrEqualTo;
+import static org.junit.Assert.assertThat;
+
 /**
  * Created by Arbel Deutsch Peled on 05-Dec-15.
  */
@@ -104,7 +102,7 @@ public class BulletinBoardClientIntegrationTest {
     private ReadCallback readCallback;
 
     private static String PROP_GETTY_URL = "gretty.httpBaseURI";
-    private static String DEFAULT_BASE_URL = "http://localhost:8081";
+    private static String DEFAULT_BASE_URL = "http://localhost:3306";
     private static String BASE_URL =  System.getProperty(PROP_GETTY_URL, DEFAULT_BASE_URL);
 
     @Before
@@ -116,7 +114,7 @@ public class BulletinBoardClientIntegrationTest {
         testDB.add(BASE_URL);
 
         bulletinBoardClient.init(BulletinBoardClientParams.newBuilder()
-            .addBulletinBoardAddress("http://localhost:8081")
+            .addBulletinBoardAddress("http://localhost:3306")
             .setMinRedundancy((float) 1.0)
             .build());
 
@@ -165,6 +163,8 @@ public class BulletinBoardClientIntegrationTest {
 
         messageID = bulletinBoardClient.postMessage(msg,postCallback);
 
+        System.out.println(messageID.toByteArray());
+
         try {
             jobSemaphore.acquire();
         } catch (InterruptedException e) {
@@ -206,6 +206,7 @@ public class BulletinBoardClientIntegrationTest {
             System.err.println(t.getMessage());
         }
         if (thrown.size() > 0) {
+            System.out.println(thrown.size());
             assert false;
         }
 
diff --git a/bulletin-board-server/meerkat b/bulletin-board-server/meerkat
new file mode 100644
index 0000000000000000000000000000000000000000..c3aa05c7541db4449c3bbf29bfa4b81171cd8803
GIT binary patch
literal 9216
zcmeH|K~LK-6vyo*P0A!rJLFVhsfX1lQ$Z8=wZ))lC51Fd>o`=|8oEkQL`V^6r*hrb
z*m)m<E8k+DW71|jF-aydq1=dGq{x2u^Yj1xo-L1#2J<*1rx($A5R-REM;N2`gdl|K
z{9oh0`h=}3gSR->f2vzYZ-2d6*M6f0`hm0)?V)zBZQ`G`@8}O7c;+{57*>no<$N&>
zZ$|UkB8(i>4dP`K`oZV3aINpLuFr_$?y`?0=SGIEG&9$BIy<E++cYgo@!jiK#1P||
zThVHy@%?UZ!2StH+H4U=x9;+sZ|}2x=GjWYl=KF}USi77sl7M!n6vMa4{V&Rro>}=
z%wuk!jmW{(OeXdio6^;%x@omq`0ksOD?JjYT-PWF%}r$cq#FES=1eoiWhB|8uu4WO
zWWh(0ERrdk9J|iZG0U{rM9l0`x?>oY)51uW`RekFpUX+Gj4z};$>lNG&Kc&ZW?IcA
zUTsJuYCF~H1sH0Sw8fr}sgpy`Ip}(0Q4A@ETnEvYuR+w_*`ldn+R+WG-+W4*iagm?
zz4`(t!a7;4_z{!Rd0Q(8Q==IcRhFVQ?#E?|6P3!c#W9fsv{U<^K(#{(k1Npl_0!kI
z9n9bAXWmJ00|G$c<r8=%Qh@va@(T$W0D%$&;QcQF4VD0biV%SJzaoW%G=M+}0`UHq
rfCfu|Kt%|^`(KelLK;Az1Oa&eOF)AqK%gQ7;Qg;iAt4PQP=df;RO=n4

literal 0
HcmV?d00001

diff --git a/voter-registry/src/main/java/meerkat/SimpleRegistry.java b/voter-registry/src/main/java/meerkat/SimpleRegistry.java
index 82fdd02..ed391c9 100644
--- a/voter-registry/src/main/java/meerkat/SimpleRegistry.java
+++ b/voter-registry/src/main/java/meerkat/SimpleRegistry.java
@@ -32,27 +32,12 @@ public class SimpleRegistry {
         this.communicator = communicator;
     }
 
-    /**
-     * Creates array of Tags in given length
-     * @param length the length og wanted array
-     * @return Tag.Builder[]
-     */
-    private Tag.Builder[] GetTagsArrayInLength(int length) {
-        Tag.Builder[] tags = new Tag.Builder[length];
-
-        for (int i = 0; i < length; i++) {
-            tags[i] = Tag.newBuilder();
-        }
-        return tags;
-    }
-
     /**
      * Creates BulletinBoardMessage with signed basicMessage and UnsignedBulletinBoardMessage that contains the basic message
-     *
      * @param basicMessage BasicMessage
      * @return BulletinBoardAPI.BulletinBoardMessage
      */
-    private BulletinBoardAPI.BulletinBoardMessage CreateBulletinBoardMessage(BasicMessage basicMessage) throws IOException {
+    private BulletinBoardAPI.BulletinBoardMessage CreateBulletinBoardMessage(BulletinBoardAPI.UnsignedBulletinBoardMessage basicMessage) throws IOException {
         BulletinBoardAPI.BulletinBoardMessage.Builder bulletinBoardMessage =
                 BulletinBoardAPI.BulletinBoardMessage.newBuilder();
 
@@ -62,14 +47,10 @@ public class SimpleRegistry {
         Crypto.Signature.Builder messageSignature = Crypto.Signature.newBuilder();
         messageSignature.mergeFrom(encryptedMessage);
 
-        BulletinBoardAPI.UnsignedBulletinBoardMessage.Builder unsignedBulletinBoardMessage =
-                BulletinBoardAPI.UnsignedBulletinBoardMessage.newBuilder();
-        unsignedBulletinBoardMessage.setData(basicMessage.toByteString());
+        bulletinBoardMessage.setMsg(basicMessage);
 
         bulletinBoardMessage.addSig(messageSignature);
 
-        bulletinBoardMessage.setMsg(unsignedBulletinBoardMessage);
-
         return bulletinBoardMessage.build();
     }
 
@@ -107,19 +88,18 @@ public class SimpleRegistry {
 
     /**
      * Adds new voter to the bulletin-board
-     *
      * @param voterID id of the new user
      * @param personalData for example residence location
      * @return void
      * @throws CommunicationException, IOException
      */
     public void AddVoter(String voterID, String personalData) throws CommunicationException, IOException {
-        Tag.Builder[] tags = GetTagsArrayInLength(3);
-        tags[0].setContent(RegistryTags.ID_TAG + " " + voterID);
-        tags[1].setContent(RegistryTags.VOTER_ENTRY_TAG.toString());
-        tags[2].setContent(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
+        BulletinBoardAPI.UnsignedBulletinBoardMessage.Builder basicMessage =
+                BulletinBoardAPI.UnsignedBulletinBoardMessage.newBuilder().
+                        addTag(RegistryTags.ID_TAG + " " + voterID)
+                        .addTag(RegistryTags.VOTER_ENTRY_TAG.toString())
+                        .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
 
-        BasicMessage.Builder basicMessage = BasicMessage.newBuilder().addTag(tags[0]).addTag(tags[1]).addTag(tags[1]);
         basicMessage.setData(ByteString.copyFrom(personalData.getBytes()));
 
         communicator.postMessage(CreateBulletinBoardMessage(basicMessage.build()));
@@ -134,14 +114,12 @@ public class SimpleRegistry {
      * @throws CommunicationException
      */
     public void AddToGroup(String voterID, String groupID) throws CommunicationException, IOException {
-        Tag.Builder[] tags = GetTagsArrayInLength(4);
-        tags[0].setContent(RegistryTags.ID_TAG + " " + voterID);
-        tags[1].setContent(RegistryTags.GROUP_ID_TAG + " " + groupID);
-        tags[2].setContent(RegistryTags.GROUP_ACTION_TAG + " " + RegistryTags.ADD_TO_GROUP_TAG);
-        tags[3].setContent(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
-
-        BasicMessage.Builder basicMessage =
-                BasicMessage.newBuilder().addTag(tags[0]).addTag(tags[1]).addTag(tags[2]).addTag(tags[3]);
+        BulletinBoardAPI.UnsignedBulletinBoardMessage.Builder basicMessage =
+                BulletinBoardAPI.UnsignedBulletinBoardMessage.newBuilder()
+                        .addTag(RegistryTags.ID_TAG + " " + voterID)
+                        .addTag(RegistryTags.GROUP_ID_TAG + " " + groupID)
+                        .addTag(RegistryTags.GROUP_ACTION_TAG + " " + RegistryTags.ADD_TO_GROUP_TAG)
+                        .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
 
         communicator.postMessage(CreateBulletinBoardMessage(basicMessage.build()));
     }
@@ -155,14 +133,12 @@ public class SimpleRegistry {
      * @throws CommunicationException
      */
     public void RemoveFromGroup(String voterID, String groupID) throws CommunicationException, IOException {
-        Tag.Builder[] tags = GetTagsArrayInLength(4);
-        tags[0].setContent(RegistryTags.ID_TAG + " " + voterID);
-        tags[1].setContent(RegistryTags.GROUP_ID_TAG + " " + groupID);
-        tags[2].setContent(RegistryTags.GROUP_ACTION_TAG + " " + RegistryTags.REMOVE_FROM_GROUP_TAG);
-        tags[3].setContent(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
-
-        BasicMessage.Builder basicMessage =
-                BasicMessage.newBuilder().addTag(tags[0]).addTag(tags[1]).addTag(tags[2]).addTag(tags[3]);
+        BulletinBoardAPI.UnsignedBulletinBoardMessage.Builder basicMessage =
+                BulletinBoardAPI.UnsignedBulletinBoardMessage.newBuilder()
+                        .addTag(RegistryTags.ID_TAG + " " + voterID)
+                        .addTag(RegistryTags.GROUP_ID_TAG + " " + groupID)
+                        .addTag(RegistryTags.GROUP_ACTION_TAG + " " + RegistryTags.REMOVE_FROM_GROUP_TAG)
+                        .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
 
         communicator.postMessage(CreateBulletinBoardMessage(basicMessage.build()));
     }
@@ -175,12 +151,11 @@ public class SimpleRegistry {
      * @throws CommunicationException
      */
     public void AddVoter(String id) throws CommunicationException, IOException {
-        Tag.Builder[] tags = GetTagsArrayInLength(3);
-        tags[0].setContent(RegistryTags.ID_TAG + " " + id);
-        tags[1].setContent(RegistryTags.VOTE_ACTION_TAG.toString());
-        tags[2].setContent(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
-
-        BasicMessage.Builder basicMessage = BasicMessage.newBuilder().addTag(tags[0]).addTag(tags[1]).addTag(tags[2]);
+        BulletinBoardAPI.UnsignedBulletinBoardMessage.Builder basicMessage =
+                BulletinBoardAPI.UnsignedBulletinBoardMessage.newBuilder()
+                        .addTag(RegistryTags.ID_TAG + " " + id)
+                        .addTag(RegistryTags.VOTE_ACTION_TAG.toString())
+                        .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + " " + AccurateTimestamp.GetCurrentTimestampString());
 
         communicator.postMessage(CreateBulletinBoardMessage(basicMessage.build()));
     }