8000 #27307 follow-up: update mempool conflict tests + docs by ishaanam · Pull Request #30365 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Dismiss alert

#27307 follow-up: update mempool conflict tests + docs #30365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 2, 2024
Merged

#27307 follow-up: update mempool conflict tests + docs #30365

merged 1 commit into from
Jul 2, 2024

Conversation

ishaanam
Copy link
Contributor

#27307 follow-up:

  • updates description of mempoolconflicts and walletconflicts in gettransaction
  • adds release notes for 27307
  • removes unnecessary line from wallet_conflicts.py

@DrahtBot
Copy link
Contributor

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/26861809422

@DrahtBot
Copy link
Contributor
DrahtBot commented Jun 30, 2024 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK furszy, fjahr, tdb3, achow101

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #29680 (wallet: fix unrelated parent conflict doesn't cause child tx to be marked as conflict by Eunovo)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

fjahr
fjahr reviewed Jun 30, 2024
View reviewed changes
@DrahtBot DrahtBot mentioned this pull request Jul 1, 2024
Draft
@ishaanam ishaanam force-pushed the mempool_conflicts_follow_up branch from e108d56 to b267a95 Compare July 1, 2024 15:10
furszy
furszy reviewed Jul 1, 2024
View reviewed changes
@ishaanam ishaanam force-pushed the mempool_conflicts_follow_up branch from b267a95 to 7d55796 Compare July 1, 2024 16:27
furszy
furszy reviewed Jul 1, 2024
View reviewed changes
Copy link
Member
@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 7d55796

@fjahr
Copy link
Contributor
fjahr commented Jul 1, 2024

ACK 7d55796

The CI failures are related to #30368, not this change.

tdb3
tdb3 approved these changes Jul 1, 2024
View reviewed changes
Copy link
Contributor
@tdb3 tdb3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 7d55796
Good follow up. Ran wallet_conflicts locally without issue.

@maflcko maflcko added this to the 28.0 milestone Jul 2, 2024
@maflcko maflcko added the Wallet label Jul 2, 2024
@achow101
Copy link
Member
achow101 commented Jul 2, 2024

ACK 7d55796

@achow101 achow101 merged commit 74d6115 into bitcoin:master Jul 2, 2024
14 of 16 checks passed
@bitcoin bitcoin locked and limited conversation to collaborators Jul 2, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fjahr fjahr fjahr left review comments

@furszy furszy furszy left review comments

@tdb3 tdb3 tdb3 approved these changes

Assignees
No one assigned
Labels
CI failed Wallet
Projects
None yet
Milestone
28.0
Development

Successfully merging this pull request may close these issues.
7 participants
@ishaanam @DrahtBot @fjahr @achow101 @furszy @tdb3 @maflcko
0