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.

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

change(state): Use OrderedUtxo in CheckpointVerifiedBlock #6971

Merged
merged 1 commit into from
Jun 19, 2023

Conversation

upbqdn
Copy link
Member

@upbqdn upbqdn commented Jun 15, 2023

Motivation

After looking into #6912, I realized CheckpointVerifiedBlock and SemanticallyVerifiedBlock are the same, except that the first contains Utxo, and the second OrderedUtxo. This PR makes CheckpointVerifiedBlock use OrderedUtxo as well. This makes the block types the same, which will make the refactor of ContextuallyVerifiedBlockWithTrees simpler since ContextuallyVerifiedBlock uses OrderedUtxo as well.

Solution

Use OrderedUtxo instead of Utxo in CheckpointVerifiedBlock.

Reviewer Checklist

  • Will the PR name make sense to users?
    • Does it need extra CHANGELOG info? (new features, breaking changes, large changes)
  • Are the PR labels correct?
  • Does the code do what the ticket and PR says?
    • Does it change concurrent code, unsafe code, or consensus rules?
  • How do you know it works? Does it have tests?

Follow Up Work

@upbqdn upbqdn added C-cleanup Category: This is a cleanup P-Medium ⚡ labels Jun 15, 2023
@upbqdn upbqdn requested a review from a team as a code owner June 15, 2023 12:09
@upbqdn upbqdn self-assigned this Jun 15, 2023
@upbqdn upbqdn requested review from oxarbitrage and removed request for a team June 15, 2023 12:09
@codecov
Copy link

codecov bot commented Jun 15, 2023

Codecov Report

Merging #6971 (f22a0dd) into main (8a7c871) will increase coverage by 0.05%.
The diff coverage is 86.36%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6971      +/-   ##
==========================================
+ Coverage   77.35%   77.40%   +0.05%     
==========================================
  Files         310      310              
  Lines       41534    41542       +8     
==========================================
+ Hits        32129    32157      +28     
+ Misses       9405     9385      -20     

@upbqdn upbqdn changed the title Use OrderedUtxo in CheckpointVerifiedBlock change(state): Use OrderedUtxo in CheckpointVerifiedBlock Jun 15, 2023
@upbqdn
Copy link
Member Author

upbqdn commented Jun 16, 2023

The CI says "Some checks were not successful", but I didn't manage to find what's wrong.

@upbqdn upbqdn added A-rust Area: Updates to Rust code A-state Area: State / database changes labels Jun 16, 2023
@teor2345
Copy link
Contributor

The CI says "Some checks were not successful", but I didn't manage to find what's wrong.

It's the testnet checkpoint job, due to ongoing testing on testnet. We can ignore these temporary failures. (I think they might be fixed by now, so feel free to restart that job if you want.)

I use Refined GitHub to make the failed jobs sort at the top, it works in every browser I've tried except Firefox:
https://github.com/refined-github/refined-github#-refined-github

@teor2345
Copy link
Contributor

Testnet jobs aren't required, so the PR will merge as soon as Alfredo approves it.

Copy link
Contributor

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

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

looks good to me, thanks.

mergify bot added a commit that referenced this pull request Jun 19, 2023
mergify bot added a commit that referenced this pull request Jun 19, 2023
@mergify mergify bot merged commit abcabd1 into main Jun 19, 2023
@mergify mergify bot deleted the use-ordered-utxos branch June 19, 2023 22:49
mergify bot added a commit that referenced this pull request Jun 19, 2023
@teor2345 teor2345 mentioned this pull request Jun 28, 2023
44 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rust Area: Updates to Rust code A-state Area: State / database changes C-cleanup Category: This is a cleanup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants