re-enable LC in local testnet (#3857)
`a48d741022f6b0da1bb679e0ede4e38c019242cf` disabled LC in local testnet as an undocumented side effect. Re-enabling for more thorough testing, and added handling of LC with `--eth2-docker-image`.
This commit is contained in:
parent
99eca42b13
commit
20491560b6
|
@ -82,7 +82,7 @@ ETH2_DOCKER_IMAGE=""
|
||||||
REMOTE_SIGNER_NODES=0
|
REMOTE_SIGNER_NODES=0
|
||||||
REMOTE_SIGNER_THRESHOLD=1
|
REMOTE_SIGNER_THRESHOLD=1
|
||||||
REMOTE_VALIDATORS_COUNT=0
|
REMOTE_VALIDATORS_COUNT=0
|
||||||
LC_NODES=0
|
LC_NODES=1
|
||||||
ACCOUNT_PASSWORD="nimbus"
|
ACCOUNT_PASSWORD="nimbus"
|
||||||
RUN_GETH="0"
|
RUN_GETH="0"
|
||||||
DL_GETH="0"
|
DL_GETH="0"
|
||||||
|
@ -230,10 +230,11 @@ while true; do
|
||||||
--eth2-docker-image)
|
--eth2-docker-image)
|
||||||
ETH2_DOCKER_IMAGE="$2"
|
ETH2_DOCKER_IMAGE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
# TODO The validator client is still not being shipped with
|
# TODO The validator client and light client are not being shipped with
|
||||||
# our docker images, so we must disable it:
|
# our docker images, so we must disable them:
|
||||||
echo "warning: --eth-docker-image implies --disable-vc"
|
echo "warning: --eth-docker-image implies --disable-vc --light-clients=0"
|
||||||
USE_VC="0"
|
USE_VC="0"
|
||||||
|
LC_NODES="0"
|
||||||
;;
|
;;
|
||||||
--lighthouse-vc-nodes)
|
--lighthouse-vc-nodes)
|
||||||
LIGHTHOUSE_VC_NODES="$2"
|
LIGHTHOUSE_VC_NODES="$2"
|
||||||
|
@ -269,6 +270,12 @@ while true; do
|
||||||
exit 1
|
exit 1
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
if [[ -n "${ETH2_DOCKER_IMAGE}" ]]; then
|
||||||
|
if (( USE_VC || LC_NODES )); then
|
||||||
|
echo "invalid config: USE_VC=${USE_VC} LC_NODES=${LC_NODES}"
|
||||||
|
false
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# when sourcing env.sh, it will try to execute $@, so empty it
|
# when sourcing env.sh, it will try to execute $@, so empty it
|
||||||
EXTRA_ARGS="$@"
|
EXTRA_ARGS="$@"
|
||||||
|
|
Loading…
Reference in New Issue