From 5eee7ff2f9fc9eaf3f71525d616a16e183271036 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 3 Dec 2021 12:33:21 +1100
Subject: [PATCH 1/2] Move testnet seeds to `testnet` directory

This makes it easier to run the application with default arguments.
---
 .github/workflows/ci.yml                          |   4 ++--
 .gitignore                                        |   2 ++
 {daemon/util/testnet_seeds => testnet}/maker_seed |   0
 {daemon/util/testnet_seeds => testnet}/taker_seed | Bin
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename {daemon/util/testnet_seeds => testnet}/maker_seed (100%)
 rename {daemon/util/testnet_seeds => testnet}/taker_seed (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a63ab63..f85e6d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,11 +100,11 @@ jobs:
         shell: bash
         run: |
           mkdir -p /tmp/maker/testnet
-          cp -r daemon/util/testnet_seeds/maker_seed /tmp/maker/testnet/maker_seed
+          cp -r testnet/maker_seed /tmp/maker/testnet/maker_seed
           target/debug/maker --data-dir=/tmp/maker testnet &
           sleep 10s # Wait for maker to start\
 
-          # The maker-id is generated from the makers seed found in daemon/util/testnet_seeds/maker_seed
+          # The maker-id is generated from the makers seed found in testnet/maker_seed
           target/debug/taker --data-dir=/tmp/taker --maker localhost:9999 --maker-id 10d4ba2ac3f7a22da4009d813ff1bc3f404dfe2cc93a32bedf1512aa9951c95e testnet &
           sleep 10s # Wait for taker to start
 
diff --git a/.gitignore b/.gitignore
index b8e586d..f8dc70a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /taker_seed
 /mainnet
 /testnet
+!/testnet/maker_seed
+!/testnet/taker_seed
diff --git a/daemon/util/testnet_seeds/maker_seed b/testnet/maker_seed
similarity index 100%
rename from daemon/util/testnet_seeds/maker_seed
rename to testnet/maker_seed
diff --git a/daemon/util/testnet_seeds/taker_seed b/testnet/taker_seed
similarity index 100%
rename from daemon/util/testnet_seeds/taker_seed
rename to testnet/taker_seed

From 876349f92a62e199e26e70f8992f448bcb9bf0a9 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 3 Dec 2021 12:33:47 +1100
Subject: [PATCH 2/2] Introduce cargo aliases for running maker and taker in
 dev mode

These can be used as:

`cargo dev-taker`
`cargo dev-maker`
---
 .cargo/config.toml       | 4 ++++
 .github/workflows/ci.yml | 7 ++-----
 start_all.sh             | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 3c32d25..0792ceb 100644
--- a/.cargo/config.toml
+++ b/.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`
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f85e6d7..20e7461 100644
--- a/.github/workflows/ci.yml
+++ b/.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 testnet/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 testnet/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
diff --git a/start_all.sh b/start_all.sh
index 4ba1b8e..0e2eaca 100755
--- a/start_all.sh
+++ b/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)