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

Fix restore bench and docker #2045

Merged
merged 2 commits into from
Aug 18, 2020
Merged

Fix restore bench and docker #2045

merged 2 commits into from
Aug 18, 2020

Conversation

Anviking
Copy link
Member

@Anviking Anviking commented Aug 16, 2020

Issue Number

#1919, #2044

Overview

Comments

@Anviking Anviking self-assigned this Aug 17, 2020
@Anviking Anviking force-pushed the anviking/1919/fix-restore branch 2 times, most recently from c875084 to edbcefc Compare August 17, 2020 09:43
@Anviking Anviking marked this pull request as ready for review August 17, 2020 09:44
@Anviking Anviking force-pushed the anviking/1919/fix-restore branch from edbcefc to 13c55e0 Compare August 17, 2020 09:45
@Anviking Anviking requested a review from rvl August 17, 2020 09:49
nix/docker.nix Outdated
exec ${exe}/bin/cardano-wallet-${backend} "$@"
'';
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
exec ${exe}/bin/${walletExeName} "$@"
Copy link
Contributor

Choose a reason for hiding this comment

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

Since it's a bash script, you could "cheat" and use a glob.

exec ${exe}/bin/cardano-wallet* "$@"

Copy link
Member Author

Choose a reason for hiding this comment

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

On second thought, that would break if we for some reason would end up with multiple matches?

If the cost is the two lines:

  suffix = if backend == "shelley" then "" else "-" + backend;
  walletExeName = "cardano-wallet" + suffix;

then maybe being explicit is worth it.

Copy link
Contributor

Choose a reason for hiding this comment

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

The glob will be safe to use because this is the bin directory within a backend-specific package. But explicit filenames are probably easier to maintain.

nix/docker.nix Outdated Show resolved Hide resolved
nix/docker.nix Outdated
let
suffix = if backend == "shelley" then "" else "-" + backend;
walletExeName = "cardano-wallet" + suffix;
in writeScriptBin "start-cardano-wallet-${backend}" ''
Copy link
Contributor

Choose a reason for hiding this comment

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

The name of this start script actually doesn't matter. It could be called globbits and the image would still work.
So you can remove the backend from its name.

Copy link
Member Author

Choose a reason for hiding this comment

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

This I noticed, but in-doubt kept the name as before.

start-cardano-wallet could make you believe it was shelley specific, even when the backend is jormungandr.

Maybe just start or start-wallet?

Copy link
Member Author

Choose a reason for hiding this comment

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

I went with start-wallet now.

nix/docker.nix Outdated Show resolved Hide resolved
@Anviking Anviking force-pushed the anviking/1919/fix-restore branch 2 times, most recently from 0244e35 to d718f30 Compare August 17, 2020 14:06
@Anviking Anviking force-pushed the anviking/1919/fix-restore branch from d718f30 to 783f6f1 Compare August 17, 2020 14:08
@rvl rvl added the RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG label Aug 17, 2020
@rvl
Copy link
Contributor

rvl commented Aug 18, 2020

Looks good, works for me.

bors r+

iohk-bors bot added a commit that referenced this pull request Aug 18, 2020
2045: Fix restore bench and docker r=rvl a=Anviking

# Issue Number

#1919, #2044 


# Overview

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

- [x] Fix broken restore bench  https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/608#f02f336b-c7be-4b3f-b86b-bc825c9b5ac2
- [ ] _Hope_ `docker` should be fixed, but can't easily test locally ⚠️ 


# Comments

<!-- 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)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 18, 2020

Build failed

cardano-wallet-2020.8.3: test (suite: integration, args: --skip SERIAL)
cardano-wallet-cli-2020.8.3: test (suite: unit, args: --skip SERIAL)
cardano-wallet-core-2020.8.3: test (suite: unit, args: --skip SERIAL)
cardano-wallet-jormungandr-2020.8.3: test (suite: unit, args: --skip SERIAL)
text-class-2020.8.3: test (suite: unit, args: --skip SERIAL)
cardano-wallet-launcher-2020.8.3: test (suite: unit, args: --skip SERIAL)
text-class-2020.8.3: Test suite unit passed
cardano-wallet-cli-2020.8.3: Test suite unit passed
cardano-wallet-launcher-2020.8.3: Test suite unit passed
cardano-wallet-jormungandr-2020.8.3: Test suite unit passed
cardano-wallet-core-2020.8.3: Test suite unit failed
Progress 5/6: cardano-wallet-2020.8.3
Timed out after 45 minutes.

Retry:

  | 1) API Specifications STAKE_POOLS_JOIN_05 - Can join when stake key already exists
  | uncaught exception: RequestException
  | DecodeFailure "Error in $: parsing Cardano.Wallet.Api.Types.ApiWallet(ApiWallet) failed, key \"id\" not found: Response {responseStatus = Status {statusCode = 409, statusMessage = \"Conflict\"}, responseVersion = HTTP/1.1, responseHeaders = [(\"Transfer-Encoding\",\"chunked\"),(\"Date\",\"Tue, 18 Aug 2020 06:38:52 GMT\"),(\"Server\",\"Warp/3.3.5\")], responseBody = \"{\\\"code\\\":\\\"wallet_already_exists\\\",\\\"message\\\":\\\"This operation would yield a wallet with the following id: 2a793eb367d44a42f658eb02d1004f50c14612fd However, I already know of a wallet with this id.\\\"}\", responseCookieJar = CJ {expose = []}, responseClose' = ResponseClose}"
  |  
  | To rerun use: --match "/API Specifications/STAKE_POOLS_JOIN_05 - Can join when stake key already exists/"
  |  
  | Randomized with seed 1077456383
 


@Anviking
Copy link
Member Author

bors r+

iohk-bors bot added a commit that referenced this pull request Aug 18, 2020
2045: Fix restore bench and docker r=Anviking a=Anviking

# Issue Number

#1919, #2044 


# Overview

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

- [x] Fix broken restore bench  https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/608#f02f336b-c7be-4b3f-b86b-bc825c9b5ac2
- [ ] _Hope_ `docker` should be fixed, but can't easily test locally ⚠️ 


# Comments

<!-- 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)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 18, 2020

Timed out

@Anviking
Copy link
Member Author

bors r+

iohk-bors bot added a commit that referenced this pull request Aug 18, 2020
2045: Fix restore bench and docker r=Anviking a=Anviking

# Issue Number

#1919, #2044 


# Overview

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

- [x] Fix broken restore bench  https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/608#f02f336b-c7be-4b3f-b86b-bc825c9b5ac2
- [ ] _Hope_ `docker` should be fixed, but can't easily test locally ⚠️ 


# Comments

<!-- 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)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 18, 2020

Build failed

core:unit is stuck here:

    Extra Properties about DB initialization
      createWallet . listWallets yields expected results
        +++ OK, passed 100 tests.
      creating same wallet twice yields an error
        +++ OK, passed 100 tests.
      removing the same wallet twice yields an error
        +++ OK, passed 100 tests.
    put . read yields a result
      Checkpoint
        +++

@Anviking
Copy link
Member Author

bors r+

iohk-bors bot added a commit that referenced this pull request Aug 18, 2020
2045: Fix restore bench and docker r=Anviking a=Anviking

# Issue Number

#1919, #2044 


# Overview

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

- [x] Fix broken restore bench  https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/608#f02f336b-c7be-4b3f-b86b-bc825c9b5ac2
- [ ] _Hope_ `docker` should be fixed, but can't easily test locally ⚠️ 


# Comments

<!-- 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)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 18, 2020

Build failed


src/Test/Integration/Scenario/API/Byron/Migrations.hs:210:5:
--
  | 1) API Specifications BYRON_MIGRATE_01 -  migrate a big wallet requiring more than one tx
  | uncaught exception: RequestException
  | DecodeFailure "Error in $: parsing Cardano.Wallet.Api.Types.ApiByronWallet(ApiByronWallet) failed, key \"id\" not found: Response {responseStatus = Status {statusCode = 409, statusMessage = \"Conflict\"}, responseVersion = HTTP/1.1, responseHeaders = [(\"Transfer-Encoding\",\"chunked\"),(\"Date\",\"Tue, 18 Aug 2020 10:40:48 GMT\"),(\"Server\",\"Warp/3.3.5\")], responseBody = \"{\\\"code\\\":\\\"wallet_already_exists\\\",\\\"message\\\":\\\"This operation would yield a wallet with the following id: 0b3a38e4078206ccd93cc353a93cc3a37dbbb4fe However, I already know of a wallet with this id.\\\"}\", responseCookieJar = CJ {expose = []}, responseClose' = ResponseClose}"
  |  
  | To rerun use: --match "/API Specifications/BYRON_MIGRATE_01 -  migrate a big wallet requiring more than one tx/"
  |  
  | Randomized with seed 279501919


@Anviking
Copy link
Member Author

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Aug 18, 2020

Build succeeded

@iohk-bors iohk-bors bot merged commit 1d7914c into master Aug 18, 2020
@iohk-bors iohk-bors bot deleted the anviking/1919/fix-restore branch August 18, 2020 12:08
@rvl rvl mentioned this pull request Aug 24, 2020
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RESOLVING ISSUE Mark a PR as resolving issues, for auto-generated CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants