LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[tests] define NODE_NETWORK_LIMITED in test framework

Browse source
This commit is contained in:
John Newbery 2017-12-11 11:56:24 -05:00
parent 1285312048
commit dbfe294805
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/functional/node_network_limited.py
View file

@ -3,7 +3,7 @@
# Distributed under the MIT software license, see the accompanying # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
from test_framework.messages import CInv, msg_getdata, msg_verack from test_framework.messages import CInv, msg_getdata, msg_verack
from test_framework.mininode import NetworkThread, P2PInterface from test_framework.mininode import NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS, NetworkThread, P2PInterface
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal from test_framework.util import assert_equal
@ -47,11 +47,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
def run_test(self): def run_test(self):
# NODE_BLOOM & NODE_WITNESS & NODE_NETWORK_LIMITED must now be signaled # NODE_BLOOM & NODE_WITNESS & NODE_NETWORK_LIMITED must now be signaled
assert_equal(self.get_signalled_service_flags(), 1036) # 1036 == 0x40C == 0100 0000 1100 assert_equal(self.get_signalled_service_flags(), NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED)
# | ||
# | |^--- NODE_BLOOM
# | ^---- NODE_WITNESS
# ^-- NODE_NETWORK_LIMITED
# Now mine some blocks over the NODE_NETWORK_LIMITED + 2(racy buffer ext.) target # Now mine some blocks over the NODE_NETWORK_LIMITED + 2(racy buffer ext.) target
firstblock = self.nodes[0].generate(1)[0] firstblock = self.nodes[0].generate(1)[0]
@ -66,10 +62,10 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
# NODE_NETWORK_LIMITED must still be signaled after restart # NODE_NETWORK_LIMITED must still be signaled after restart
self.restart_node(0) self.restart_node(0)
assert_equal(self.get_signalled_service_flags(), 1036) assert_equal(self.get_signalled_service_flags(), NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED)
# Test the RPC service flags # Test the RPC service flags
assert_equal(self.nodes[0].getnetworkinfo()['localservices'], "000000000000040c") assert_equal(int(self.nodes[0].getnetworkinfo()['localservices'], 16), NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED)
# getdata a block above the NODE_NETWORK_LIMITED threshold must be possible # getdata a block above the NODE_NETWORK_LIMITED threshold must be possible
self.try_get_block_via_getdata(block_within_limited_range, False) self.try_get_block_via_getdata(block_within_limited_range, False)

3
test/functional/test_framework/messages.py
View file

@ -38,10 +38,11 @@ COIN = 100000000 # 1 btc in satoshis
NODE_NETWORK = (1 << 0) NODE_NETWORK = (1 << 0)
# NODE_GETUTXO = (1 << 1) # NODE_GETUTXO = (1 << 1)
# NODE_BLOOM = (1 << 2) NODE_BLOOM = (1 << 2)
NODE_WITNESS = (1 << 3) NODE_WITNESS = (1 << 3)
NODE_UNSUPPORTED_SERVICE_BIT_5 = (1 << 5) NODE_UNSUPPORTED_SERVICE_BIT_5 = (1 << 5)
NODE_UNSUPPORTED_SERVICE_BIT_7 = (1 << 7) NODE_UNSUPPORTED_SERVICE_BIT_7 = (1 << 7)
NODE_NETWORK_LIMITED = (1 << 10)
# Serialization/deserialization tools # Serialization/deserialization tools
def sha256(s): def sha256(s):