- identity service implemented

- started with arm implementation
- removed locking from scheduler
- separated TaskConfiguration and TaskIdentifier
- implemented proper message stream tokenizer
- work on voting

3 files changed, 143 insertions, 60 deletions

diff --git a/src/test/java/org/gnunet/identity/IdentityTest.java b/src/test/java/org/gnunet/identity/IdentityTest.java
new file mode 100644
index 0000000..cda4e6b
--- /dev/null
+++ b/src/test/java/org/gnunet/identity/IdentityTest.java
@@ -0,0 +1,123 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.identity;
+
+
+import org.gnunet.testing.TestingSubsystem;
+import org.gnunet.util.Program;
+import org.gnunet.util.Scheduler;
+import org.gnunet.util.Wrapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class IdentityTest {
+    @Test
+    public void test_identity_connect() {
+        final Wrapper<Boolean> reachedEnd = new Wrapper<Boolean>(false);
+        Program.configureLogging("DEBUG");
+        TestingSubsystem ts = new TestingSubsystem("identity");
+
+        final Identity identity = new Identity();
+        identity.connect(ts.getConfiguration(), new IdentityListCallback() {
+            @Override
+            public void onEgoAdd(Identity.Ego ego) {
+                System.out.println("got ego " + ego.getName());
+            }
+
+            @Override
+            public void onEgoDelete(Identity.Ego ego) {
+                // should only happen after end of list,
+                // but we disconnect on end of list
+                Assert.fail();
+            }
+
+            @Override
+            public void onEgoRename(String oldName, Identity.Ego ego) {
+                Assert.fail();
+            }
+
+            @Override
+            public void onListEnd() {
+                System.out.println("got end of list");
+                reachedEnd.set(true);
+                identity.disconnect();
+            }
+        });
+        Scheduler.run();
+        Assert.assertTrue(reachedEnd.get());
+    }
+
+    @Test
+    public void test_identity_create() {
+        final Wrapper<Boolean> created = new Wrapper<Boolean>(false);
+        final Wrapper<Boolean> gotEnd = new Wrapper<Boolean>(false);
+        final Wrapper<Boolean> gotCreated = new Wrapper<Boolean>(false);
+        Program.configureLogging("DEBUG");
+        TestingSubsystem ts = new TestingSubsystem("identity");
+
+        final String myEgoName = "gnunet-java-test-ego";
+
+        final Identity identity = new Identity();
+        identity.connect(ts.getConfiguration(), new IdentityListCallback() {
+            @Override
+            public void onEgoAdd(Identity.Ego ego) {
+                if (created.get() && ego.getName().equals(myEgoName)) {
+                    gotCreated.set(true);
+                    identity.disconnect();
+                }
+            }
+
+            @Override
+            public void onEgoDelete(Identity.Ego ego) {
+                // should only happen after end of list,
+                // but we disconnect on end of list
+                Assert.fail();
+            }
+
+            @Override
+            public void onEgoRename(String oldName, Identity.Ego ego) {
+                Assert.fail();
+            }
+
+            @Override
+            public void onListEnd() {
+                System.out.println("got end of list");
+                gotEnd.set(true);
+            }
+        });
+        identity.create(myEgoName, new IdentityContinuation() {
+            @Override
+            public void onError(String errorMessage) {
+                Assert.fail(errorMessage);
+            }
+
+            @Override
+            public void onDone() {
+                Assert.assertFalse(created.get());
+                created.set(true);
+            }
+        });
+        Scheduler.run();
+        Assert.assertTrue(created.get());
+        Assert.assertTrue(gotCreated.get());
+        Assert.assertTrue(gotEnd.get());
+    }
+}
diff --git a/src/test/java/org/gnunet/testbed/TestbedTest.java b/src/test/java/org/gnunet/testbed/TestbedTest.java
index 56febde..6a6ed10 100644
--- a/src/test/java/org/gnunet/testbed/TestbedTest.java
+++ b/src/test/java/org/gnunet/testbed/TestbedTest.java
@@ -12,7 +12,7 @@ import org.junit.Test;
 
 public class TestbedTest extends TestingFixture {
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void test_controller_proc() {
         final Wrapper<Boolean> success = new Wrapper<Boolean>(false);
         new Program("-LDEBUG") {
@@ -38,16 +38,13 @@ public class TestbedTest extends TestingFixture {
     }
 
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void test_peer_create() {
         new Program("-LDEBUG") {
             ControllerProc cp;
             Host h;
             Controller c;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class PCB implements PeerCreateCallback {
                 @Override
                 public void onPeerCreated(Controller.Peer peer) {
@@ -71,7 +68,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("startup success");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new PCB());
                     }
@@ -84,16 +81,13 @@ public class TestbedTest extends TestingFixture {
         }.start();
     }
 
-    @Test(timeout = 1000)
+    @Test(timeout = 10000)
     public void test_peer_destroy() {
         new Program("-LDEBUG") {
             ControllerProc cp;
             Host h;
             Controller c;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class PCB implements PeerCreateCallback {
                 @Override
                 public void onPeerCreated(final Controller.Peer peer) {
@@ -128,7 +122,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("startup success");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new PCB());
                     }
@@ -141,7 +135,7 @@ public class TestbedTest extends TestingFixture {
         }.start();
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 10000)
     public void test_peer_start() {
         final Wrapper<Boolean> startSuccessful = new Wrapper<Boolean>(false);
         int ret = new Program("-LDEBUG") {
@@ -149,9 +143,6 @@ public class TestbedTest extends TestingFixture {
             Host h;
             Controller c;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyPeerChurnCallback implements PeerChurnCallback {
 
                 @Override
@@ -190,7 +181,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback());
                     }
@@ -205,7 +196,7 @@ public class TestbedTest extends TestingFixture {
         Assert.assertEquals(0, ret);
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 10000)
     public void test_peer_stop() {
         final Wrapper<Boolean> startSuccessful = new Wrapper<Boolean>(false);
         final Wrapper<Boolean> stopSuccessful = new Wrapper<Boolean>(false);
@@ -215,9 +206,6 @@ public class TestbedTest extends TestingFixture {
             Controller c;
             Controller.Peer p;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyPeerStopCallback implements PeerChurnCallback {
 
                 @Override
@@ -271,7 +259,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback());
                     }
@@ -287,7 +275,7 @@ public class TestbedTest extends TestingFixture {
         Assert.assertEquals(0, ret);
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 10000)
     public void test_peer_stop_destroy() {
         final Wrapper<Boolean> startSuccessful = new Wrapper<Boolean>(false);
         final Wrapper<Boolean> stopSuccessful = new Wrapper<Boolean>(false);
@@ -298,9 +286,6 @@ public class TestbedTest extends TestingFixture {
             Controller c;
             Controller.Peer p;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyPeerDestroyCallback implements OperationCompletionCallback {
 
                 @Override
@@ -367,7 +352,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback());
                     }
@@ -394,9 +379,6 @@ public class TestbedTest extends TestingFixture {
             Controller c;
             Controller.Peer p;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyPeerInformationCallback implements PeerInformationCallback {
                 @Override
                 public void onSuccess(PeerIdentity peerIdentity, Configuration configuration) {
@@ -433,7 +415,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback());
                     }
@@ -449,10 +431,9 @@ public class TestbedTest extends TestingFixture {
         Assert.assertEquals(0, ret);
     }
 
-    @Test(timeout = 5000)
+    @Test
     public void test_peer_reconfigure() {
         final Wrapper<Boolean> startSuccessful = new Wrapper<Boolean>(false);
-        final Wrapper<Boolean> infoSuccessful = new Wrapper<Boolean>(false);
         final Wrapper<Boolean> reconfigureSuccessful = new Wrapper<Boolean>(false);
         int ret = new Program("-LDEBUG") {
             ControllerProc cp;
@@ -460,9 +441,6 @@ public class TestbedTest extends TestingFixture {
             Controller c;
             Controller.Peer p;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyUpdateConfigDoneCallback implements OperationCompletionCallback {
                 @Override
                 public void onCompletion() {
@@ -478,30 +456,15 @@ public class TestbedTest extends TestingFixture {
                 }
             }
 
-            /*
-            class MyPeerInformationCallback implements PeerInformationCallback {
-                @Override
-                public void onSuccess(PeerIdentity peerIdentity, Configuration configuration) {
-                    Assert.assertNotNull(peerIdentity);
-                    Assert.assertNotNull(configuration);
-                    Assert.assertTrue(configuration.getSections().size() > 0);
-                    infoSuccessful.set(true);
-                    System.out.println("updating configuration");
-                    p.updateConfiguration(cfg, new MyUpdateConfigDoneCallback());
-                }
-            }
-
-            */
-
             class MyPeerCreateCallback implements PeerCreateCallback {
                 @Override
                 public void onPeerCreated(Controller.Peer peer) {
                     p = peer;
                     System.out.println("peer created");
                     startSuccessful.set(true);
-                    //peer.requestInformation(new MyPeerInformationCallback());
 
                     Configuration cfg = new Configuration();
+                    cfg.setValueNumber("foo", "bar", 42);
                     cfg.setValueString("my-test-section", "my-test-option", "my-test-value");
                     peer.updateConfiguration(cfg, new MyUpdateConfigDoneCallback());
                 }
@@ -522,7 +485,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, configuration, new MyPeerCreateCallback());
                     }
@@ -549,9 +512,6 @@ public class TestbedTest extends TestingFixture {
             Controller.Peer p1;
             int peersStarted = 0;
 
-            class CEC extends ControllerEventCallback {
-            }
-
             class MyConnectCompleteCallback implements OperationCompletionCallback {
 
                 @Override
@@ -620,7 +580,7 @@ public class TestbedTest extends TestingFixture {
                     @Override
                     public void onStartupSuccess(Configuration cfg) {
                         System.out.println("controller started");
-                        c = new Controller(h, 1 | 2 | 4 | 8 | 32, new CEC());
+                        c = new Controller(h);
                         // FIXME: use config from resource
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback(0));
                         c.createPeer(h, getConfiguration(), new MyPeerCreateCallback(1));
diff --git a/src/test/java/org/gnunet/util/CryptoECCTest.java b/src/test/java/org/gnunet/util/CryptoECCTest.java
index c4c85d2..1dda545 100644
--- a/src/test/java/org/gnunet/util/CryptoECCTest.java
+++ b/src/test/java/org/gnunet/util/CryptoECCTest.java
@@ -21,7 +21,7 @@ public class CryptoECCTest {
             CryptoECC.PrivateKey privateKey = new CryptoECC.PrivateKey();
             privateKey.d = new byte[32];
             r.nextBytes(privateKey.d);
-            CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
+            CryptoECC.PublicSignKey publicKey = CryptoECC.computePublicKey(privateKey);
             System.out.println("gen");
             CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
             System.out.println("sign");
@@ -44,7 +44,7 @@ public class CryptoECCTest {
             CryptoECC.PrivateKey privateKey = new CryptoECC.PrivateKey();
             privateKey.d = new byte[32];
             r.nextBytes(privateKey.d);
-            CryptoECC.PublicKey publicKey = CryptoECC.computePublicKey(privateKey);
+            CryptoECC.PublicSignKey publicKey = CryptoECC.computePublicKey(privateKey);
             System.out.println("gen");
             CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
             System.out.println("sign");
@@ -66,12 +66,12 @@ public class CryptoECCTest {
         CryptoECC.PrivateKey privateAlice = new CryptoECC.PrivateKey();
         privateAlice.d = new byte[32];
         r.nextBytes(privateAlice.d);
-        CryptoECC.PublicKey publicAlice = CryptoECC.computePublicKey(privateAlice);
+        CryptoECC.PublicSignKey publicAlice = CryptoECC.computePublicKey(privateAlice);
 
         CryptoECC.PrivateKey privateBob = new CryptoECC.PrivateKey();
         privateBob.d = new byte[32];
         r.nextBytes(privateBob.d);
-        CryptoECC.PublicKey publicBob = CryptoECC.computePublicKey(privateBob);
+        CryptoECC.PublicSignKey publicBob = CryptoECC.computePublicKey(privateBob);
 
         HashCode ssAlice = CryptoECC.ecdh(privateAlice, publicBob);
         HashCode ssBob = CryptoECC.ecdh(privateBob, publicAlice);