Browse Source

Merge #786

786: Introduce `cargo dev-maker` and `cargo dev-taker` aliases for easier local development r=thomaseizinger a=thomaseizinger

We have some duplication of how to run the development maker and taker locally.

Use cargo aliases to clean up this duplication and make it easier to run them outside of the `start_all.sh` script.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
feature/force-stop-button
bors[bot] 3 years ago
committed by GitHub
parent
commit
8914c389d2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .cargo/config.toml
  2. 7
      .github/workflows/ci.yml
  3. 2
      .gitignore
  4. 4
      start_all.sh
  5. 0
      testnet/maker_seed
  6. 0
      testnet/taker_seed

4
.cargo/config.toml

@ -1,2 +1,6 @@
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
[alias]
dev-maker = "run --bin maker -- testnet"
dev-taker = "run --bin taker -- --maker localhost:9999 --maker-id 10d4ba2ac3f7a22da4009d813ff1bc3f404dfe2cc93a32bedf1512aa9951c95e testnet" # Maker ID matches seed found in `testnet/maker_seed`

7
.github/workflows/ci.yml

@ -99,13 +99,10 @@ jobs:
- name: Smoke test ${{ matrix.os }} binary
shell: bash
run: |
mkdir -p /tmp/maker/testnet
cp -r daemon/util/testnet_seeds/maker_seed /tmp/maker/testnet/maker_seed
target/debug/maker --data-dir=/tmp/maker testnet &
cargo dev-maker &
sleep 10s # Wait for maker to start\
# The maker-id is generated from the makers seed found in daemon/util/testnet_seeds/maker_seed
target/debug/taker --data-dir=/tmp/taker --maker localhost:9999 --maker-id 10d4ba2ac3f7a22da4009d813ff1bc3f404dfe2cc93a32bedf1512aa9951c95e testnet &
cargo dev-taker &
sleep 10s # Wait for taker to start
curl --fail http://localhost:8000/api/alive

2
.gitignore

@ -22,3 +22,5 @@
/taker_seed
/mainnet
/testnet
!/testnet/maker_seed
!/testnet/taker_seed

4
start_all.sh

@ -4,5 +4,5 @@ export RUST_BACKTRACE=1
# A simple command to spin up the complete package, ie. both daemons and frontends.
# A single 'ctrl+c' stops all processes.
# The maker-id is generated from the makers seed found in daemon/util/testnet_seeds/maker_seed
(trap 'kill 0' SIGINT; cargo run --bin maker -- testnet & cargo run --bin taker -- --maker localhost:9999 --maker-id 10d4ba2ac3f7a22da4009d813ff1bc3f404dfe2cc93a32bedf1512aa9951c95e testnet -- & yarn --cwd=./maker-frontend dev & yarn --cwd=./taker-frontend dev)
# The maker-id is generated from the makers seed found in daemon/testnet/maker_seed
(trap 'kill 0' SIGINT; cargo dev-maker & cargo dev-taker -- & yarn --cwd=./maker-frontend dev & yarn --cwd=./taker-frontend dev)

0
daemon/util/testnet_seeds/maker_seed → testnet/maker_seed

0
daemon/util/testnet_seeds/taker_seed → testnet/taker_seed

Loading…
Cancel
Save