From a23e09ca2060e5a5e93e806c1d15b4c17380dfaa Mon Sep 17 00:00:00 2001
From: eyedeekay <idk@mulder>
Date: Wed, 18 Oct 2023 18:47:44 -0400
Subject: [PATCH] Router: fix failed ant builds in unit tests
---
router/java/test/junit/net/i2p/router/transport/SSUDemo.java | 5 +++--
.../test/junit/net/i2p/router/transport/udp/UDPFlooder.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/router/java/test/junit/net/i2p/router/transport/SSUDemo.java b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
index 73e8cdd60f..362b554621 100644
--- a/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
+++ b/router/java/test/junit/net/i2p/router/transport/SSUDemo.java
@@ -12,6 +12,7 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.Hash;
import net.i2p.data.router.RouterIdentity;
import net.i2p.data.router.RouterInfo;
+import net.i2p.router.RouterContext;
import net.i2p.data.i2np.DatabaseStoreMessage;
import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.I2NPMessageException;
@@ -181,7 +182,7 @@ public class SSUDemo {
}
private void peerRead(RouterInfo ri) {
- RouterInfo old = _us.netDbSegmentor().store(ri.getIdentity().calculateHash(), ri);
+ RouterInfo old = _us.netDb().store(ri.getIdentity().calculateHash(), ri);
if (old == null)
newPeerRead(ri);
}
@@ -314,7 +315,7 @@ public class SSUDemo {
DatabaseStoreMessage m = (DatabaseStoreMessage)_msg;
System.out.println("RECV: " + m);
try {
- _us.netDbSegmentor().store(m.getKey(), (RouterInfo) m.getEntry());
+ _us.netDb().store(m.getKey(), (RouterInfo) m.getEntry());
} catch (IllegalArgumentException iae) {
iae.printStackTrace();
}
diff --git a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
index e757c8fecc..dd546639bf 100644
--- a/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
+++ b/router/java/test/junit/net/i2p/router/transport/udp/UDPFlooder.java
@@ -83,7 +83,7 @@ class UDPFlooder implements Runnable {
m.setMessageExpiration(_context.clock().now() + 10*1000);
m.setUniqueId(_context.random().nextLong(I2NPMessage.MAX_ID_VALUE));
if (true) {
- RouterInfo to = _context.netDbSegmentor().lookupRouterInfoLocally(peer.getRemotePeer());
+ RouterInfo to = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer());
if (to == null)
continue;
OutNetMessage msg = new OutNetMessage(_context, m, m.getMessageExpiration(), 500, to);
--
GitLab