fix: resolve conflict descendants #3264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhangsoledad
force-pushed
the
zhangsoledad/resolve_conflict_descendants
branch
from
dc47d53
to
c25306c
Compare
quake
requested changes
Jan 4, 2022
quake
reviewed
Jan 4, 2022
quake
approved these changes
Jan 4, 2022
zhangsoledad
force-pushed
the
zhangsoledad/resolve_conflict_descendants
branch
from
641ec4a
to
f382e8a
Compare
chanhsu001
requested review from
yangby-cryptape
and removed request for
chanhsu001
yangby-cryptape
approved these changes
Jan 6, 2022
|
bors r=quake,yangby-cryptape |
Merged
bors bot
added a commit
that referenced
this pull request
Jan 10, 2022
3270: fix pending leak r=quake,yangby-cryptape a=zhangsoledad <!-- Thank you for contributing to nervosnetwork/ckb! If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document. If you're unsure about anything, just ask; somebody should be along to answer within a day or two. PR Title Format: 1. module [, module2, module3]: what's changed 2. *: what's changed --> ### What is changed and how it works? fix memory leak introduce from #3264 ### Check List <!--REMOVE the items that are not applicable--> Tests <!-- At least one of them must be included. --> - Unit test previous will get failures: component::tests::pending::test_basic component::tests::pending::test_fill_proposals component::tests::pending::test_resolve_conflict_header_dep ``` failures: ---- component::tests::pending::test_basic stdout ---- thread 'component::tests::pending::test_basic' panicked at 'assertion failed: `(left == right)` left: `8`, right: `4`', tx-pool/src/component/tests/pending.rs:26:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ---- component::tests::pending::test_fill_proposals stdout ---- thread 'component::tests::pending::test_fill_proposals' panicked at 'assertion failed: `(left == right)` left: `13`, right: `7`', tx-pool/src/component/tests/pending.rs:204:5 ---- component::tests::pending::test_resolve_conflict_header_dep stdout ---- thread 'component::tests::pending::test_resolve_conflict_header_dep' panicked at 'assertion failed: `(left == right)` left: `4`, right: `2`', tx-pool/src/component/tests/pending.rs:121:5 ``` ### Release note <!-- Choose from None, Title Only and Note. Bugfixes or new features need a release note. --> ```release-note None: Exclude this PR from the release note. Title Only: Include only the PR title in the release note. Note: Add a note under the PR title in the release note. ``` Co-authored-by: zhangsoledad <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Previously, pending transaction removed but descendants remain.
What is changed and how it works?
Check List
Tests
Release note