Page MenuHomePhabricator

Merge #12206: qa: Sync with validationinterface queue in sync_mempools
ClosedPublic

Authored by jasonbcox on May 6 2019, 23:49.

Details

Summary

fa1e69e qa: Sync with validationinterface queue in sync_mempools (MarcoFalke)

Pull request description:

Commit e545dedf72bff2bd41c93c93eb576929fce37112 moved `TransactionAddedToMempool` to the background scheduler thread. Thus, adding a transaction to the mempool will no longer add it to the wallet immediately. Functional tests, that `sync_mempools` and then call into wallet rpcs will race against the scheduler thread.

Fix that race by flushing the scheduler queue.

Fixes #12205; Fixes #12171;
References #9584;

Tree-SHA512: 14d99cff9c4756de9fad412f04e6d8e25bb9a0938f24ed8348de79df5b4ee67763dac5214b1a69e77e60787d81ee642976d1482b1b5637edfc4892a238ed22af

Backport Core PR 12206
https://github.com/bitcoin/bitcoin/pull/12206/files

Test Plan

make check
test_runner.py

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jasonbcox created this revision.May 6 2019, 23:49
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 6 2019, 23:49
Fabien accepted this revision.May 7 2019, 10:02
Fabien added inline comments.
src/rpc/blockchain.cpp
1882 ↗(On Diff #8437)

Nit: sort and align

This revision is now accepted and ready to land.May 7 2019, 10:02
jasonbcox updated this revision to Diff 8486.May 7 2019, 23:45

Sort + align

This revision was automatically updated to reflect the committed changes.