DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generalize mininode.py protocol versioning

Browse Source
This commit is contained in:
Larry Ruane
2018-08-02 20:30:20 -06:00
parent 871e1726c6
commit c0aa34a4b2
4 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qa/rpc-tests/p2p_node_bloom.py
View File

@@ -4,7 +4,7 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
from test_framework.mininode import NodeConn, NodeConnCB, NetworkThread, \
msg_filteradd, msg_filterclear, mininode_lock, MY_VERSION
msg_filteradd, msg_filterclear, mininode_lock, SPROUT_PROTO_VERSION
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import initialize_chain_clean, start_nodes, \
p2p_port, assert_equal
@@ -72,10 +72,10 @@ class NodeBloomTest(BitcoinTestFramework):
# Verify mininodes are connected to zcashd nodes
peerinfo = self.nodes[0].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(1, versions.count(MY_VERSION))
assert_equal(1, versions.count(SPROUT_PROTO_VERSION))
peerinfo = self.nodes[1].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(1, versions.count(MY_VERSION))
assert_equal(1, versions.count(SPROUT_PROTO_VERSION))
# Mininodes send filterclear message to zcashd node.
nobf_node.send_message(msg_filterclear())
@@ -86,10 +86,10 @@ class NodeBloomTest(BitcoinTestFramework):
# Verify mininodes are still connected to zcashd nodes
peerinfo = self.nodes[0].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(1, versions.count(MY_VERSION))
assert_equal(1, versions.count(SPROUT_PROTO_VERSION))
peerinfo = self.nodes[1].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(1, versions.count(MY_VERSION))
assert_equal(1, versions.count(SPROUT_PROTO_VERSION))
# Mininodes send filteradd message to zcashd node.
nobf_node.send_message(msg_filteradd())
@@ -100,10 +100,10 @@ class NodeBloomTest(BitcoinTestFramework):
# Verify NoBF mininode has been dropped, and BF mininode is still connected.
peerinfo = self.nodes[0].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(0, versions.count(MY_VERSION))
assert_equal(0, versions.count(SPROUT_PROTO_VERSION))
peerinfo = self.nodes[1].getpeerinfo()
versions = [x["version"] for x in peerinfo]
assert_equal(1, versions.count(MY_VERSION))
assert_equal(1, versions.count(SPROUT_PROTO_VERSION))
[ c.disconnect_node() for c in connections ]