diff options
author | John Newbery <john@johnnewbery.com> | 2017-03-28 13:41:22 -0400 |
---|---|---|
committer | John Newbery <john@johnnewbery.com> | 2017-03-28 14:16:21 -0400 |
commit | 159fe88abfadf67410578c145e631819cf50b660 (patch) | |
tree | 27ae316eafda9f87fadc4d1a86e51b59c9e288d3 /test/functional/maxblocksinflight.py | |
parent | 79af9fbd8c3c0e54702a9c92b171f134bd4466c8 (diff) | |
download | bitcoin-159fe88abfadf67410578c145e631819cf50b660.tar.xz |
Remove SingleNodeConnCB
This commit merges the NodeConnCB and SingleNodeConnCB into a single
class (called NodeConnCB). The original intent for the NodeConnCB was to
be able to have a python 'mininode' connect to multiple running
bitcoinds. This has never been used and can be achieved more easily by
having multiple NodeConns backed by a common datastore if it is ever
needed.
The changes in mininode.py are just code moves (and merging the two
classes into a single class). The code changes in the individual test
cases are changing the subclasses to subclass from NodeConnCB instead of
SingleNodeConnCB. There is a lot of duplicate code in the subclasses
that can be removed in future commits.
Diffstat (limited to 'test/functional/maxblocksinflight.py')
-rwxr-xr-x | test/functional/maxblocksinflight.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/functional/maxblocksinflight.py b/test/functional/maxblocksinflight.py index 2c3766125a..4ef2a35a44 100755 --- a/test/functional/maxblocksinflight.py +++ b/test/functional/maxblocksinflight.py @@ -17,7 +17,6 @@ from test_framework.util import * MAX_REQUESTS = 128 class TestManager(NodeConnCB): - # set up NodeConnCB callbacks, overriding base class def on_getdata(self, conn, message): self.log.debug("got getdata %s" % repr(message)) # Log the requests @@ -30,11 +29,8 @@ class TestManager(NodeConnCB): if not self.disconnectOkay: raise EarlyDisconnectError(0) - def __init__(self): - NodeConnCB.__init__(self) - def add_new_connection(self, connection): - self.connection = connection + super().add_connection(connection) self.blockReqCounts = {} self.disconnectOkay = False |