Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TMPDIR usage #2204

Merged
merged 2 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions scripts/benchmark-weight-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ function usage() {

[ $# -ne 3 ] && (usage; exit 1)

# setup TMPDIR
export TMPDIR=$(mktemp -d)
cleanup() {
echo "removing $1 ..."
rm -rf "$1"
}
trap 'cleanup $TMPDIR' INT TERM EXIT

# pull docker image
docker pull litentry/litentry-parachain:runtime-benchmarks

# clone the repo
TMPDIR=/tmp
cd "$TMPDIR"
[ -d litentry-parachain ] && rm -rf litentry-parachain
git clone https://github.com/litentry/litentry-parachain
cd litentry-parachain
git checkout "$2"
Expand Down
6 changes: 3 additions & 3 deletions scripts/clean-local-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# no `set -e` here as we allow commands to fail in this script

TMPDIR=${TMPDIR:-"/tmp/parachain_dev*"}
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved

# for f in $(ls $TMPDIR/*.pid 2>/dev/null); do
# for f in $(ls $LITENTRY_PARACHAIN_DIR/*.pid 2>/dev/null); do
# echo "Killing $f ..."
# kill -9 $(cat "$f")
# done
Expand All @@ -14,6 +14,6 @@ TMPDIR=${TMPDIR:-"/tmp/parachain_dev*"}
killall polkadot
killall litentry-collator

rm -rf "$TMPDIR"
rm -rf "$LITENTRY_PARACHAIN_DIR"

echo "cleaned up."
4 changes: 2 additions & 2 deletions scripts/clean-local-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function usage() {

[ $# -ne 1 ] && (usage; exit 1)

TMPDIR=${TMPDIR:-"/tmp/parachain_dev*"}
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved
CHAIN=$1

ROOTDIR=$(git rev-parse --show-toplevel)
Expand Down Expand Up @@ -39,7 +39,7 @@ echo "remove generated images..."
IMG=$(docker images --filter=reference="generated-$CHAIN*" --format "{{.Repository}}:{{.Tag}}")
[ -z "$IMG" ] || docker rmi -f $IMG

rm -rf "$TMPDIR"
rm -rf "$LITENTRY_PARACHAIN_DIR"
rm -rf "$ROOTDIR/ts-tests/bridge/bob.json"
rm -rf "$ROOTDIR/ts-tests/bridge/data/"

Expand Down
6 changes: 2 additions & 4 deletions scripts/fork-parachain-and-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ set -eo pipefail
# - use this chain spec to launch a local parachain network

ROOTDIR=$(git rev-parse --show-toplevel)
TMPDIR=$(mktemp -d /tmp/XXXXXX)

# setup TMPDIR
export TMPDIR=$(mktemp -d)
cleanup() {
echo "removing $1 ..."
rm -rf "$1"
exit
}

trap 'cleanup $TMPDIR' INT TERM EXIT

FORK_OFF_SUBSTRATE_REPO="https://github.com/litentry/fork-off-substrate.git"
Expand Down Expand Up @@ -66,7 +65,6 @@ case "$ORIG_CHAIN" in
exit 1 ;;
esac

echo "TMPDIR is $TMPDIR"
cd "$TMPDIR"
git clone "$FORK_OFF_SUBSTRATE_REPO"
cd fork-off-substrate
Expand Down
10 changes: 5 additions & 5 deletions scripts/geth/run_geth.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

TMPDIR=${TMPDIR:-"/tmp/parachain_dev"}
[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR"

DOCKER='local'

Expand All @@ -19,9 +19,9 @@ GETH_BIN="geth"
if ! geth version &>/dev/null; then
echo "geth could not be found..download now"
url="https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.10.21-67109427.tar.gz"
GETH_BIN="$TMPDIR/geth"
wget -O "$TMPDIR/geth.tar.gz" -q "$url"
tar -xf "$TMPDIR/geth.tar.gz" --strip-components 1 -C "$TMPDIR"
GETH_BIN="$LITENTRY_PARACHAIN_DIR/geth"
wget -O "$LITENTRY_PARACHAIN_DIR/geth.tar.gz" -q "$url"
tar -xf "$LITENTRY_PARACHAIN_DIR/geth.tar.gz" --strip-components 1 -C "$LITENTRY_PARACHAIN_DIR"
chmod a+x "$GETH_BIN"
fi

Expand Down
15 changes: 7 additions & 8 deletions scripts/launch-local-binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ CHAIN=$1
POLKADOT_BIN="$2"
PARACHAIN_BIN="$3"

# Check if TMPDIR is already set
TMPDIR=${TMPDIR:-"/tmp/parachain_dev"}
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}

[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR"
ROOTDIR=$(git rev-parse --show-toplevel)

cd "$ROOTDIR"
Expand All @@ -48,7 +47,7 @@ if [ -z "$POLKADOT_BIN" ]; then
# polkadot could publish release which has no binary
#
url="https://github.com/paritytech/polkadot/releases/download/v0.9.39/polkadot"
POLKADOT_BIN="$TMPDIR/polkadot"
POLKADOT_BIN="$LITENTRY_PARACHAIN_DIR/polkadot"
wget -O "$POLKADOT_BIN" -q "$url"
chmod a+x "$POLKADOT_BIN"
fi
Expand Down Expand Up @@ -77,7 +76,7 @@ if ! "$PARACHAIN_BIN" --version &> /dev/null; then
exit 1
fi

cd "$TMPDIR"
cd "$LITENTRY_PARACHAIN_DIR"

echo "starting dev network with binaries ..."

Expand Down Expand Up @@ -118,7 +117,7 @@ else
echo "NODE_ENV=${NODE_ENV}" > .env
fi
pnpm install
pnpm run register-parathread 2>&1 | tee "$TMPDIR/register-parathread.log"
pnpm run register-parathread 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/register-parathread.log"
print_divider

echo "upgrade parathread to parachain now ..."
Expand All @@ -131,9 +130,9 @@ else
echo "NODE_ENV=${NODE_ENV}" > .env
fi
pnpm install
pnpm run upgrade-parathread 2>&1 | tee "$TMPDIR/upgrade-parathread.log"
pnpm run upgrade-parathread 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/upgrade-parathread.log"
print_divider

echo "done. please check $TMPDIR for generated files if need"
echo "done. please check $LITENTRY_PARACHAIN_DIR for generated files if need"

print_divider
6 changes: 3 additions & 3 deletions scripts/launch-local-bridge-binary.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env bash

TMPDIR=${TMPDIR:-"/tmp/parachain_dev"}
[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR"

ROOTDIR=$(git rev-parse --show-toplevel)

GOPATH=${HOME}/go go install github.com/litentry/ChainBridge/cmd/chainbridge@dev

cp ${HOME}/go/bin/chainbridge $TMPDIR/chainbridge
cp ${HOME}/go/bin/chainbridge $LITENTRY_PARACHAIN_DIR/chainbridge

${ROOTDIR}/scripts/geth/run_geth.sh

8 changes: 4 additions & 4 deletions scripts/launch-local-bridge-docker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

TMPDIR=${TMPDIR:-"/tmp/parachain_dev"}
[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR"

ROOTDIR=$(git rev-parse --show-toplevel)

Expand All @@ -13,8 +13,8 @@ fi
echo "------------------------------------------------------------"

docker run -d --rm --name chainbridge litentry/chainbridge bash -c 'ls /go/bin/ && sleep 5'
docker cp chainbridge:/go/bin/chainbridge ${TMPDIR}/
echo "copy binary:chainbridge to ${TMPDIR}"
docker cp chainbridge:/go/bin/chainbridge ${LITENTRY_PARACHAIN_DIR}/
echo "copy binary:chainbridge to ${LITENTRY_PARACHAIN_DIR}"

echo "------------------------------------------------------------"

Expand Down
13 changes: 6 additions & 7 deletions scripts/run-ts-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,17 @@ fi
ROOTDIR=$(git rev-parse --show-toplevel)
cd "$ROOTDIR/ts-tests"

TMPDIR=${TMPDIR:-"/tmp/parachain_dev"}

[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
LITENTRY_PARACHAIN_DIR=${LITENTRY_PARACHAIN_DIR:?}
[ -d "$LITENTRY_PARACHAIN_DIR" ] || mkdir -p "$LITENTRY_PARACHAIN_DIR"

[ -f .env ] || echo "NODE_ENV=ci" >.env
pnpm install
pnpm run test-filter 2>&1 | tee "$TMPDIR/parachain_ci_test.log"
pnpm run test-filter 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
if $bridge; then
pnpm run test-bridge 2>&1 | tee -a "$TMPDIR/parachain_ci_test.log"
pnpm run test-bridge 2>&1 | tee -a "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
fi

if $evm; then
pnpm run test-evm-transfer 2>&1 | tee "$TMPDIR/parachain_ci_test.log"
pnpm run test-evm-contract 2>&1 | tee "$TMPDIR/parachain_ci_test.log"
pnpm run test-evm-transfer 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
pnpm run test-evm-contract 2>&1 | tee "$LITENTRY_PARACHAIN_DIR/parachain_ci_test.log"
fi
4 changes: 2 additions & 2 deletions tee-worker/local-setup/launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ def main(processes, config_path, parachain_type, log_config_path, offset, parach
# Litentry
print("Starting litentry parachain in background ...")
if parachain_type == "local-docker":
os.environ['TMPDIR'] = parachain_dir
os.environ['LITENTRY_PARACHAIN_DIR'] = parachain_dir
setup_environment(offset, config, parachain_dir)
# TODO: use Popen and copy the stdout also to node.log
run(["./scripts/litentry/start_parachain.sh"], check=True)
elif parachain_type == "local-binary":
# Export Parachain Directory as Global Variable
os.environ['TMPDIR'] = parachain_dir
os.environ['LITENTRY_PARACHAIN_DIR'] = parachain_dir
setup_environment(offset, config, parachain_dir)
run(["../scripts/launch-local-binary.sh", "rococo"], check=True)
elif parachain_type == "remote":
Expand Down