sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #19599: test: clean message_count and last_message

Browse Source 
2c6a02e0248825e205e6deea4c38409044feb4ab Clean message_count and last_message (Troy Giorshev)

Pull request description:

  From #19580

  This PR changes comments to clarify the intended usage of `message_count` and `last_message`.  Additionally it changes the only usage of `message_count` to use `last_message` instead, bringing the code into alignment with the intended usage.

  Note: Now `message_count` is completely unused.  However, it is ready to be used (i.e. the supporting code works) and likely will be used in some test in the future.

ACKs for top commit:
  jnewbery:
    utACK 2c6a02e0248825e205e6deea4c38409044feb4ab

Tree-SHA512: 07c7684c9586de4f845e10d7aac36c1aab9fb56b409949c1c70d5ca705bc3971ca7d5943245a0472def4efd7b4e1c5dad2f713db5ead8fca08404daf4891e98b
This commit is contained in:
MarcoFalke 2020-07-30 09:15:46 +02:00 committed by Pasta
parent 0fe3dc8c0a
commit 6d48f06071
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/test_framework/mininode.py
View File

@ -305,9 +305,13 @@ class P2PInterface(P2PConnection):
def __init__(self, support_addrv2=False): def __init__(self, support_addrv2=False):
super().__init__() super().__init__()
# Track number of messages of each type received and the most recent # Track number of messages of each type received.
# message of each type # Should be read-only in a test.
self.message_count = defaultdict(int) self.message_count = defaultdict(int)
# Track the most recent message of each type.
# To wait for a message to be received, pop that message from
# this and use wait_until.
self.last_message = {} self.last_message = {}
# A count of the number of ping messages we've sent to the node # A count of the number of ping messages we've sent to the node
@ -489,7 +493,7 @@ class P2PInterface(P2PConnection):
def wait_for_verack(self, timeout=60): def wait_for_verack(self, timeout=60):
def test_function(): def test_function():
return self.message_count["verack"] return "verack" in self.last_message
wait_until(test_function, timeout=timeout, lock=mininode_lock) wait_until(test_function, timeout=timeout, lock=mininode_lock)