From 67d5c82e103f49fb1d624e3ad6908de885c01842 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Sat, 29 Jul 2023 13:34:12 -0600
Subject: [PATCH] codechecks / linter

---
 integration/conftest.py     | 4 ----
 integration/grid.py         | 8 --------
 integration/test_i2p.py     | 9 ++++++---
 integration/test_vectors.py | 2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/integration/conftest.py b/integration/conftest.py
index 55a0bbbb5..a26d2043d 100644
--- a/integration/conftest.py
+++ b/integration/conftest.py
@@ -12,7 +12,6 @@ from time import sleep
 from os import mkdir, environ
 from os.path import join, exists
 from tempfile import mkdtemp
-from json import loads
 
 from eliot import (
     to_file,
@@ -37,12 +36,9 @@ from .util import (
     _create_node,
     _tahoe_runner_optional_coverage,
     await_client_ready,
-    cli,
-    generate_ssh_key,
     block_with_timeout,
 )
 from .grid import (
-    create_port_allocator,
     create_flog_gatherer,
     create_grid,
 )
diff --git a/integration/grid.py b/integration/grid.py
index 79b5b45ad..94f8c3d7f 100644
--- a/integration/grid.py
+++ b/integration/grid.py
@@ -26,7 +26,6 @@ from twisted.python.procutils import which
 from twisted.internet.defer import (
     inlineCallbacks,
     returnValue,
-    maybeDeferred,
     Deferred,
 )
 from twisted.internet.task import (
@@ -36,13 +35,6 @@ from twisted.internet.interfaces import (
     IProcessTransport,
     IProcessProtocol,
 )
-from twisted.internet.endpoints import (
-    TCP4ServerEndpoint,
-)
-from twisted.internet.protocol import (
-    Factory,
-    Protocol,
-)
 from twisted.internet.error import ProcessTerminated
 
 from allmydata.node import read_config
diff --git a/integration/test_i2p.py b/integration/test_i2p.py
index ea3ddb62b..c99c469fa 100644
--- a/integration/test_i2p.py
+++ b/integration/test_i2p.py
@@ -24,6 +24,7 @@ from allmydata.test.common import (
     write_introducer,
 )
 from allmydata.node import read_config
+from allmydata.util.iputil import allocate_tcp_port
 
 
 if which("docker") is None:
@@ -132,8 +133,10 @@ def i2p_introducer_furl(i2p_introducer, temp_dir):
 @pytest_twisted.inlineCallbacks
 @pytest.mark.skip("I2P tests are not functioning at all, for unknown reasons")
 def test_i2p_service_storage(reactor, request, temp_dir, flog_gatherer, i2p_network, i2p_introducer_furl):
-    yield _create_anonymous_node(reactor, 'carol_i2p', request, temp_dir, flog_gatherer, i2p_network, i2p_introducer_furl)
-    yield _create_anonymous_node(reactor, 'dave_i2p', request, temp_dir, flog_gatherer, i2p_network, i2p_introducer_furl)
+    web_port0 = allocate_tcp_port()
+    web_port1 = allocate_tcp_port()
+    yield _create_anonymous_node(reactor, 'carol_i2p', web_port0, request, temp_dir, flog_gatherer, i2p_network, i2p_introducer_furl)
+    yield _create_anonymous_node(reactor, 'dave_i2p', web_port1, request, temp_dir, flog_gatherer, i2p_network, i2p_introducer_furl)
     # ensure both nodes are connected to "a grid" by uploading
     # something via carol, and retrieve it using dave.
     gold_path = join(temp_dir, "gold")
@@ -179,7 +182,7 @@ def test_i2p_service_storage(reactor, request, temp_dir, flog_gatherer, i2p_netw
 
 
 @pytest_twisted.inlineCallbacks
-def _create_anonymous_node(reactor, name, request, temp_dir, flog_gatherer, i2p_network, introducer_furl):
+def _create_anonymous_node(reactor, name, web_port, request, temp_dir, flog_gatherer, i2p_network, introducer_furl):
     node_dir = FilePath(temp_dir).child(name)
 
     print("creating", node_dir.path)
diff --git a/integration/test_vectors.py b/integration/test_vectors.py
index bd5def8c5..1bcbcffa4 100644
--- a/integration/test_vectors.py
+++ b/integration/test_vectors.py
@@ -15,7 +15,7 @@ from pytest_twisted import ensureDeferred
 
 from . import vectors
 from .vectors import parameters
-from .util import reconfigure, upload
+from .util import upload
 from .grid import Client
 
 @mark.parametrize('convergence', parameters.CONVERGENCE_SECRETS)