open.source/magic-wormhole-transit-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transit is no longer a factory

Browse Source
This commit is contained in:
meejah 2021-03-04 22:37:15 -07:00
parent 5df5f86e42
commit 21af1f68a3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wormhole_transit_relay/test/common.py
View File

@ -10,8 +10,9 @@ from zope.interface import (
) )
from ..transit_server import ( from ..transit_server import (
Transit, Transit,
TransitConnection,
) )
from ..transit_server import Transit from twisted.internet.protocol import ServerFactory
from ..server_state import create_usage_tracker from ..server_state import create_usage_tracker

10
src/wormhole_transit_relay/test/test_transit_server.py
View File

@ -19,7 +19,7 @@ class _Transit:
return sum([ return sum([
len(potentials) len(potentials)
for potentials for potentials
in self._transit_server.pending_requests._requests.values() in self._transit.pending_requests._requests.values()
]) ])
def test_blur_size(self): def test_blur_size(self):
@ -54,7 +54,7 @@ class _Transit:
self.assertEqual(self.count(), 0) self.assertEqual(self.count(), 0)
# the token should be removed too # the token should be removed too
self.assertEqual(len(self._transit_server.pending_requests._requests), 0) self.assertEqual(len(self._transit.pending_requests._requests), 0)
def test_both_unsided(self): def test_both_unsided(self):
p1 = self.new_protocol() p1 = self.new_protocol()
@ -190,8 +190,8 @@ class _Transit:
p3.send(handshake(token1, side=side2)) p3.send(handshake(token1, side=side2))
self.flush() self.flush()
self.assertEqual(self.count(), 0) self.assertEqual(self.count(), 0)
self.assertEqual(len(self._transit_server.pending_requests._requests), 0) self.assertEqual(len(self._transit.pending_requests._requests), 0)
self.assertEqual(len(self._transit_server.active_connections._connections), 2) self.assertEqual(len(self._transit.active_connections._connections), 2)
# That will trigger a disconnect on exactly one of (p1 or p2). # That will trigger a disconnect on exactly one of (p1 or p2).
# The other connection should still be connected # The other connection should still be connected
self.assertEqual(sum([int(t.connected) for t in [p1, p2]]), 1) self.assertEqual(sum([int(t.connected) for t in [p1, p2]]), 1)
@ -347,7 +347,7 @@ class Usage(ServerBase, unittest.TestCase):
def setUp(self): def setUp(self):
super(Usage, self).setUp() super(Usage, self).setUp()
self._usage = MemoryUsageRecorder() self._usage = MemoryUsageRecorder()
self._transit_server.usage.add_backend(self._usage) self._transit.usage.add_backend(self._usage)
def test_empty(self): def test_empty(self):
p1 = self.new_protocol() p1 = self.new_protocol()