Merge #1721 #1722 #1729 #1730 #1731

1721: Remove seed from e2e tests r=thomaseizinger a=thomaseizinger

With the recent change to move to a data directory, we no longer use this seed. It seems like we never needed it because the tests also pass without explicitely controlling the seed.

1722: Make sure we build cnd before executing the e2e tests r=thomaseizinger a=thomaseizinger



1729: Bump async-trait from 0.1.19 to 0.1.21 r=thomaseizinger a=dependabot-preview[bot]

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.19 to 0.1.21.
<details>
<summary>Release notes</summary>

*Sourced from [async-trait's releases](https://github.com/dtolnay/async-trait/releases).*

> ## 0.1.21
> - Fix use of `Self` in expression position better ([#53](https://github-redirect.dependabot.com/dtolnay/async-trait/issues/53))
> 
> ## 0.1.20
> - Fix use of `Self` in expression position inside async fn ([#53](https://github-redirect.dependabot.com/dtolnay/async-trait/issues/53))
</details>
<details>
<summary>Commits</summary>

- [`1b503ce`](dtolnay/async-trait@1b503ce) Release 0.1.21
- [`ccd4ec3`](dtolnay/async-trait@ccd4ec3) Merge pull request [#55](https://github-redirect.dependabot.com/dtolnay/async-trait/issues/55) from dtolnay/self
- [`c84029a`](dtolnay/async-trait@c84029a) Handle Self in expression position with braced fields
- [`edcc93f`](dtolnay/async-trait@edcc93f) Update issue 53 test to include Self with braces
- [`6d93548`](dtolnay/async-trait@6d93548) Release 0.1.20
- [`a9603b8`](dtolnay/async-trait@a9603b8) Add ui test for unsupported use of Self
- [`a269d7b`](dtolnay/async-trait@a269d7b) Merge pull request [#54](https://github-redirect.dependabot.com/dtolnay/async-trait/issues/54) from dtolnay/self
- [`4185cb5`](dtolnay/async-trait@4185cb5) Convert type-style Self path to expr-style path
- [`de859f2`](dtolnay/async-trait@de859f2) Add variation of issue 53 that requires turbofishing
- [`6382645`](dtolnay/async-trait@6382645) Handle `Self` in expression position
- Additional commits viewable in [compare view](dtolnay/async-trait@0.1.19...0.1.21)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=async-trait&package-manager=cargo&previous-version=0.1.19&new-version=0.1.21)](https://dependabot.com/compatibility-score.html?dependency-name=async-trait&package-manager=cargo&previous-version=0.1.19&new-version=0.1.21)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

1730: Bump serde_json from 1.0.42 to 1.0.43 r=thomaseizinger a=dependabot-preview[bot]

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.42 to 1.0.43.
<details>
<summary>Release notes</summary>

*Sourced from [serde_json's releases](https://github.com/serde-rs/json/releases).*

> ## v1.0.43
> - Declare accurate minimum required version of indexmap crate when preserve-order feature is enabled ([#590](https://github-redirect.dependabot.com/serde-rs/json/issues/590), thanks [@&#8203;nlordell](https://github.com/nlordell))
</details>
<details>
<summary>Commits</summary>

- [`f7a4da0`](serde-rs/json@f7a4da0) Release 1.0.43
- [`76b2366`](serde-rs/json@76b2366) Merge pull request [#590](https://github-redirect.dependabot.com/serde-rs/json/issues/590) from nlordell/bump_indexmap_version
- [`19ba7be`](serde-rs/json@19ba7be) fix required minimum indexmap version
- See full diff in [compare view](serde-rs/json@v1.0.42...v1.0.43)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=serde_json&package-manager=cargo&previous-version=1.0.42&new-version=1.0.43)](https://dependabot.com/compatibility-score.html?dependency-name=serde_json&package-manager=cargo&previous-version=1.0.42&new-version=1.0.43)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

1731: Bump typescript from 3.7.2 to 3.7.3 in /api_tests r=thomaseizinger a=dependabot-preview[bot]

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.7.2 to 3.7.3.
<details>
<summary>Release notes</summary>

*Sourced from [typescript's releases](https://github.com/Microsoft/TypeScript/releases).*

> ## TypeScript 3.7.3
> For the complete list of fixed issues, check out the
> 
> * [fixed issues query for Typescript v3.7.0 (Beta)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.7.0%22+is%3Aclosed+).
> * [fixed issues query for Typescript v3.7.1 (RC)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.7.1%22+is%3Aclosed+).
> * [fixed issues query for Typescript v3.7.2 (Final)](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.7.2%22+is%3Aclosed+).
> * [fixed issues query for Typescript v3.7.3](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.7.3%22+is%3Aclosed+).
> 
> Downloads are available on:
> 
> * [npm](https://www.npmjs.com/package/typescript)
</details>
<details>
<summary>Commits</summary>

- [`79facc0`](microsoft/TypeScript@79facc0) Update LKG.
- [`e65ce53`](microsoft/TypeScript@e65ce53) Fix `getTypeFromJSDocValueReference`
- [`41d1ce6`](microsoft/TypeScript@41d1ce6) Cherry-pick PR [#35335](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35335) into release-3.7 ([#35367](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35367))
- [`c4d6cec`](microsoft/TypeScript@c4d6cec) Cherry-pick PR [#35366](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35366) into release-3.7 ([#35368](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35368))
- [`38a496a`](microsoft/TypeScript@38a496a) Update user baselines ([#35337](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35337))
- [`9bf4e3a`](microsoft/TypeScript@9bf4e3a) Update user baselines ([#35302](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35302))
- [`a8b63ef`](microsoft/TypeScript@a8b63ef) Update LKG.
- [`c021b28`](microsoft/TypeScript@c021b28) Cherry-pick PR [#34987](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/34987) into release-3.7 ([#35303](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35303))
- [`d5bcb6f`](microsoft/TypeScript@d5bcb6f) Cherry-pick PR [#35058](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35058) into release-3.7 ([#35241](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35241))
- [`b9d5231`](microsoft/TypeScript@b9d5231) Cherry-pick PR [#35198](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35198) into release-3.7 ([#35240](https://github-redirect.dependabot.com/Microsoft/TypeScript/issues/35240))
- Additional commits viewable in [compare view](microsoft/TypeScript@v3.7.2...v3.7.3)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=typescript&package-manager=npm_and_yarn&previous-version=3.7.2&new-version=3.7.3)](https://dependabot.com/compatibility-score.html?dependency-name=typescript&package-manager=npm_and_yarn&previous-version=3.7.2&new-version=3.7.3)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the `.dependabot/config.yml` file in this repo:
- Update frequency
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: Thomas Eizinger <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Author: 3 people

Cargo.lock

@@ -88,5 +88,5 @@ check_toml_format: install_tomlfmt
 check_ts_format: yarn_install
 	(cd ./api_tests; yarn run check)
 
-e2e: build yarn_install
+e2e: yarn_install
 	(cd ./api_tests; yarn test)

Makefile

@@ -49,7 +49,7 @@ Please see `cnd --help` for help with command line options.
 - `make test` is just a wrapper around `cargo test --all`
 - `make e2e` will run all the end-to-end tests
 
-To run individual end-to-end tests, use `yarn` inside the `api_tests` folder (careful! It does not recompile Rust for you):
+To run individual end-to-end tests, use `yarn` inside the `api_tests` folder:
 - `yarn run test`: run all tests
 - `yarn run test <directory>`: run all tests in the directory
 - `yarn run test <path to test file>`: run all tests in this test file, supports shell glob on the path

README.md

@@ -14,18 +14,15 @@ export interface HttpApi {
 }
 
 export class E2ETestActorConfig {
-    public readonly seed: Uint8Array;
     public readonly data: string;
 
     constructor(
         public readonly httpApiPort: number,
         public readonly comitPort: number,
-        seed: string,
         public readonly name: string
     ) {
         this.httpApiPort = httpApiPort;
         this.comitPort = comitPort;
-        this.seed = new Uint8Array(Buffer.from(seed, "hex"));
 
         const tmpobj = tmp.dirSync();
         tmpobj.removeCallback(); // Manual cleanup
@@ -66,24 +63,9 @@ interface BitcoinConnector {
     network: string;
 }
 
-export const ALICE_CONFIG = new E2ETestActorConfig(
-    8000,
-    9938,
-    "f87165e305b0f7c4824d3806434f9d0909610a25641ab8773cf92a48c9d77670",
-    "alice"
-);
-export const BOB_CONFIG = new E2ETestActorConfig(
-    8010,
-    9939,
-    "1a1707bb54e5fb4deddd19f07adcb4f1e022ca7879e3c8348da8d4fa496ae8e2",
-    "bob"
-);
-export const CHARLIE_CONFIG = new E2ETestActorConfig(
-    8020,
-    8021,
-    "6b49ec1df23d124a16d6a12bd34476579e6e80cdcb97a5438cb76ac5c423c937",
-    "charlie"
-);
+export const ALICE_CONFIG = new E2ETestActorConfig(8000, 9938, "alice");
+export const BOB_CONFIG = new E2ETestActorConfig(8010, 9939, "bob");
+export const CHARLIE_CONFIG = new E2ETestActorConfig(8020, 8021, "charlie");
 
 function createLedgerConnectors(ledgerConfig: LedgerConfig): LedgerConnectors {
     const config: LedgerConnectors = {};

api_tests/lib/config.ts

@@ -1,6 +1,5 @@
 import { expect } from "chai";
 import { Cnd, ComitClient, Swap } from "comit-sdk";
-import { randomBytes } from "crypto";
 import { BigNumber, BigNumberish, parseEther } from "ethers/utils";
 import getPort from "get-port";
 import { Logger } from "log4js";
@@ -27,12 +26,9 @@ export class Actor {
         projectRoot: string,
         logRoot: string
     ) {
-        const seed = randomBytes(32).toString("hex");
-
         const actorConfig = new E2ETestActorConfig(
             await getPort(),
             await getPort(),
-            seed,
             name
         );
 

api_tests/lib_sdk/actors/actor.ts

@@ -6,6 +6,7 @@
     "scripts": {
         "check": "tsc && prettier --check '**/*.{ts,json,yml}' && tslint --project .",
         "postinstall": "mkdir -p ./gen && json2ts -i ./siren.schema.json -o ./gen/siren.d.ts",
+        "pretest": "cargo build --bin cnd",
         "test": "ts-node ./harness.ts",
         "fix": "tslint --project . --fix && prettier --write '**/*.{ts,js,json,yml}'"
     },
@@ -61,7 +62,7 @@
         "tslint": "^5.20.1",
         "tslint-config-prettier": "^1.18.0",
         "tslint-no-unused-expression-chai": "^0.1.4",
-        "typescript": "^3.7.2",
+        "typescript": "^3.7.3",
         "urijs": "^1.19.2"
     },
     "prettier": {

api_tests/package.json

@@ -3117,10 +3117,10 @@ typeforce@^1.11.3, typeforce@^1.11.5:
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
 
-typescript@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
-  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
+typescript@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
+  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
 
 universalify@^0.1.0:
   version "0.1.2"