fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

rename TMROOT to TMHOME (Refs #431)

Browse Source
This commit is contained in:
Anton Kaliaev 2017-03-27 15:17:10 +04:00
parent 5420254b36
commit 5f6de800a0
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
9 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCKER/Dockerfile
View File

@ -10,7 +10,7 @@ ENV TM_SHA256SUM 697033ea0f34f8b34a8a2b74c4dd730b47dd4efcfce65e53e953bdae8eb1436
# #
# The /tendermint/data dir is used by tendermint to store state. # The /tendermint/data dir is used by tendermint to store state.
ENV DATA_ROOT /tendermint ENV DATA_ROOT /tendermint
ENV TMROOT $DATA_ROOT ENV TMHOME $DATA_ROOT
# Set user right away for determinism # Set user right away for determinism
RUN addgroup tmuser && \ RUN addgroup tmuser && \

2
DOCKER/Dockerfile.develop
View File

@ -1,7 +1,7 @@
FROM alpine:3.5 FROM alpine:3.5
ENV DATA_ROOT /tendermint ENV DATA_ROOT /tendermint
ENV TMROOT $DATA_ROOT ENV TMHOME $DATA_ROOT
RUN addgroup tmuser && \ RUN addgroup tmuser && \
adduser -S -G tmuser tmuser adduser -S -G tmuser tmuser

6
Makefile
View File

@ -3,7 +3,7 @@ GOTOOLS = \
github.com/Masterminds/glide github.com/Masterminds/glide
PACKAGES=$(shell go list ./... | grep -v '/vendor/') PACKAGES=$(shell go list ./... | grep -v '/vendor/')
BUILD_TAGS?=tendermint BUILD_TAGS?=tendermint
TMROOT = $${TMROOT:-$$HOME/.tendermint} TMHOME = $${TMHOME:-$$HOME/.tendermint}
all: install test all: install test
@ -61,8 +61,8 @@ update_deps: tools
@go get -d -u ./... @go get -d -u ./...
revision: revision:
-echo `git rev-parse --verify HEAD` > $(TMROOT)/revision -echo `git rev-parse --verify HEAD` > $(TMHOME)/revision
-echo `git rev-parse --verify HEAD` >> $(TMROOT)/revision_history -echo `git rev-parse --verify HEAD` >> $(TMHOME)/revision_history
tools: tools:
go get -u -v $(GOTOOLS) go get -u -v $(GOTOOLS)

2
config/tendermint/config.go
View File

@ -11,7 +11,7 @@ import (
func getTMRoot(rootDir string) string { func getTMRoot(rootDir string) string {
if rootDir == "" { if rootDir == "" {
rootDir = os.Getenv("TMROOT") rootDir = os.Getenv("TMHOME")
} }
if rootDir == "" { if rootDir == "" {
rootDir = os.Getenv("HOME") + "/.tendermint" rootDir = os.Getenv("HOME") + "/.tendermint"

12
test/app/test.sh
View File

@ -8,10 +8,10 @@ set -e
# TODO: install everything # TODO: install everything
export TMROOT=$HOME/.tendermint_app export TMHOME=$HOME/.tendermint_app
function dummy_over_socket(){ function dummy_over_socket(){
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
echo "Starting dummy_over_socket" echo "Starting dummy_over_socket"
dummy > /dev/null & dummy > /dev/null &
@ -28,7 +28,7 @@ function dummy_over_socket(){
# start tendermint first # start tendermint first
function dummy_over_socket_reorder(){ function dummy_over_socket_reorder(){
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
echo "Starting dummy_over_socket_reorder (ie. start tendermint first)" echo "Starting dummy_over_socket_reorder (ie. start tendermint first)"
tendermint node > tendermint.log & tendermint node > tendermint.log &
@ -46,7 +46,7 @@ function dummy_over_socket_reorder(){
function counter_over_socket() { function counter_over_socket() {
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
echo "Starting counter_over_socket" echo "Starting counter_over_socket"
counter --serial > /dev/null & counter --serial > /dev/null &
@ -62,7 +62,7 @@ function counter_over_socket() {
} }
function counter_over_grpc() { function counter_over_grpc() {
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
echo "Starting counter_over_grpc" echo "Starting counter_over_grpc"
counter --serial --abci grpc > /dev/null & counter --serial --abci grpc > /dev/null &
@ -78,7 +78,7 @@ function counter_over_grpc() {
} }
function counter_over_grpc_grpc() { function counter_over_grpc_grpc() {
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
echo "Starting counter_over_grpc_grpc (ie. with grpc broadcast_tx)" echo "Starting counter_over_grpc_grpc (ie. with grpc broadcast_tx)"
counter --serial --abci grpc > /dev/null & counter --serial --abci grpc > /dev/null &

2
test/p2p/README.md
View File

@ -37,7 +37,7 @@ for i in $(seq 1 4); do
--ip="172.57.0.$((100 + $i))" \ --ip="172.57.0.$((100 + $i))" \
--name local_testnet_$i \ --name local_testnet_$i \
--entrypoint tendermint \ --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 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 done
``` ```

5
test/p2p/peer.sh
View File

@ -21,7 +21,7 @@ if [[ "$CIRCLECI" == true ]]; then
--ip=$(test/p2p/ip.sh $ID) \ --ip=$(test/p2p/ip.sh $ID) \
--name "local_testnet_$ID" \ --name "local_testnet_$ID" \
--entrypoint tendermint \ --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-driver=syslog \
--log-opt syslog-address=udp://127.0.0.1:5514 \ --log-opt syslog-address=udp://127.0.0.1:5514 \
--log-opt syslog-facility=daemon \ --log-opt syslog-facility=daemon \
@ -34,6 +34,7 @@ else
--ip=$(test/p2p/ip.sh $ID) \ --ip=$(test/p2p/ip.sh $ID) \
--name "local_testnet_$ID" \ --name "local_testnet_$ID" \
--entrypoint tendermint \ --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" "$DOCKER_IMAGE" node $NODE_FLAGS --log_level=info --proxy_app="$APP_PROXY"
fi fi

6
test/persist/test_failure_indices.sh
View File

@ -1,15 +1,15 @@
#! /bin/bash #! /bin/bash
export TMROOT=$HOME/.tendermint_persist export TMHOME=$HOME/.tendermint_persist
rm -rf "$TMROOT" rm -rf "$TMHOME"
tendermint init tendermint init
# use a unix socket so we can remove it # use a unix socket so we can remove it
RPC_ADDR="$(pwd)/rpc.sock" RPC_ADDR="$(pwd)/rpc.sock"
TM_CMD="tendermint node --log_level=debug --rpc_laddr=unix://$RPC_ADDR" # &> tendermint_${name}.log" 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(){ function start_procs(){

6
test/persist/test_simple.sh
View File

@ -1,15 +1,15 @@
#! /bin/bash #! /bin/bash
export TMROOT=$HOME/.tendermint_persist export TMHOME=$HOME/.tendermint_persist
rm -rf $TMROOT rm -rf $TMHOME
tendermint init tendermint init
function start_procs(){ function start_procs(){
name=$1 name=$1
echo "Starting persistent dummy and tendermint" echo "Starting persistent dummy and tendermint"
dummy --persist $TMROOT/dummy &> "dummy_${name}.log" & dummy --persist $TMHOME/dummy &> "dummy_${name}.log" &
PID_DUMMY=$! PID_DUMMY=$!
tendermint node &> tendermint_${name}.log & tendermint node &> tendermint_${name}.log &
PID_TENDERMINT=$! PID_TENDERMINT=$!