remove hard-coded tor/i2p in hide-ip support

src/allmydata/scripts/create_node.py

@@ -24,6 +24,7 @@ from allmydata.scripts.common import (
     write_introducer,
 )
 from allmydata.scripts.default_nodedir import _default_nodedir
+from allmydata.util import dictutil
 from allmydata.util.assertutil import precondition
 from allmydata.util.encodingutil import listdir_unicode, argv_to_unicode, quote_local_unicode_path, get_io_encoding
 
@@ -183,11 +184,17 @@ class _CreateBaseOptions(BasedirOptions):
     def postOptions(self):
         super(_CreateBaseOptions, self).postOptions()
         if self['hide-ip']:
-            if not (_LISTENERS["tor"].is_available() or _LISTENERS["i2p"].is_available()):
+            ip_hiders = dictutil.filter(lambda v: v.can_hide_ip(), _LISTENERS)
+            available = dictutil.filter(lambda v: v.is_available(), ip_hiders)
+            if not available:
                 raise UsageError(
-                    "--hide-ip was specified but neither 'txtorcon' nor 'txi2p' "
+                    "--hide-ip was specified but no IP-hiding listener is installed.\n"
-                    "are installed.\nTo do so:\n   pip install tahoe-lafs[tor]\nor\n"
+                    "Try one of these:\n" +
-                    "   pip install tahoe-lafs[i2p]"
+                    "".join([
+                        f"\tpip install tahoe-lafs[{name}]\n"
+                        for name
+                        in ip_hiders
+                    ])
                 )
 
 class CreateClientOptions(_CreateBaseOptions):

src/allmydata/util/dictutil.py

@@ -2,6 +2,23 @@
 Tools to mess with dicts.
 """
 
+from __future__ import annotations
+from typing import Callable, TypeVar
+
+K = TypeVar("K")
+V = TypeVar("V")
+
+def filter(pred: Callable[[V], bool], orig: dict[K, V]) -> dict[K, V]:
+    """
+    Filter out key/value pairs that fail to match a predicate.
+    """
+    return {
+        k: v
+        for (k, v)
+        in orig.items()
+        if pred(v)
+    }
+
 class DictOfSets(dict):
     def add(self, key, value):
         if key in self: