3 files changed, 9 insertions, 14 deletions
diff --git a/packages/meshbay-node/tests/test_disk_io_off_loop.py b/packages/meshbay-node/tests/test_disk_io_off_loop.py
index e404b47..a94789a 100644
--- a/packages/meshbay-node/tests/test_disk_io_off_loop.py
+++ b/packages/meshbay-node/tests/test_disk_io_off_loop.py
@@ -34,8 +34,7 @@ from meshbay_node.indexer.group_index import GroupIndex
 from meshbay_node.indexer.indexer import DirectoryIndexer
 from meshbay_node.roots import Root, RootSet
 from meshbay_node.transfers import LeaselessReads
-from meshbay_node.transport import webrtc_server
-from meshbay_node.transport.webrtc import files, media_tools
+from meshbay_node.transport.webrtc import files, media_tools, upload_handlers
 from meshbay_node.transport.webrtc_server import WebRTCPeerSession
 from node_source import webrtc_files
 
@@ -316,8 +315,8 @@ def _upload_session(tmp_path):
 
 async def test_a_slow_upload_write_does_not_stop_the_loop(tmp_path, monkeypatch):
     session, shared = _upload_session(tmp_path)
-    monkeypatch.setattr(webrtc_server, "_append_chunk",
-                        _slow(webrtc_server._append_chunk))
+    monkeypatch.setattr(upload_handlers, "_append_chunk",
+                        _slow(upload_handlers._append_chunk))
 
     with _Ticker() as ticker:
         await session._do_file_upload(sealed_upload(
@@ -344,8 +343,8 @@ async def test_chunks_of_one_upload_keep_their_order_under_a_slow_disk(tmp_path,
     session, shared = _upload_session(tmp_path)
     pieces = [b"first-", b"second-", b"third-", b"fourth"]
 
-    monkeypatch.setattr(webrtc_server, "_append_chunk",
-                        _slow(webrtc_server._append_chunk))
+    monkeypatch.setattr(upload_handlers, "_append_chunk",
+                        _slow(upload_handlers._append_chunk))
 
     # Fired together and in order, which is what the dispatcher does: it creates
     # one task per message as it arrives.
diff --git a/packages/meshbay-node/tests/test_security_regressions.py b/packages/meshbay-node/tests/test_security_regressions.py
index 7ace21b..dd859b3 100644
--- a/packages/meshbay-node/tests/test_security_regressions.py
+++ b/packages/meshbay-node/tests/test_security_regressions.py
@@ -29,7 +29,7 @@ def _safe_name_re():
     rather than aborting collection of the whole module and hiding every other
     finding's result.
     """
-    from meshbay_node.transport.webrtc_server import SAFE_UPLOAD_NAME
+    from meshbay_node.roots import SAFE_UPLOAD_NAME
     return SAFE_UPLOAD_NAME
 
 
@@ -122,7 +122,7 @@ def test_upload_rejects_names_that_lie_about_themselves(name):
 
 def test_the_node_never_generates_a_name_it_would_refuse(tmp_path):
     """_free_name resolves a collision by appending " (n)"; that has to be legal."""
-    from meshbay_node.transport.webrtc_server import _free_name
+    from meshbay_node.roots import _free_name
     (tmp_path / "clip.mp4").touch()
     (tmp_path / "clip (1).mp4").touch()
     chosen = _free_name(tmp_path, "clip.mp4")
diff --git a/packages/meshbay-node/tests/test_upload_size_cap.py b/packages/meshbay-node/tests/test_upload_size_cap.py
index dbb14d9..7675f32 100644
--- a/packages/meshbay-node/tests/test_upload_size_cap.py
+++ b/packages/meshbay-node/tests/test_upload_size_cap.py
@@ -19,12 +19,8 @@ from pathlib import Path
 import pytest
 from meshbay_node.config import load_config
 from meshbay_node.roots import RootSet
-from meshbay_node.transport.webrtc_server import (
-    GB_BYTES,
-    MAX_UPLOAD_BYTES,
-    WebRTCPeerSession,
-    WebRTCTransport,
-)
+from meshbay_node.transport.webrtc.upload_handlers import GB_BYTES, MAX_UPLOAD_BYTES
+from meshbay_node.transport.webrtc_server import WebRTCPeerSession, WebRTCTransport
 from node_source import webrtc_source