Use STATE_DIR := .localnet in makefile

This commit is contained in:
Justin Carter 2019-11-30 07:50:59 +01:00
parent e5449c2a44
commit 650c5894db
No known key found for this signature in database
GPG key ID: 4B8BB0D3F5018030
2 changed files with 19 additions and 18 deletions

2
.gitignore vendored
View file

@ -32,4 +32,4 @@ deploy
/monitor/TorHiddenServiceStartupTimeTests/* /monitor/TorHiddenServiceStartupTimeTests/*
/monitor/monitor-tor/* /monitor/monitor-tor/*
.java-version .java-version
localnet .localnet

View file

@ -43,12 +43,12 @@
# bisq-seednode # bisq-seednode
# bisq-statsnode # bisq-statsnode
# #
# - You will see a new 'localnet' directory containing the data dirs # - You will see a new '.localnet' directory containing the data dirs
# for your regtest Bitcoin and Bisq nodes. Once you've deployed # for your regtest Bitcoin and Bisq nodes. Once you've deployed
# them in the step below, the directory will look as follows: # them in the step below, the directory will look as follows:
# #
# $ tree -d -L 1 localnet # $ tree -d -L 1 .localnet
# localnet # .localnet
# ├── alice # ├── alice
# ├── bitcoind # ├── bitcoind
# ├── bob # ├── bob
@ -101,6 +101,7 @@
# cases. # cases.
# #
STATE_DIR := .localnet
# Set up everything necessary for deploying your localnet. This is the # Set up everything necessary for deploying your localnet. This is the
# default target. # default target.
@ -112,7 +113,7 @@ clean-build:
./gradlew clean ./gradlew clean
clean-localnet: clean-localnet:
rm -rf localnet rm -rf $(STATE_DIR)
# Build all Bisq binaries and generate the shell scripts used to run # Build all Bisq binaries and generate the shell scripts used to run
# them in the targets below # them in the targets below
@ -127,16 +128,16 @@ localnet:
# and intuitive naming. This is a temporary measure until we clean these # and intuitive naming. This is a temporary measure until we clean these
# resources up more thoroughly. # resources up more thoroughly.
unzip docs/dao-setup.zip unzip docs/dao-setup.zip
mv dao-setup localnet mv dao-setup $(STATE_DIR)
mv localnet/Bitcoin-regtest localnet/bitcoind mv $(STATE_DIR)/Bitcoin-regtest $(STATE_DIR)/bitcoind
mv localnet/bisq-BTC_REGTEST_Alice_dao localnet/alice mv $(STATE_DIR)/bisq-BTC_REGTEST_Alice_dao $(STATE_DIR)/alice
mv localnet/bisq-BTC_REGTEST_Bob_dao localnet/bob mv $(STATE_DIR)/bisq-BTC_REGTEST_Bob_dao $(STATE_DIR)/bob
# Remove the preconfigured bitcoin.conf in favor of explicitly # Remove the preconfigured bitcoin.conf in favor of explicitly
# parameterizing the invocation of bitcoind in the target below # parameterizing the invocation of bitcoind in the target below
rm -v localnet/bitcoind/bitcoin.conf rm -v $(STATE_DIR)/bitcoind/bitcoin.conf
# Avoid spurious 'runCommand' errors in the bitcoind log when nc # Avoid spurious 'runCommand' errors in the bitcoind log when nc
# fails to bind to one of the listed block notification ports # fails to bind to one of the listed block notification ports
echo exit 0 >> localnet/bitcoind/blocknotify echo exit 0 >> $(STATE_DIR)/bitcoind/blocknotify
# Deploy a complete localnet by running all required Bitcoin and Bisq # Deploy a complete localnet by running all required Bitcoin and Bisq
# nodes, each in their own named screen window. If you are not a screen # nodes, each in their own named screen window. If you are not a screen
@ -163,8 +164,8 @@ bitcoind: localnet
-server \ -server \
-rpcuser=bisqdao \ -rpcuser=bisqdao \
-rpcpassword=bsq \ -rpcpassword=bsq \
-datadir=localnet/bitcoind \ -datadir=$(STATE_DIR)/bitcoind \
-blocknotify='localnet/bitcoind/blocknotify %s' -blocknotify='$(STATE_DIR)/bitcoind/blocknotify %s'
seednode: build seednode: build
./bisq-seednode \ ./bisq-seednode \
@ -176,7 +177,7 @@ seednode: build
--rpcPassword=bsq \ --rpcPassword=bsq \
--rpcBlockNotificationPort=5120 \ --rpcBlockNotificationPort=5120 \
--nodePort=2002 \ --nodePort=2002 \
--userDataDir=localnet \ --userDataDir=$(STATE_DIR) \
--appName=seednode --appName=seednode
seednode2: build seednode2: build
@ -189,7 +190,7 @@ seednode2: build
--rpcPassword=bsq \ --rpcPassword=bsq \
--rpcBlockNotificationPort=5121 \ --rpcBlockNotificationPort=5121 \
--nodePort=3002 \ --nodePort=3002 \
--userDataDir=localnet \ --userDataDir=$(STATE_DIR) \
--appName=seednode2 --appName=seednode2
mediator: build mediator: build
@ -198,7 +199,7 @@ mediator: build
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
--nodePort=4444 \ --nodePort=4444 \
--appDataDir=localnet/mediator \ --appDataDir=$(STATE_DIR)/mediator \
--appName=Mediator --appName=Mediator
alice: setup alice: setup
@ -213,7 +214,7 @@ alice: setup
--rpcBlockNotificationPort=5122 \ --rpcBlockNotificationPort=5122 \
--genesisBlockHeight=111 \ --genesisBlockHeight=111 \
--genesisTxId=30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf \ --genesisTxId=30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf \
--appDataDir=localnet/alice \ --appDataDir=$(STATE_DIR)/alice \
--appName=Alice --appName=Alice
bob: setup bob: setup
@ -222,7 +223,7 @@ bob: setup
--useLocalhostForP2P=true \ --useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \ --useDevPrivilegeKeys=true \
--nodePort=6666 \ --nodePort=6666 \
--appDataDir=localnet/bob \ --appDataDir=$(STATE_DIR)/bob \
--appName=Bob --appName=Bob
# Generate a new block on your Bitcoin regtest network. Requires that # Generate a new block on your Bitcoin regtest network. Requires that