diff options
| author | Russell Yanofsky <[email protected]> | 2016-10-24 15:33:14 -0400 |
|---|---|---|
| committer | Russell Yanofsky <[email protected]> | 2016-11-02 15:35:11 -0400 |
| commit | 47e9659ecfbe07077a4564591095bd5510e0f917 (patch) | |
| tree | 753b4375529597fcaf5900bfb533a11c2989f47c /src/bitcoin-cli.cpp | |
| parent | Merge #9043: [qt] Return useful error message on ATMP failure (diff) | |
| download | discoin-47e9659ecfbe07077a4564591095bd5510e0f917.tar.xz discoin-47e9659ecfbe07077a4564591095bd5510e0f917.zip | |
[qa] Fix bug in compactblocks v2 merge
Bug caused the wait_for_block_announcement to be called on the wrong node,
leading to nondeterminism and occasional test failures. Bug was introduced in
merge commit:
d075479 Merge #8882: [qa] Fix race conditions in p2p-compactblocks.py and sendheaders.py
Underlying commits which conflicted were:
27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2
6976db2 [qa] Another attempt to fix race condition in p2p-compactblocks.py
The first commit changed the test_compactblock_construction function signature
and second commit added code which wasn't updated during the merge to use the
new arguments.
Suhas Daftuar <[email protected]> noticed the bug and suggested the fix.
Diffstat (limited to 'src/bitcoin-cli.cpp')
0 files changed, 0 insertions, 0 deletions