Skip to content
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

Refactor TxGraph::walk_conflicts to check for ancestors #1100

Closed
wants to merge 6 commits into from
Closed

Refactor TxGraph::walk_conflicts to check for ancestors #1100

wants to merge 6 commits into from

Conversation

LagginTimes
Copy link
Contributor

@LagginTimes LagginTimes commented Aug 28, 2023 •
edited
Loading

Description

Implementation for #1099.

This PR builds off of #1064 and refactors TxGraph::walk_conflicts to check for conflicts in ancestor transactions by using a new TxAncestors iterator in TxGraph.

Changelog notice

  • Introduced TxGraph::TxAncestors iterator
  • Refactored TxGraph::walk_conflicts to use TxGraph::TxAncestors
  • Added walk_ancestors to TxGraph

All Submissions:

  • I've signed all my commits
  • I followed the contribution guidelines
  • I ran cargo fmt and cargo clippy before committing

New Features:

  • I've added tests for the new feature
  • I've added docs for the new feature

@LagginTimes LagginTimes marked this pull request as draft August 28, 2023 12:09
@LagginTimes LagginTimes force-pushed the refactor_walk_conflicts branch 2 times, most recently from 105df7a to 85fdfae Compare August 28, 2023 14:14
@LagginTimes LagginTimes marked this pull request as ready for review August 28, 2023 14:21
@LagginTimes LagginTimes force-pushed the refactor_walk_conflicts branch 2 times, most recently from f61b79e to eaefc3e Compare August 29, 2023 07:39
@LagginTimes
test(chain): add TxTemplate tests for TxGraph conflicts
1b2d552 
The failing tests are commented out.

Signed-off-by: Wei Chen <wzc110@gmail.com>
@LagginTimes
fix(chain): add check for ancestor tx conflicts in TxGraph
6e75d05 
`TxGraph::try_get_chain_position` traverses ancestors so we do
not skip conflicts.

fix(chain): add check for ancestor tx conflicts in `TxGraph`

Signed-off-by: Wei Chen <wzc110@gmail.com>
@LagginTimes
chore(chain): rm test_indexed_tx_graph.rs
9aa22dd 
Signed-off-by: Wei Chen <wzc110@gmail.com>
@LagginTimes
fix(chain): TxInTemplate::Bogus properly generates random `Outpoint…
760eaa2 
…` data
@LagginTimes
refactor(chain): check ancestors for conflicts in `TxGraph::walk_conf…
9e5926b 
…licts`
@LagginTimes
test(chain): add TxGraph::walk_ancestors tests
24e9cdf
@LagginTimes LagginTimes force-pushed the refactor_walk_conflicts branch from 73dc671 to 24e9cdf Compare August 31, 2023 08:39
@evanlinjin
Copy link
Member

Closing as these changes are merged into #1064

@evanlinjin evanlinjin closed this Sep 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LagginTimes @evanlinjin