From dbd35e3408af71dbf586c4465f0a27d25b3c9abd Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Mon, 11 Sep 2023 20:03:44 +0200
Subject: [PATCH] Makefile: Call regtest tasks

---
 Makefile | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 935fe586bf..248e01a869 100644
--- a/Makefile
+++ b/Makefile
@@ -147,35 +147,22 @@ localnet: .localnet
 # user, you'll need to manually run each of the targets listed below
 # commands manually in a separate terminal or as background jobs.
 deploy: setup
-	# ensure localnet is not already deployed
-	if screen -ls localnet | grep Detached; then false; fi
-	# create a new screen session named 'localnet'
-	screen -dmS localnet
-	# deploy each node in its own named screen window
-	for target in \
-			bitcoind \
-			seednode \
-			seednode2 \
-			alice \
-			bob \
-			mediator; do \
-		screen -S localnet -X screen -t $$target; \
-		screen -S localnet -p $$target -X stuff "make $$target\n"; \
-	done;
+	./gradlew :startRegtest
 	# give bitcoind rpc server time to start
 	sleep 5
 	# generate a block to ensure Bisq nodes get dao-synced
 	make block
+	tail -f .localnet/bitcoind_shell.log \
+			.localnet/seednode_1_shell.log \
+			.localnet/seednode_2_shell.log \
+			.localnet/alice_shell.log \
+			.localnet/bob_shell.log \
+			.localnet/mediator_shell.log
 
 # Undeploy a running localnet by killing all Bitcoin and Bisq
 # node processes, then killing the localnet screen session altogether
 undeploy:
-	# kill all Bitcoind and Bisq nodes running in screen windows
-	screen -S localnet -X at "#" stuff "^C"
-	# quit all screen windows which results in killing the session
-	screen -S localnet -X at "#" kill
-	# remove dead screens
-	screen -wipe || true
+	./gradlew :stopRegtest
 
 bitcoind: .localnet
 	bitcoind \