From 7cc8666061e285c13bc242fa1be1f1fab99ed6af Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Mon, 16 Sep 2024 15:11:03 +0000
Subject: [PATCH] follow-up testnet4 stuff: trivial clean-up

re https://github.com/spesmilo/electrum/pull/9197

localhost in servers list should only be for regtest-like networks
---
 electrum/constants.py          | 2 --
 electrum/servers_testnet4.json | 6 ------
 electrum/simple_config.py      | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/electrum/constants.py b/electrum/constants.py
index 7e95f9448..b3b2f8e9e 100644
--- a/electrum/constants.py
+++ b/electrum/constants.py
@@ -158,8 +158,6 @@ class BitcoinTestnet(AbstractNet):
 class BitcoinTestnet4(BitcoinTestnet):
 
     NET_NAME = "testnet4"
-    SEGWIT_HRP = "tb"
-    BOLT11_HRP = SEGWIT_HRP
     GENESIS = "00000000da84f2bafbbc53dee25a72ae507ff4914b867c565be350b0da8bf043"
     DEFAULT_SERVERS = read_json('servers_testnet4.json', {})
     CHECKPOINTS = read_json('checkpoints_testnet4.json', [])
diff --git a/electrum/servers_testnet4.json b/electrum/servers_testnet4.json
index 37145d442..3069a1607 100644
--- a/electrum/servers_testnet4.json
+++ b/electrum/servers_testnet4.json
@@ -1,10 +1,4 @@
 {
-    "127.0.0.1": {
-        "pruning": "-",
-        "s": "51002",
-        "t": "51001",
-        "version": "1.4"
-    },
     "testnet4-electrumx.wakiyamap.dev": {
         "pruning": "-",
         "s": "51002",
diff --git a/electrum/simple_config.py b/electrum/simple_config.py
index 914fe212c..40ee656a5 100644
--- a/electrum/simple_config.py
+++ b/electrum/simple_config.py
@@ -253,7 +253,7 @@ class SimpleConfig(Logger):
         if self.get('testnet'):
             path = os.path.join(path, 'testnet')
             make_dir(path, allow_symlink=False)
-        if self.get('testnet4'):
+        elif self.get('testnet4'):
             path = os.path.join(path, 'testnet4')
             make_dir(path, allow_symlink=False)
         elif self.get('regtest'):