CAD-4738 stm monad catch instance #16

yogeshsajanikar · 2022-08-02T06:43:24Z

Based on the branch "CAD-4750-generalise-orelse-frame", this commit introduces Catch frame handler. It also adds Catch term in the reference STM for testing.

Resolves IntersectMBO/ouroboros-network#1461

amesgen

Looks great, always cool to see when things get simpler over time 🎉

I only have a few minor comments below. As before, I did not commented on the IOSimPOR part as it is identical.

io-sim/test/Test/STM.hs

io-sim/src/Control/Monad/IOSim/Types.hs

io-sim/src/Control/Monad/IOSim/Internal.hs

io-sim/test/Test/IOSim.hs

io-sim/test/Test/STM.hs

nfrisby

I'll request some changes, just since I hope Yogesh finds a sufficiently lightweight way to address a couple of the eg testing comments. Nice stuff!

io-sim/src/Control/Monad/IOSim/Types.hs

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

io-sim/test/Test/STM.hs

coot

It's on my todo list to review the PR... However, could you update ouroboros-network and check if all nightly tests are passing: for that one needs to add this snippet to cabal.project.local file:

package ouroboros-network-testing
  flags: -nightly

And then run:

cabal run ouroboros-netowrk-framework:test && cabal run ouroboros-network:test

yogeshsajanikar · 2022-08-10T08:11:15Z

@coot Running the nightly tests now. I will update the results here soon.

yogeshsajanikar · 2022-08-10T10:41:43Z

@coot The tests that you mentioned pass!

Running tests in ouroboros-network with io-sim commit id 9d2e67f

cabal run ouroboros-network-framework:test -> All 47 tests passed (118.51s)
cabal run ouroboros-network:test -> All 314 tests passed (480.21s)

io-sim/src/Control/Monad/IOSim/Internal.hs

coot

Very nice, just a few remarks.

io-sim/test/Test/STM.hs

io-sim/src/Control/Monad/IOSim/Internal.hs

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

io-sim/src/Control/Monad/IOSim/Types.hs

nfrisby

One last round of minor comment adjustments! 👍

io-sim/src/Control/Monad/IOSim/Internal.hs

io-sim/src/Control/Monad/IOSim/Types.hs

io-sim/test/Test/STM.hs

io-sim/src/Control/Monad/IOSim/Types.hs

io-sim/test/Test/STM.hs

nfrisby

I'm Requesting Changes one last time! I only caught spelling/grammar this time, but one of the typos is important.

Code looks great!

yogeshsajanikar · 2022-11-09T16:12:42Z

#16 (comment) is being addressed here. #35. So now the catch term in this code drop is Catch :: Term t -> Term t -> Term t. The #35 handles exception. It also adds another exception type so that an exception can bubble up if the exception type is not handled. It is a WIP.

nfrisby

All the comments have been addressed 👍

Except for the new one I'm opening right now---looks like this commit undoes a recently merged PR. That's why I'm Requesting Changes one last time.

io-sim/src/Control/Monad/IOSim/STM.hs

- Add support for Catch in IOSim and IOSimPOR - Add support for Catch in Test/STM.hs Co-authored-by: Marcin Szamotulski <coot@coot.me>

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

nfrisby

The diff looks minimal again. 🙌

Approved! Nice work 👍

yogeshsajanikar requested review from dnadales, coot, nfrisby, bartfrenk and amesgen August 2, 2022 06:43

This was referenced Aug 2, 2022

Add MonadCatch instance for STM #13

Closed

CAD-4750 generalise OrElse frame #15

Merged

amesgen reviewed Aug 2, 2022

View reviewed changes

nfrisby requested changes Aug 4, 2022

View reviewed changes

coot reviewed Aug 5, 2022

View reviewed changes

coot reviewed Aug 18, 2022

View reviewed changes

io-sim/src/Control/Monad/IOSim/Internal.hs Outdated Show resolved Hide resolved

coot requested changes Aug 18, 2022

View reviewed changes

io-sim/test/Test/STM.hs Show resolved Hide resolved

io-sim/src/Control/Monad/IOSim/Internal.hs Outdated Show resolved Hide resolved

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch from 9d2e67f to 06b61ea Compare August 29, 2022 05:59

yogeshsajanikar marked this pull request as ready for review August 29, 2022 06:01

yogeshsajanikar requested a review from coot September 20, 2022 08:55

coot reviewed Sep 22, 2022

View reviewed changes

io-sim/src/Control/Monad/IOSimPOR/Internal.hs Outdated Show resolved Hide resolved

coot changed the title ~~Cad 4738 stm monad catch instance~~ CAD-4738 stm monad catch instance Sep 23, 2022

yogeshsajanikar mentioned this pull request Oct 11, 2022

Add support for nested exception testing in Test/STM #36

Open

1 task

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch 2 times, most recently from 21f8b9e to 880fa47 Compare October 12, 2022 14:32

coot reviewed Oct 13, 2022

View reviewed changes

io-sim/src/Control/Monad/IOSim/Types.hs Outdated Show resolved Hide resolved

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch from d7d8d9f to d073a5b Compare October 13, 2022 18:06

coot approved these changes Oct 13, 2022

View reviewed changes

coot mentioned this pull request Oct 26, 2022

Publish io-sim and io-classes on Hackage #29

Closed

nfrisby requested changes Oct 31, 2022

View reviewed changes

nfrisby reviewed Nov 8, 2022

View reviewed changes

nfrisby requested changes Nov 8, 2022

View reviewed changes

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch from bf7d862 to a68ed16 Compare November 9, 2022 16:22

nfrisby requested changes Nov 10, 2022

View reviewed changes

io-sim/src/Control/Monad/IOSim/STM.hs Outdated Show resolved Hide resolved

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch from a68ed16 to a8da6e8 Compare November 10, 2022 07:08

Add support for MonadCatch

c192e85

- Add support for Catch in IOSim and IOSimPOR - Add support for Catch in Test/STM.hs Co-authored-by: Marcin Szamotulski <coot@coot.me>

yogeshsajanikar force-pushed the CAD-4738-stm-monad-catch-instance branch from a8da6e8 to c192e85 Compare November 11, 2022 11:29

yogeshsajanikar commented Nov 11, 2022

View reviewed changes

io-sim/src/Control/Monad/IOSimPOR/Internal.hs Show resolved Hide resolved

nfrisby approved these changes Nov 11, 2022

View reviewed changes

yogeshsajanikar merged commit 9650e14 into main Nov 12, 2022

yogeshsajanikar deleted the CAD-4738-stm-monad-catch-instance branch November 12, 2022 03:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CAD-4738 stm monad catch instance #16

CAD-4738 stm monad catch instance #16

yogeshsajanikar commented Aug 2, 2022 •

edited by coot

Loading

amesgen left a comment

nfrisby left a comment

coot left a comment

yogeshsajanikar commented Aug 10, 2022

yogeshsajanikar commented Aug 10, 2022

coot left a comment

nfrisby left a comment

nfrisby left a comment

yogeshsajanikar commented Nov 9, 2022 •

edited

Loading

nfrisby left a comment

nfrisby left a comment

CAD-4738 stm monad catch instance #16

CAD-4738 stm monad catch instance #16

Conversation

yogeshsajanikar commented Aug 2, 2022 • edited by coot Loading

amesgen left a comment

Choose a reason for hiding this comment

nfrisby left a comment

Choose a reason for hiding this comment

coot left a comment

Choose a reason for hiding this comment

yogeshsajanikar commented Aug 10, 2022

yogeshsajanikar commented Aug 10, 2022

coot left a comment

Choose a reason for hiding this comment

nfrisby left a comment

Choose a reason for hiding this comment

nfrisby left a comment

Choose a reason for hiding this comment

yogeshsajanikar commented Nov 9, 2022 • edited Loading

nfrisby left a comment

Choose a reason for hiding this comment

nfrisby left a comment

Choose a reason for hiding this comment

yogeshsajanikar commented Aug 2, 2022 •

edited by coot

Loading

yogeshsajanikar commented Nov 9, 2022 •

edited

Loading