rename TMROOT to TMHOME (Refs #431)

This commit is contained in:
Anton Kaliaev
2017-03-27 15:17:10 +04:00
parent 5420254b36
commit 5f6de800a0
9 changed files with 22 additions and 21 deletions
+6 -6
View File
@@ -8,10 +8,10 @@ set -e
# TODO: install everything
export TMROOT=$HOME/.tendermint_app
export TMHOME=$HOME/.tendermint_app
function dummy_over_socket(){
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
echo "Starting dummy_over_socket"
dummy > /dev/null &
@@ -28,7 +28,7 @@ function dummy_over_socket(){
# start tendermint first
function dummy_over_socket_reorder(){
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
echo "Starting dummy_over_socket_reorder (ie. start tendermint first)"
tendermint node > tendermint.log &
@@ -46,7 +46,7 @@ function dummy_over_socket_reorder(){
function counter_over_socket() {
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
echo "Starting counter_over_socket"
counter --serial > /dev/null &
@@ -62,7 +62,7 @@ function counter_over_socket() {
}
function counter_over_grpc() {
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
echo "Starting counter_over_grpc"
counter --serial --abci grpc > /dev/null &
@@ -78,7 +78,7 @@ function counter_over_grpc() {
}
function counter_over_grpc_grpc() {
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
echo "Starting counter_over_grpc_grpc (ie. with grpc broadcast_tx)"
counter --serial --abci grpc > /dev/null &
+1 -1
View File
@@ -37,7 +37,7 @@ for i in $(seq 1 4); do
--ip="172.57.0.$((100 + $i))" \
--name local_testnet_$i \
--entrypoint tendermint \
-e TMROOT=/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$i/core \
-e TMHOME=/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$i/core \
tendermint_tester node --seeds 172.57.0.101:46656,172.57.0.102:46656,172.57.0.103:46656,172.57.0.104:46656 --proxy_app=dummy
done
```
+3 -2
View File
@@ -21,7 +21,7 @@ if [[ "$CIRCLECI" == true ]]; then
--ip=$(test/p2p/ip.sh $ID) \
--name "local_testnet_$ID" \
--entrypoint tendermint \
-e TMROOT="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
-e TMHOME="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
--log-driver=syslog \
--log-opt syslog-address=udp://127.0.0.1:5514 \
--log-opt syslog-facility=daemon \
@@ -34,6 +34,7 @@ else
--ip=$(test/p2p/ip.sh $ID) \
--name "local_testnet_$ID" \
--entrypoint tendermint \
-e TMROOT="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
-e TMHOME="/go/src/github.com/tendermint/tendermint/test/p2p/data/mach$ID/core" \
"$DOCKER_IMAGE" node $NODE_FLAGS --log_level=info --proxy_app="$APP_PROXY"
fi
+3 -3
View File
@@ -1,15 +1,15 @@
#! /bin/bash
export TMROOT=$HOME/.tendermint_persist
export TMHOME=$HOME/.tendermint_persist
rm -rf "$TMROOT"
rm -rf "$TMHOME"
tendermint init
# use a unix socket so we can remove it
RPC_ADDR="$(pwd)/rpc.sock"
TM_CMD="tendermint node --log_level=debug --rpc_laddr=unix://$RPC_ADDR" # &> tendermint_${name}.log"
DUMMY_CMD="dummy --persist $TMROOT/dummy" # &> dummy_${name}.log"
DUMMY_CMD="dummy --persist $TMHOME/dummy" # &> dummy_${name}.log"
function start_procs(){
+3 -3
View File
@@ -1,15 +1,15 @@
#! /bin/bash
export TMROOT=$HOME/.tendermint_persist
export TMHOME=$HOME/.tendermint_persist
rm -rf $TMROOT
rm -rf $TMHOME
tendermint init
function start_procs(){
name=$1
echo "Starting persistent dummy and tendermint"
dummy --persist $TMROOT/dummy &> "dummy_${name}.log" &
dummy --persist $TMHOME/dummy &> "dummy_${name}.log" &
PID_DUMMY=$!
tendermint node &> tendermint_${name}.log &
PID_TENDERMINT=$!