GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ed49203daa into merged_master (Bitcoin PR #21357)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-28 13:58:19 +00:00
commit c1cf0e6fa4
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1504,13 +1504,11 @@ class msg_version:
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
if self.nVersion >= 70001:
# Relay field is optional for version 70001 onwards
try:
self.relay = struct.unpack("<b", f.read(1))[0]
except:
self.relay = 0
else:
# Relay field is optional for version 70001 onwards
# But, unconditionally check it to match behaviour in bitcoind
try:
self.relay = struct.unpack("<b", f.read(1))[0]
except struct.error:
self.relay = 0
def serialize(self):