diff options
| author | Suhas Daftuar <sdaftuar@chaincode.com> | 2016-04-19 16:18:38 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-06-10 00:20:33 +0200 |
| commit | 7a8348994bb7b86a0445f8e333b3b1dc27252753 (patch) | |
| tree | a8743d47630b11ae04e6a8c73ab859baba16fdc2 | |
| parent | e0b1bbeae026859540c62247156b8839d556ee9a (diff) | |
| download | bitcoin-7a8348994bb7b86a0445f8e333b3b1dc27252753.tar.xz | |
Tests: Fix deserialization of reject messages
Github-Pull: #7912
Rebased-From: 807fa47a1e5c9f072d7dbf549bf17f66c47dbf46
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index c0bb123cd1..ece5a15589 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -983,6 +983,7 @@ class msg_headers(object): class msg_reject(object): command = b"reject" + REJECT_MALFORMED = 1 def __init__(self): self.message = b"" @@ -994,14 +995,16 @@ class msg_reject(object): self.message = deser_string(f) self.code = struct.unpack("<B", f.read(1))[0] self.reason = deser_string(f) - if (self.message == "block" or self.message == "tx"): + if (self.code != self.REJECT_MALFORMED and + (self.message == b"block" or self.message == b"tx")): self.data = deser_uint256(f) def serialize(self): r = ser_string(self.message) r += struct.pack("<B", self.code) r += ser_string(self.reason) - if (self.message == "block" or self.message == "tx"): + if (self.code != self.REJECT_MALFORMED and + (self.message == b"block" or self.message == b"tx")): r += ser_uint256(self.data) return r |