run local finalization testnets with Geth (#4138)

This commit is contained in:
Etan Kissling 2022-09-18 07:44:20 +02:00 committed by GitHub
parent ab3ac64b19
commit 3f17ceb0e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions

View File

@ -96,7 +96,9 @@ TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))
dist-win64 \ dist-win64 \
dist-macos \ dist-macos \
dist-macos-arm64 \ dist-macos-arm64 \
dist dist \
local-testnet-minimal \
local-testnet-mainnet
ifeq ($(NIM_PARAMS),) ifeq ($(NIM_PARAMS),)
# "variables.mk" was not included, so we update the submodules. # "variables.mk" was not included, so we update the submodules.
@ -175,6 +177,12 @@ restapi-test:
--resttest-delay 30 \ --resttest-delay 30 \
--kill-old-processes --kill-old-processes
ifneq ($(shell uname -p), arm)
TESTNET_EXTRA_FLAGS := --run-geth --dl-geth
else
TESTNET_EXTRA_FLAGS :=
endif
local-testnet-minimal: local-testnet-minimal:
./scripts/launch_local_testnet.sh \ ./scripts/launch_local_testnet.sh \
--data-dir $@ \ --data-dir $@ \
@ -194,6 +202,7 @@ local-testnet-minimal:
--el-port-offset 5 \ --el-port-offset 5 \
--timeout 600 \ --timeout 600 \
--kill-old-processes \ --kill-old-processes \
$(TESTNET_EXTRA_FLAGS) \
-- \ -- \
--verify-finalization \ --verify-finalization \
--discv5:no --discv5:no
@ -216,6 +225,7 @@ local-testnet-mainnet:
--el-port-offset 5 \ --el-port-offset 5 \
--timeout 2400 \ --timeout 2400 \
--kill-old-processes \ --kill-old-processes \
$(TESTNET_EXTRA_FLAGS) \
-- \ -- \
--verify-finalization \ --verify-finalization \
--discv5:no --discv5:no
@ -347,7 +357,7 @@ GOERLI_TESTNETS_PARAMS := \
--metrics \ --metrics \
--metrics-port=$$(( $(BASE_METRICS_PORT) + $(NODE_ID) )) \ --metrics-port=$$(( $(BASE_METRICS_PORT) + $(NODE_ID) )) \
--rest \ --rest \
--rest-port=$$(( $(BASE_REST_PORT) +$(NODE_ID) )) --rest-port=$$(( $(BASE_REST_PORT) + $(NODE_ID) ))
eth2_network_simulation: | build deps clean_eth2_network_simulation_all eth2_network_simulation: | build deps clean_eth2_network_simulation_all
+ GIT_ROOT="$$PWD" NIMFLAGS="$(NIMFLAGS)" LOG_LEVEL="$(LOG_LEVEL)" tests/simulation/start-in-tmux.sh + GIT_ROOT="$$PWD" NIMFLAGS="$(NIMFLAGS)" LOG_LEVEL="$(LOG_LEVEL)" tests/simulation/start-in-tmux.sh
@ -412,7 +422,7 @@ define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT
--log-level="$(RUNTIME_LOG_LEVEL)" \ --log-level="$(RUNTIME_LOG_LEVEL)" \
--log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_vc_$$(date +"%Y%m%d%H%M%S").log \ --log-file=build/data/shared_$(1)_$(NODE_ID)/nbc_vc_$$(date +"%Y%m%d%H%M%S").log \
--data-dir=build/data/shared_$(1)_$(NODE_ID) \ --data-dir=build/data/shared_$(1)_$(NODE_ID) \
--rest-port=$$(( $(BASE_REST_PORT) +$(NODE_ID) )) --rest-port=$$(( $(BASE_REST_PORT) + $(NODE_ID) ))
endef endef
define CONNECT_TO_NETWORK_WITH_LIGHT_CLIENT define CONNECT_TO_NETWORK_WITH_LIGHT_CLIENT