Changeset e708149

Timestamp:

Jan 23, 2016 5:58:16 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

374996d

Parents:

594abde

Message:

Fix unit tests I broke

Location:

router/java

Files:

• src/net/i2p/router/tunnel/HopProcessor.java (modified) (2 diffs)
• src/net/i2p/router/tunnel/InboundEndpointProcessor.java (modified) (1 diff)
• test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java (modified) (1 diff)

router/java/src/net/i2p/router/tunnel/HopProcessor.java

@@ -31 +31 @@
     //static final boolean USE_DOUBLE_IV_ENCRYPTION = true;
     static final int IV_LENGTH = 16;
+
+    /**
+     *  @deprecated used only by unit tests
+     */
+    HopProcessor(I2PAppContext ctx, HopConfig config) {
+        this(ctx, config, createValidator());
+    }
     
-
     public HopProcessor(I2PAppContext ctx, HopConfig config, IVValidator validator) {
         _context = ctx;
@@ -38 +44 @@
         _config = config;
         _validator = validator;
+    }
+
+    /**
+     *  @deprecated used only by unit test constructor
+     */
+    private static IVValidator createValidator() { 
+        // yeah, we'll use an O(1) validator later (e.g. bloom filter)
+        return new HashSetIVValidator();
     }
     

router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java

@@ -22 +22 @@
     //static final boolean USE_ENCRYPTION = HopProcessor.USE_ENCRYPTION;
     
-    /** @deprecated unused */
-    public InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg) {
+    /**
+     *  @deprecated used only by unit tests
+     */
+    InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg) {
         this(ctx, cfg, DummyValidator.getInstance());
     }

router/java/test/junit/net/i2p/router/tunnel/BuildMessageTestStandalone.java

@@ -76 +76 @@
             // this not only decrypts the current hop's record, but encrypts the other records
             // with the reply key
-            BuildRequestRecord req = proc.decrypt(ctx, msg, _peers[i], _privKeys[i]);
+            BuildRequestRecord req = proc.decrypt(msg, _peers[i], _privKeys[i]);
             // If false, no records matched the _peers[i], or the decryption failed
             assertTrue("foo @ " + i, req != null);