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

Remove field blockForgeUTCTime since headerForgeUTCTime is enough. #5009

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Remove field blockForgeUTCTime since headerForgeUTCTime is enough. #5009

merged 2 commits into from
Dec 12, 2024

Conversation

dnadales
Copy link
Member

@dnadales dnadales commented Nov 6, 2024 •
edited
Loading

Description

See title. Part of IntersectMBO/ouroboros-consensus#1301

Checklist

Quality

  • Commit sequence makes sense and have useful messages, see ref.
  • New tests are added and existing tests are updated.
  • Self-reviewed the PR.

Maintenance

  • Linked an issue or added the PR to the current sprint of ouroboros-network project.
  • Added labels.
  • Updated changelog files.
  • The documentation has been properly updated, see ref.

@dnadales dnadales requested a review from a team as a code owner November 6, 2024 15:06
@dnadales dnadales added the consensus issues related to ouroboros-consensus label Nov 6, 2024
@dnadales dnadales force-pushed the dnadales/remove-blockForgeUTCTime branch from e9cb561 to c0bb432 Compare November 6, 2024 15:19
coot
coot approved these changes Nov 8, 2024
View reviewed changes
Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

LGTM; just please fix the format in CHANGELOGs for one that's already used.

ouroboros-network-api/CHANGELOG.md Outdated Show resolved Hide resolved
ouroboros-network/CHANGELOG.md Outdated Show resolved Hide resolved
@coot
Copy link
Contributor

coot commented Nov 8, 2024

There's a haskell-stylish failure: https://ci.iog.io/build/5927288/nixlog/4

@dnadales dnadales force-pushed the dnadales/remove-blockForgeUTCTime branch 2 times, most recently from 38d1578 to b7cba34 Compare November 14, 2024 10:26
@amesgen amesgen mentioned this pull request Nov 21, 2024
Open
dnadales added a commit to IntersectMBO/ouroboros-consensus that referenced this pull request Nov 27, 2024
@dnadales
Use hwtSlotRelativeTime from HeaderWithTime to implement `headerF…
8f1bfce 
…orgeUTCTime`

Also, add a note stating that `blockForgeUTCTime` can be removed once
IntersectMBO/ouroboros-network#5009 is merged.
@nfrisby nfrisby force-pushed the dnadales/remove-blockForgeUTCTime branch from b7cba34 to c4946bf Compare December 11, 2024 16:53
@nfrisby
Copy link
Contributor

nfrisby commented Dec 11, 2024

I just rebased this, handling simple conflicts with the recently merged Genesis PR.

@nfrisby nfrisby mentioned this pull request Dec 11, 2024
Open
@nfrisby nfrisby enabled auto-merge December 11, 2024 17:24
@nfrisby nfrisby added this pull request to the merge queue Dec 12, 2024
Merged via the queue into main with commit 4920b7a Dec 12, 2024
13 checks passed
@nfrisby nfrisby deleted the dnadales/remove-blockForgeUTCTime branch December 12, 2024 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coot coot coot approved these changes

Assignees

@dnadales dnadales

Labels
consensus issues related to ouroboros-consensus
Projects
Ouroboros Network
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dnadales @coot @nfrisby