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/assumevalid.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/assumevalid.py')
-rwxr-xr-x | test/functional/assumevalid.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/functional/assumevalid.py b/test/functional/assumevalid.py index da680a5d24..a9c2b17b4a 100755 --- a/test/functional/assumevalid.py +++ b/test/functional/assumevalid.py @@ -40,17 +40,14 @@ from test_framework.mininode import (CBlockHeader, CTxOut, NetworkThread, NodeConn, - SingleNodeConnCB, + NodeConnCB, msg_block, msg_headers) from test_framework.script import (CScript, OP_TRUE) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import (start_node, p2p_port, assert_equal) -class BaseNode(SingleNodeConnCB): - def __init__(self): - super().__init__() - +class BaseNode(NodeConnCB): def send_header_for_blocks(self, new_blocks): headers_message = msg_headers() headers_message.headers = [CBlockHeader(b) for b in new_blocks] |