Skip to content

Conversation

mrBliss
Copy link
Contributor

@mrBliss mrBliss commented Apr 9, 2020

Fixes #1558.

@mrBliss mrBliss added the consensus issues related to ouroboros-consensus label Apr 9, 2020
@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 9, 2020

This depends on IntersectMBO/cardano-ledger#1343, but to avoid breaking/stalling things at the end of this sprint, this non-urgent change can wait until next sprint.

@mrBliss mrBliss force-pushed the mrBliss/fix-shelley-thunks branch from 074bb26 to 8ffeeaa Compare April 14, 2020 16:26
@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 14, 2020

IntersectMBO/cardano-ledger#1343 got merged, but some unrelated changes got merged before it, which haven't been propagated to ouroboros-network (that's the cost of multiple repos 😞). So this is waiting for #1947.

@mrBliss mrBliss force-pushed the mrBliss/fix-shelley-thunks branch from 8ffeeaa to f6bb9ec Compare April 16, 2020 11:24
@mrBliss mrBliss marked this pull request as ready for review April 16, 2020 11:24
@mrBliss mrBliss requested a review from edsko April 16, 2020 11:24
{-# OPTIONS_GHC -fno-strictness #-}
-- NOTE: With @-fstrictness@ optimisation (enabled by default for -O1), we get
-- an unexplained thunk in 'KnownIntersectionState' and thus a space leak. See
-- #1356.
Copy link
Contributor

Choose a reason for hiding this comment

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

:-(

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors merge

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

Let's hope CI won't block us too long this time (it did in #1947) 😩

iohk-bors bot added a commit that referenced this pull request Apr 16, 2020
1928: Fix thunks in Shelley r=mrBliss a=mrBliss

Fixes #1558.

1962: node to client api changes r=coot a=coot

Small changes to NodeToClient api and LocalStateQuery protocol type signatures.

Related to #1950

- Added null peers in NodeToNode module
- Add kinds to type signatures of LocalQueryProtocol


Co-authored-by: Thomas Winant <thomas@well-typed.com>
Co-authored-by: Marcin Szamotulski <profunctor@pm.me>
@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors cancel

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

(Bors is running a job for this PR and #1962, which was closed, so there's no point in continuing with that job 😩)

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors r-

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

Canceled

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors merge

iohk-bors bot added a commit that referenced this pull request Apr 16, 2020
1928: Fix thunks in Shelley r=mrBliss a=mrBliss

Fixes #1558.

Co-authored-by: Thomas Winant <thomas@well-typed.com>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

Build failed

@mrBliss mrBliss force-pushed the mrBliss/fix-shelley-thunks branch from f6bb9ec to fe40214 Compare April 16, 2020 15:26
@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors merge

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors ping

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

pong

@mrBliss
Copy link
Contributor Author

mrBliss commented Apr 16, 2020

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

Already running a review

@cleverca22
Copy link
Contributor

bors r-

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

Canceled

@cleverca22
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 16, 2020

@iohk-bors iohk-bors bot merged commit 807f86a into master Apr 16, 2020
@iohk-bors iohk-bors bot deleted the mrBliss/fix-shelley-thunks branch April 16, 2020 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
consensus issues related to ouroboros-consensus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Run Shelley ledger integration with NoUnexpectedThunks checks enabled
3 participants