- scheduler-per-thread

- fixed ECDSA and crypto endianess
- Gns and GnsTool implemented
- updated consensus protocol 

9 files changed, 66 insertions, 20 deletions

diff --git a/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java b/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
index f86d5f5..f6033dc 100644
--- a/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
+++ b/src/test/java/org/gnunet/consensus/ConsensusSingleTest.java
@@ -20,6 +20,7 @@
 
 package org.gnunet.consensus;
 
+import org.gnunet.testing.TestingFixture;
 import org.gnunet.testing.TestingSubsystem;
 import org.gnunet.util.*;
 import org.junit.Assert;
@@ -31,7 +32,7 @@ import java.util.List;
 /**
  * Test consensus with only one peer.
  */
-public class ConsensusSingleTest {
+public class ConsensusSingleTest extends TestingFixture {
     @Test
     public void test_consensus_single() {
         Configuration armConf = new Configuration();
@@ -41,8 +42,12 @@ public class ConsensusSingleTest {
         TestingSubsystem ts = new TestingSubsystem("arm", armConf.writeTemp().getAbsolutePath());
         final Wrapper<Boolean> isDone = new Wrapper<Boolean>(false);
 
-        final Consensus consensus = new Consensus(ts.getConfiguration(), new PeerIdentity[0],
-                HashCode.random());
+        final Consensus consensus = new Consensus(
+                ts.getConfiguration(),
+                new PeerIdentity[0],
+                HashCode.random(),
+                AbsoluteTime.now(),
+                AbsoluteTime.now().add(RelativeTime.SECOND.multiply(10)));
 
         consensus.insertElement(new ConsensusElement("foo".getBytes(), 0));
         consensus.insertElement(new ConsensusElement("bar".getBytes(), 0));
@@ -50,7 +55,7 @@ public class ConsensusSingleTest {
 
         final List<String> received = new LinkedList<String>();
 
-        consensus.conclude(RelativeTime.SECOND, new ConsensusCallback() {
+        consensus.conclude(new ConsensusCallback() {
             @Override
             public void onElement(ConsensusElement element) {
                 Assert.assertNotNull(element);
diff --git a/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java b/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
index e5b4d3b..d544a43 100644
--- a/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
+++ b/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
@@ -5,6 +5,7 @@ import org.gnunet.testbed.ControllerProc;
 import org.gnunet.testbed.Host;
 import org.gnunet.testbed.SimpleTestbed;
 import org.gnunet.testbed.callbacks.*;
+import org.gnunet.testing.TestingFixture;
 import org.gnunet.util.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,7 +16,7 @@ import java.util.Set;
 /**
  * Test for consensus with multiple peers using testbed.
  */
-public class ConsensusTestbedTest {
+public class ConsensusTestbedTest extends TestingFixture {
     @Test
     public void test_consensus_testbed_2peers() {
         final Wrapper<Boolean> done = new Wrapper<Boolean>(false);
@@ -33,6 +34,8 @@ public class ConsensusTestbedTest {
             int peersStarted;
             int peersConcludeDone;
             HashCode sessionId = HashCode.random();
+            AbsoluteTime start;
+            AbsoluteTime deadline;
 
             class MyConsensusCallback implements ConsensusCallback {
                 int n;
@@ -69,11 +72,11 @@ public class ConsensusTestbedTest {
                 @Override
                 public void onConnect(Configuration cfg) {
                     System.out.println("connecting to consensus");
-                    consensi[n] = new Consensus(cfg, identities, sessionId);
+                    consensi[n] = new Consensus(cfg, identities, sessionId, start, deadline);
                     consensi[n].insertElement(new ConsensusElement("foo".getBytes(), 0));
                     consensi[n].insertElement(new ConsensusElement("bar".getBytes(), 0));
                     consensi[n].insertElement(new ConsensusElement(("num" + n).getBytes(), 0));
-                    consensi[n].conclude(RelativeTime.SECOND.multiply(10), new MyConsensusCallback(n));
+                    consensi[n].conclude(new MyConsensusCallback(n));
                 }
 
                 @Override
@@ -152,6 +155,8 @@ public class ConsensusTestbedTest {
 
             @Override
             public void run() {
+                start = AbsoluteTime.now();
+                deadline = start.add(RelativeTime.SECOND.multiply(10));
                 // use local peer's config, does that really make sense?
                 h = new Host(null, null, getConfiguration(), 0);
                 cp = new ControllerProc();
diff --git a/src/test/java/org/gnunet/core/CoreTest.java b/src/test/java/org/gnunet/core/CoreTest.java
index 0cb7817..adbcd26 100644
--- a/src/test/java/org/gnunet/core/CoreTest.java
+++ b/src/test/java/org/gnunet/core/CoreTest.java
@@ -77,6 +77,7 @@ public class CoreTest extends TestingFixture {
         final Core core = new Core(ts.getConfiguration());
         core.setMessageHandler(new Runabout() {
             public void visit(TestMessage t) {
+                System.out.println("got core response");
                 gotResponse.set(true);
                 core.disconnect();
             }
@@ -85,7 +86,8 @@ public class CoreTest extends TestingFixture {
         core.init(new InitCallback() {
             @Override
             public void onInit(PeerIdentity myIdentity) {
-                System.out.println("in core init");
+                System.out.println("in core init, my identity is " + myIdentity);
+                // we want to send a 4-byte TestMessage
                 core.notifyTransmitReady(0, RelativeTime.FOREVER, myIdentity, 4, new MessageTransmitter() {
                     @Override
                     public void transmit(Connection.MessageSink sink) {
diff --git a/src/test/java/org/gnunet/identity/IdentityTest.java b/src/test/java/org/gnunet/identity/IdentityTest.java
index cda4e6b..d2102dd 100644
--- a/src/test/java/org/gnunet/identity/IdentityTest.java
+++ b/src/test/java/org/gnunet/identity/IdentityTest.java
@@ -21,6 +21,7 @@
 package org.gnunet.identity;
 
 
+import org.gnunet.testing.TestingFixture;
 import org.gnunet.testing.TestingSubsystem;
 import org.gnunet.util.Program;
 import org.gnunet.util.Scheduler;
@@ -28,7 +29,7 @@ import org.gnunet.util.Wrapper;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class IdentityTest {
+public class IdentityTest extends TestingFixture {
     @Test
     public void test_identity_connect() {
         final Wrapper<Boolean> reachedEnd = new Wrapper<Boolean>(false);
diff --git a/src/test/java/org/gnunet/transport/TransportTest.java b/src/test/java/org/gnunet/transport/TransportTest.java
index 728c990..5c286fe 100644
--- a/src/test/java/org/gnunet/transport/TransportTest.java
+++ b/src/test/java/org/gnunet/transport/TransportTest.java
@@ -23,6 +23,7 @@ package org.gnunet.transport;
 import org.gnunet.hello.HelloMessage;
 import org.gnunet.peerinfo.PeerInfo;
 import org.gnunet.peerinfo.PeerProcessor;
+import org.gnunet.testing.TestingFixture;
 import org.gnunet.testing.TestingSubsystem;
 import org.gnunet.transport.callbacks.HelloUpdateCallback;
 import org.gnunet.util.*;
@@ -30,8 +31,8 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-public class TransportTest {
-    @Test
+public class TransportTest extends TestingFixture {
+    @Test(timeout = 5000)
     public void test_transport_get_hello() {
         Program.configureLogging("debug");
         final Wrapper<Boolean> ended = new Wrapper<Boolean>(false);
diff --git a/src/test/java/org/gnunet/util/ClientServerTest.java b/src/test/java/org/gnunet/util/ClientServerTest.java
index 616ce98..e20198e 100644
--- a/src/test/java/org/gnunet/util/ClientServerTest.java
+++ b/src/test/java/org/gnunet/util/ClientServerTest.java
@@ -3,6 +3,7 @@ package org.gnunet.util;
 import com.google.common.collect.Lists;
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
+import org.gnunet.testing.TestingFixture;
 import org.gnunet.testing.TestingServer;
 import org.gnunet.testing.TestingSetup;
 import org.junit.Assert;
@@ -20,7 +21,7 @@ import java.util.ArrayList;
  *
  * @author Florian Dold
  */
-public class ClientServerTest {
+public class ClientServerTest extends TestingFixture {
 
     @Test
     public void test_start_stop() {
diff --git a/src/test/java/org/gnunet/util/EcdheTest.java b/src/test/java/org/gnunet/util/EcdheTest.java
index 1ecb6d5..e7a9791 100644
--- a/src/test/java/org/gnunet/util/EcdheTest.java
+++ b/src/test/java/org/gnunet/util/EcdheTest.java
@@ -74,13 +74,29 @@ public class EcdheTest {
         privKey1.d = new byte[32];
         EcdhePrivateKey privKey2 = new EcdhePrivateKey();
         privKey2.d = new byte[32];
-        Strings.stringToData("FH7DONLOP82RMELK26NDEP8655HQFU9LUO36LNO1ENOJ5KOSRR00", privKey1.d);
-        Strings.stringToData("LAJES5PBR68MJQP067I7DLJO3RUGG0EUHSOAVOFIDF24KBDE0SEG", privKey2.d);
+        Strings.stringToData("A46TL3L8CF7R3BPPQDE8LJS999NQ58HD43DV11MPFI2B5JNJMM40", privKey1.d);
+        Strings.stringToData("B60MFOBFKCVT0IVFDI800MH345FG372UJ4T7GEMNMO72O64G0D00", privKey2.d);
 
         EcdhePublicKey pubKey1 = privKey1.getPublicKey();
         EcdhePublicKey pubKey2 = privKey2.getPublicKey();
 
-        Assert.assertEquals("VU5U4KNC3OH5RUL6M5T6BPH52BFBICEG5Q60A43V97HQV1VD3AG0", pubKey1.toString());
-        Assert.assertEquals("8DSB6D0OKS1SD71BKRTVT8OK18Q73Q7MUALJ76V9DQJO6J0170RG", pubKey2.toString());
+        Assert.assertEquals("JLU00RUGNB04APG6I9RKVT1CJLB16U8T7G130CC2IV4O3LJG5K40", pubKey1.toString());
+
+        Assert.assertEquals("G9TDOQVP3CFA2K5Q7PSS8Q935FVEHAF3C08JPV1H3MPDK1ESLM6G", pubKey2.toString());
+
+        HashCode h1 = privKey1.ecdh(pubKey2);
+        HashCode h2 = privKey2.ecdh(pubKey1);
+
+        Assert.assertEquals(h1, h2);
+
+        byte[] gnunet_data = new byte[64];
+        boolean success = Strings.stringToData(
+                "R9A80A2VU4R0IL3NT4FBIMFRCGVP72DQODHTQQ1SGR65I4PMF1" +
+                "6C3ELIF2RSB9L8H0KLOUU795IM5L0CLCISI607B5P1QE8HRAPA56O",
+                gnunet_data);
+        Assert.assertTrue(success);
+
+        Assert.assertArrayEquals(gnunet_data, h1.data);
+
     }
 }
diff --git a/src/test/java/org/gnunet/util/EcdsaTest.java b/src/test/java/org/gnunet/util/EcdsaTest.java
index 898bc9a..f06b4e9 100644
--- a/src/test/java/org/gnunet/util/EcdsaTest.java
+++ b/src/test/java/org/gnunet/util/EcdsaTest.java
@@ -24,13 +24,21 @@ import org.gnunet.util.crypto.*;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.math.BigInteger;
+
 public class EcdsaTest {
     @Test
     public void test_sign_success() {
         byte[] data = "GNUnet".getBytes();
-        EcdsaPrivateKey privateKey = EcdsaPrivateKey.createRandom();
+        //EcdsaPrivateKey privateKey = EcdsaPrivateKey.createRandom();
+        EcdsaPrivateKey privateKey = new EcdsaPrivateKey();
+        privateKey.d = Ed25519.encodeScalar(new BigInteger("9751885127070397687372377515580876465521419304255864589795046632195735740054"));
         EcdsaPublicKey publicKey = privateKey.getPublicKey();
         EcdsaSignature signature = privateKey.sign(publicKey, 0, data);
+        System.out.println("private key: " + Ed25519.decodeScalar(privateKey.d));
+        System.out.println("public key: " + publicKey.asPoint());
+        System.out.println("signature r: " + Ed25519.decodeScalar(signature.r));
+        System.out.println("signature s: " + Ed25519.decodeScalar(signature.s));
         Assert.assertTrue(signature.verify(data, 0, publicKey));
     }
 
diff --git a/src/test/java/org/gnunet/util/Ed25519Test.java b/src/test/java/org/gnunet/util/Ed25519Test.java
index 4ae39a7..58b329c 100644
--- a/src/test/java/org/gnunet/util/Ed25519Test.java
+++ b/src/test/java/org/gnunet/util/Ed25519Test.java
@@ -46,7 +46,7 @@ public class Ed25519Test {
     /**
      * Raw ECDH check.
      */
-    //@Test
+    @Test
     public void test_ecdh() {
         for (int i = 0; i < 5; ++i) {
             System.out.println("try " + i);
@@ -92,10 +92,10 @@ public class Ed25519Test {
     /**
      * Test if decode is the inverse of encode.
      */
-    //@Test
+    @Test
     public void test_encode_inverse() {
         Random r = new Random();
-        for (int i = 0; i < 100; i++) {
+        for (int i = 0; i < 5; i++) {
             byte[] d1 = new byte[32];
             r.nextBytes(d1);
             d1[31] &= 127;
@@ -139,4 +139,11 @@ public class Ed25519Test {
             Assert.assertArrayEquals(d1, d2);
         }
     }
+
+    @Test
+    public void test_order() {
+        Ed25519 P = Ed25519.B.scalarmult(Ed25519.l);
+        System.out.println("Point P: " + P);
+        Assert.assertTrue(P.isIdentity());
+    }
 }