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

UTxO-HD code-review work #1304

Merged
merged 12 commits into from
Dec 10, 2024
Merged

UTxO-HD code-review work #1304

merged 12 commits into from
Dec 10, 2024

Conversation

jasagredo
Copy link
Contributor

@jasagredo jasagredo commented Nov 14, 2024

This PR exists only to accumulate Code-review changes that we will merge into utxo-hd-main once the first review pass is done.

There are a couple of commits that are worth considering on their own, namely:

@jasagredo jasagredo force-pushed the utxo-hd-code-review-work branch 8 times, most recently from f4b81e5 to 4fac192 Compare December 9, 2024 15:43
@jasagredo jasagredo requested a review from geo2a as a code owner December 9, 2024 15:44
constraints:
Cabal < 3.13
, quickcheck-instances < 0.3.32
, data-default < 0.8
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add a comment explaining that this data-default constraint likely won't be necessary for cardano-ledger-core >1.15.0.0

Copy link
Contributor

Choose a reason for hiding this comment

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

(I'm not doing this myself, just because I want to make sure that you didn't add it for some other reason I'm misunderstanding.)

nfrisby
nfrisby previously requested changes Dec 9, 2024
Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

I Requested Changes since something looks amiss in InjecTx.hs

This review only covered the Rework SOP code on HardForkCombinator commit.

Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

I very loosely reviewed the "Reorganize LedgerDB" commit. It had the right shape. Only commented on some non-alphabetical module lists in the cabal files.

Edit: Ah ha... I was reviewing a single commit. GitHub marks my comments as "Outdated"... maybe you alphabetized things in a later commit (... the "formatting" one I'd guess?).

ouroboros-consensus/ouroboros-consensus.cabal Outdated Show resolved Hide resolved
ouroboros-consensus/ouroboros-consensus.cabal Outdated Show resolved Hide resolved
ouroboros-consensus/ouroboros-consensus.cabal Outdated Show resolved Hide resolved
@nfrisby
Copy link
Contributor

nfrisby commented Dec 9, 2024

I reviewed the two commits explicitly called out in the PR description. The rest were not highlighted, so I'm treating them like PR comments that the PR author addressed and marked as Resolved (from PR 1267).

@jasagredo jasagredo force-pushed the utxo-hd-code-review-work branch from 25bd0c4 to e0f552d Compare December 10, 2024 11:54
@jasagredo
Copy link
Contributor Author

jasagredo commented Dec 10, 2024

Committed the requested changes and git-absorb-ed them into their parent commit. See diff

@jasagredo jasagredo force-pushed the utxo-hd-code-review-work branch from e0f552d to 9be3397 Compare December 10, 2024 12:15
jasagredo and others added 8 commits December 10, 2024 13:38
This type for storing resources was reinventing the wheel: `quickcheck-dynamic`
already keep track of resources by storing a `Var` for each action result.

`IOSim` support for tests is also removed. It would be straightforward to revive
`IOSim` support in the future, if necessary.
* Rename `MockState` to `MockMonad`.
* Remove exception handler hoop jumping in `mBSClose` and `mBSVHClose`.
* Tag `ReadAfterWrite` and `RangeReadAfterWrite` only once per action sequence.
* Resolve some TODOs
I had initially decided it was best to replace uses of `ltcollapse` by some new
`ltfoldMap` function, but after some thinking it's best to instead use
`ltcollapse` as is, but removing the use of monoids there, which currently has
no effect.

The reason I think this is the right call is because ledger tables are currently
a single-constructor newtype, and they will be for at least a while. We do not
know what ledger tables will look like when we store more parts of the ledger
state, so let's cross that bridge when we get there.
@jasagredo jasagredo force-pushed the utxo-hd-code-review-work branch from 9be3397 to 2c5efb4 Compare December 10, 2024 12:39
@nfrisby nfrisby dismissed their stale review December 10, 2024 13:38

Concerns resolved

Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

Good to go! (noting that this PR doesn't target main)

@jasagredo jasagredo merged commit 4033b2d into utxo-hd-main Dec 10, 2024
8 of 13 checks passed
@jasagredo jasagredo deleted the utxo-hd-code-review-work branch December 10, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants