aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDagur Valberg Johannsson <dagurval@pvv.ntnu.no>2016-10-09 15:47:55 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2016-10-13 20:35:33 +0200
commitcc6f55191a75dafa669fc6ee93ed86d860eb0d4a (patch)
treeb61b4bf592678dd95593f37844e97149a59468b4
parent4bb9ce8a958f5a55d6a72330728b7fc3b5c820c0 (diff)
downloadbitcoin-cc6f55191a75dafa669fc6ee93ed86d860eb0d4a.tar.xz
[qa] Fix compact block shortids for a test case
Github-Pull: #8904 Rebased-From: 4cdece40419bcc97345357f9268e03b0aff400b5
-rwxr-xr-xqa/rpc-tests/p2p-compactblocks.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py
index cdcfb36e7b..e7f5a1c9c6 100755
--- a/qa/rpc-tests/p2p-compactblocks.py
+++ b/qa/rpc-tests/p2p-compactblocks.py
@@ -402,7 +402,9 @@ class CompactBlocksTest(BitcoinTestFramework):
comp_block = HeaderAndShortIDs()
comp_block.header = CBlockHeader(block)
comp_block.nonce = 0
- comp_block.shortids = [1] # this is useless, and wrong
+ [k0, k1] = comp_block.get_siphash_keys()
+ comp_block.shortids = [
+ calculate_shortid(k0, k1, block.vtx[0].sha256) ]
test_node.send_and_ping(msg_cmpctblock(comp_block.to_p2p()))
assert_equal(int(node.getbestblockhash(), 16), block.hashPrevBlock)
# Expect a getblocktxn message.