From c25d54784887524469854aa0a860ea173cf98dc0 Mon Sep 17 00:00:00 2001
From: eyedeekay <idk@mulder>
Date: Fri, 27 Oct 2023 09:31:21 -0400
Subject: [PATCH] Router: get rid of isMultihomeDb
---
.../kademlia/FloodfillNetworkDatabaseFacade.java | 2 --
.../kademlia/KademliaNetworkDatabaseFacade.java | 15 ---------------
2 files changed, 17 deletions(-)
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index a1dc21cb3a..646f7985d4 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -477,8 +477,6 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
@Override
public boolean floodfillEnabled() {
- if (isMultihomeDb())
- return _context.netDb().floodfillEnabled();
return _floodfillEnabled;
}
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 620425b9da..cc5bc77ca2 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -356,21 +356,6 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad
return false;
}
-
- /**
- * Checks if the current database is a multihome database.
- *
- * @return true if the current database is a multihome database, false otherwise.
- * @since 0.9.60
- */
- public boolean isMultihomeDb() {
- // This is a null check in disguise, don't use .equals() here.
- // FNDS.MAIN_DBID is always null, and if _dbid is null it is not the multihome Db
- if (_dbid == FloodfillNetworkDatabaseSegmentor.MAIN_DBID)
- return false;
- return false;
- }
-
public synchronized void startup() {
_log.info("Starting up the kademlia network database");
RouterInfo ri = _context.router().getRouterInfo();
--
GitLab