Merge JoinMarket-Org/joinmarket-clientserver#1699: Remove Ilita IRC, re-enable hackint

954dc36e75 Remove Ilita IRC, re-enable hackint (Kristaps Kaupe)

Pull request description:

  Ilita isn't working for me, but have seen no problems with both darkscience and hackint recently. More resiliance with messaging channels is better.

  Also changed `[MESSAGING:server1]` and `[MESSAGING:server2]` to `[MESSAGING:darkscience]` and `[MESSAGING:hackint]`.

ACKs for top commit:
  roshii:
    utACK 954dc36e75

Tree-SHA512: 77d9030189f34c22c78a7d8b94fb5c8e07bdf7c56317b1e0f98200c33e483572228785b345ad7148791bc55be85dfa6f3ad39a3237b87902efde650f8c8508ec

src/jmclient/configure.py

@@ -189,7 +189,7 @@ regtest_count = 0,0
 
 ## IRC SERVER 1: Darkscience IRC (Tor, IP)
 ################################################################################
-[MESSAGING:server1]
+[MESSAGING:darkscience]
 # by default the legacy format without a `type` field is
 # understood to be IRC, but you can, optionally, add it:
 # type = irc
@@ -207,35 +207,23 @@ socks5 = true
 socks5_host = localhost
 socks5_port = 9050
 
-## IRC SERVER 2: ILITA IRC (optional IRC alternate, Tor only)
-################################################################################
-[MESSAGING:server2]
+# IRC SERVER 2: (backup) hackint IRC (Tor, IP)
+###############################################################################
+[MESSAGING:hackint]
 channel = joinmarket-pit
+# For traditional IP:
+# host = irc.hackint.org
+# port = 6697
+# usessl = true
+# socks5 = false
+# For Tor (default):
+host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
 port = 6667
 usessl = false
 socks5 = true
 socks5_host = localhost
-
-host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion
 socks5_port = 9050
 
-## IRC SERVER 3: (backup) hackint IRC (Tor, IP)
-################################################################################
-#[MESSAGING:server3]
-# channel = joinmarket-pit
-# For traditional IP:
-## host = irc.hackint.org
-## port = 6697
-## usessl = true
-## socks5 = false
-# For Tor (default):
-#host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
-#port = 6667
-#usessl = false
-#socks5 = true
-#socks5_host = localhost
-#socks5_port = 9050
-
 [LOGGING]
 # Set the log level for the output to the terminal/console
 # Possible choices: DEBUG / INFO / WARNING / ERROR