[freenet-cvs] r16897 - trunk/freenet/src/freenet/node/simulator

[rob...@freenetproject.org]

Author: robert
Date: 2008-01-04 23:00:50 +0000 (Fri, 04 Jan 2008)
New Revision: 16897

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
Log:
don't re-initialize DiffieHellman, throws IllegalStateException


Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-01-04 22:57:51 UTC (rev 16896)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-01-04 23:00:50 UTC (rev 16897)
@@ -41,14 +41,15 @@
     public static void main(String[] args) throws FSParseException, 
PeerParseException, CHKEncodeException, InvalidThresholdException, 
NodeInitException, ReferenceSignatureVerificationException {
         String wd = "realNodeRequestInsertTest";
         new File(wd).mkdir();
-        NodeStarter.globalTestInit(wd); // ignore Random, using our own
+        //NOTE: globalTestInit returns in ignored random source
+        NodeStarter.globalTestInit(wd);
         // Don't clobber nearby nodes!
         Logger.setupStdoutLogging(Logger.DEBUG, 
"freenet.store:minor,freenet.node.Location:normal" 
/*"freenet.node.LocationManager:debug,freenet.node.FNPPacketManager:normal,freenet.io.comm.MessageCore:debug"*/);
         Logger.globalSetThreshold(Logger.DEBUG);
         System.out.println("Insert/retrieve test");
         System.out.println();
         DummyRandomSource random = new DummyRandomSource();
-        DiffieHellman.init(random);
+        //DiffieHellman.init(random);
         Node[] nodes = new Node[NUMBER_OF_NODES];
         Logger.normal(RealNodeRoutingTest.class, "Creating nodes...");
         Executor executor = new PooledExecutor();

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-01-04 22:57:51 UTC (rev 16896)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-01-04 23:00:50 UTC (rev 16897)
@@ -40,9 +40,10 @@
         System.out.println();
         String wd = "realNodeRequestInsertTest";
         new File(wd).mkdir();
-        NodeStarter.globalTestInit(wd); // ignore Random, using our own
+        //NOTE: globalTestInit returns in ignored random source
+        NodeStarter.globalTestInit(wd);
         DummyRandomSource random = new DummyRandomSource();
-        DiffieHellman.init(random);
+        //DiffieHellman.init(random);
         Node[] nodes = new Node[NUMBER_OF_NODES];
         Logger.normal(RealNodeRoutingTest.class, "Creating nodes...");
         Executor executor = new PooledExecutor();