Skip to content

Commit

Permalink
Merge #2455
Browse files Browse the repository at this point in the history
2455: waitForTxImmutability in fixtureWalletWith r=Anviking a=Anviking

# Issue Number

<!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. -->

Hopefully fixes all of #2426, #2430, #2439 

# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] Add waitForTxImmutability in fixtureWalletWith 


# Comments

```
I hope this should fix the flaky TRANS_LIST failures.

I tested locally with setup:
- anviking/prototype/lsq-monad
- patch adding replicateM_ on TRANS_LIST failuries
- patch removing retrying `it`
-  running stack test cardano-wallet:integration --ta '-j 6'

With resulting failures:
without 5s threadDelay:
- 1 (TRANS_LIST) failure
- 1 (TRANS_LIST) failure
with threadDelay:
- 1 (other failure)
- 0 failures

on master, with waitForTxImmutability instead of threadDelay
- 0 failures
```

<!-- Additional comments or screenshots to attach if any -->

<!--
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket
 ✓ Acknowledge any changes required to the Wiki
 ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages.
-->


Co-authored-by: Johannes Lund <johannes.lund@iohk.io>
  • Loading branch information
iohk-bors[bot] and Anviking committed Jan 19, 2021
2 parents 922319c + 4431844 commit 70f6048
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/core-integration/src/Test/Integration/Framework/DSL.hs
Expand Up @@ -1360,6 +1360,7 @@ fixtureWalletWith ctx coins0 = do
liftIO $ mapM_ (moveCoins src dest) (groupsOf 10 coins0)
liftIO $ void $ request @() ctx
(Link.deleteWallet @'Shelley src) Default Empty
waitForTxImmutability ctx
snd <$> unsafeRequest @ApiWallet ctx
(Link.getWallet @'Shelley dest) Empty
where
Expand Down

0 comments on commit 70f6048

Please sign in to comment.