diff options
| author | John Newbery <john@johnnewbery.com> | 2020-11-28 11:41:25 +0000 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2021-02-17 09:00:53 +0000 |
| commit | 7e158a69104831611462cb555da931331b237c78 (patch) | |
| tree | f971e3a91e458b076d793fa801e759a581cd955a /test/functional/test_framework/p2p.py | |
| parent | 652311165c4ef298dab71d7162f9054abf439f77 (diff) | |
| download | bitcoin-7e158a69104831611462cb555da931331b237c78.tar.xz | |
[test] Move MY_VERSION to p2p.py
The messages.py module should contain code and helpers for
[de]serializing p2p messages. Specific usage of those messages should
be in p2p.py. Therefore move MY_VERSION to p2p.py.
Also rename to P2P_VERSION to distinguish it from
other versioning used in Bitcoin/Bitcoin Core.
Also always set the nVersion field in CBlockLocator to 0 and ignore the
field in deserialized messages. The field is not currently used for
anything in Bitcoin Core.
Diffstat (limited to 'test/functional/test_framework/p2p.py')
| -rwxr-xr-x | test/functional/test_framework/p2p.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/test_framework/p2p.py b/test/functional/test_framework/p2p.py index befadc894f..998763ff4d 100755 --- a/test/functional/test_framework/p2p.py +++ b/test/functional/test_framework/p2p.py @@ -80,6 +80,9 @@ logger = logging.getLogger("TestFramework.p2p") # The minimum P2P version that this test framework supports MIN_P2P_VERSION_SUPPORTED = 60001 +# The P2P version that this test framework implements and sends in its `version` message +# Version 70016 supports wtxid relay +P2P_VERSION = 70016 MESSAGEMAP = { b"addr": msg_addr, @@ -329,6 +332,7 @@ class P2PInterface(P2PConnection): def peer_connect_send_version(self, services): # Send a version msg vt = msg_version() + vt.nVersion = P2P_VERSION vt.nServices = services vt.addrTo.ip = self.dstaddr vt.addrTo.port = self.dstport |