aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p-feefilter.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-03-28 13:41:22 -0400
committerJohn Newbery <john@johnnewbery.com>2017-03-28 14:16:21 -0400
commit159fe88abfadf67410578c145e631819cf50b660 (patch)
tree27ae316eafda9f87fadc4d1a86e51b59c9e288d3 /test/functional/p2p-feefilter.py
parent79af9fbd8c3c0e54702a9c92b171f134bd4466c8 (diff)
downloadbitcoin-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/p2p-feefilter.py')
-rwxr-xr-xtest/functional/p2p-feefilter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/p2p-feefilter.py b/test/functional/p2p-feefilter.py
index d8f07700d0..12539be950 100755
--- a/test/functional/p2p-feefilter.py
+++ b/test/functional/p2p-feefilter.py
@@ -24,9 +24,9 @@ def allInvsMatch(invsExpected, testnode):
# TestNode: bare-bones "peer". Used to track which invs are received from a node
# and to send the node feefilter messages.
-class TestNode(SingleNodeConnCB):
+class TestNode(NodeConnCB):
def __init__(self):
- SingleNodeConnCB.__init__(self)
+ super().__init__()
self.txinvs = []
def on_inv(self, conn, message):