tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Simplify more.

This commit is contained in:
Itamar Turner-Trauring 2022-07-29 10:51:17 -04:00
parent d4c73f19fe
commit 8b3280bf31
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/protocol_switch.py
View File

@ -63,9 +63,6 @@ class _FoolscapOrHttps(Protocol, metaclass=_PretendToBeNegotiation):
# The tub that created us: # The tub that created us:
tub: Tub tub: Tub
# This is an instance attribute; it will be set in connectionMade().
_timeout: IDelayedCall
@classmethod @classmethod
def add_storage_server( def add_storage_server(
cls, storage_server: StorageServer, swissnum: bytes cls, storage_server: StorageServer, swissnum: bytes
@ -117,7 +114,6 @@ class _FoolscapOrHttps(Protocol, metaclass=_PretendToBeNegotiation):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self._foolscap: Negotiation = Negotiation(*args, **kwargs) self._foolscap: Negotiation = Negotiation(*args, **kwargs)
self._buffer: bytes = b""
def __setattr__(self, name, value): def __setattr__(self, name, value):
if name in {"_foolscap", "_buffer", "transport", "__class__", "_timeout"}: if name in {"_foolscap", "_buffer", "transport", "__class__", "_timeout"}:
@ -139,12 +135,15 @@ class _FoolscapOrHttps(Protocol, metaclass=_PretendToBeNegotiation):
# After creation, a Negotiation instance either has initClient() or # After creation, a Negotiation instance either has initClient() or
# initServer() called. Since this is a client, we're never going to do # initServer() called. Since this is a client, we're never going to do
# HTTP, so we can immediately become a Negotiation instance. # HTTP, so we can immediately become a Negotiation instance.
assert not self._buffer assert not hasattr(self, "_buffer")
self._convert_to_negotiation() self._convert_to_negotiation()
return self.initClient(*args, **kwargs) return self.initClient(*args, **kwargs)
def connectionMade(self): def connectionMade(self):
self._timeout = reactor.callLater(30, self.transport.abortConnection) self._buffer: bytes = b""
self._timeout: IDelayedCall = reactor.callLater(
30, self.transport.abortConnection
)
def dataReceived(self, data: bytes) -> None: def dataReceived(self, data: bytes) -> None:
"""Handle incoming data. """Handle incoming data.