status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

need even more log lines for debugging keymanager (#5260) 

Keymanager test logs are still cut off, further increase log lines.
This commit is contained in:
Etan Kissling 2023-08-07 18:02:08 +02:00 committed by GitHub
parent b9920a3a59
commit 6a2bac5cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -392,8 +392,8 @@ endif
NIMBUS_TEST_KEYMANAGER_BASE_PORT=$$(( $(UNIT_TEST_BASE_PORT) + EXECUTOR_NUMBER * 6 + 0 )) \ NIMBUS_TEST_KEYMANAGER_BASE_PORT=$$(( $(UNIT_TEST_BASE_PORT) + EXECUTOR_NUMBER * 6 + 0 )) \
NIMBUS_TEST_SIGNING_NODE_BASE_PORT=$$(( $(UNIT_TEST_BASE_PORT) + EXECUTOR_NUMBER * 6 + 4 )) \ NIMBUS_TEST_SIGNING_NODE_BASE_PORT=$$(( $(UNIT_TEST_BASE_PORT) + EXECUTOR_NUMBER * 6 + 4 )) \
build/$${TEST_BINARY} $${PARAMS} || { \ build/$${TEST_BINARY} $${PARAMS} || { \
echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 2000 lines from the log:"; \ echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 5000 lines from the log:"; \
tail -n2000 "$${TEST_BINARY}.log"; exit 1; \ tail -n5000 "$${TEST_BINARY}.log"; exit 1; \
}; \ }; \
done; \ done; \
rm -rf 0000-*.json t_slashprot_migration.* *.log block_sim_db rm -rf 0000-*.json t_slashprot_migration.* *.log block_sim_db
@ -407,13 +407,13 @@ endif
echo -e "\nRunning $${TEST_BINARY} $${PARAMS}\n"; \ echo -e "\nRunning $${TEST_BINARY} $${PARAMS}\n"; \
if [[ "$${REDIRECT}" != "" ]]; then \ if [[ "$${REDIRECT}" != "" ]]; then \
build/$${TEST_BINARY} $${PARAMS} > "$${REDIRECT}" && echo "OK" || { \ build/$${TEST_BINARY} $${PARAMS} > "$${REDIRECT}" && echo "OK" || { \
echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 2000 lines from the log:"; \ echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 5000 lines from the log:"; \
tail -n2000 "$${TEST_BINARY}.log"; exit 1; \ tail -n5000 "$${TEST_BINARY}.log"; exit 1; \
}; \ }; \
else \ else \
build/$${TEST_BINARY} $${PARAMS} || { \ build/$${TEST_BINARY} $${PARAMS} || { \
echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 2000 lines from the log:"; \ echo -e "\n$${TEST_BINARY} $${PARAMS} failed; Last 5000 lines from the log:"; \
tail -n2000 "$${TEST_BINARY}.log"; exit 1; \ tail -n5000 "$${TEST_BINARY}.log"; exit 1; \
}; \ }; \
fi; \ fi; \
done; \ done; \

4
beacon_chain/beacon_node.nim
View File

@ -134,10 +134,10 @@ proc getPayloadBuilderClient*(
return err "Validator index too high" return err "Validator index too high"
forkyState.data.validators.item(validator_index).pubkey forkyState.data.validators.item(validator_index).pubkey
payloadBuilderAddress = payloadBuilderAddress =
if node.keyManagerHost.isNil: if node.keymanagerHost.isNil:
defaultPayloadBuilderAddress defaultPayloadBuilderAddress
else: else:
node.keyManagerHost[].getBuilderConfig(pubkey).valueOr: node.keymanagerHost[].getBuilderConfig(pubkey).valueOr:
defaultPayloadBuilderAddress defaultPayloadBuilderAddress
if payloadBuilderAddress.isNone: if payloadBuilderAddress.isNone:

3
beacon_chain/spec/state_transition.nim
View File

@ -51,6 +51,9 @@ import
export results, extras, phase0, altair, bellatrix export results, extras, phase0, altair, bellatrix
logScope:
topics = "state_transition"
# https://github.com/ethereum/consensus-specs/blob/v1.4.0-alpha.3/specs/phase0/beacon-chain.md#beacon-chain-state-transition-function # https://github.com/ethereum/consensus-specs/blob/v1.4.0-alpha.3/specs/phase0/beacon-chain.md#beacon-chain-state-transition-function
proc verify_block_signature( proc verify_block_signature(
state: ForkyBeaconState, signed_block: SomeForkySignedBeaconBlock): state: ForkyBeaconState, signed_block: SomeForkySignedBeaconBlock):

2
scripts/launch_local_testnet.sh
View File

@ -930,7 +930,7 @@ if [[ "${LIGHTHOUSE_VC_NODES}" != "0" ]]; then
fi fi
dump_logs() { dump_logs() {
LOG_LINES=100 LOG_LINES=50
for LOG in "${DATA_DIR}"/logs/*; do for LOG in "${DATA_DIR}"/logs/*; do
echo "Last ${LOG_LINES} lines of ${LOG}:" echo "Last ${LOG_LINES} lines of ${LOG}:"
tail -n ${LOG_LINES} "${LOG}" tail -n ${LOG_LINES} "${LOG}"

3
tests/test_keymanager_api.nim
View File

@ -1494,7 +1494,8 @@ let
for topicName in [ for topicName in [
"libp2p", "gossipsub", "gossip_eth2", "message_router", "batch_validation", "libp2p", "gossipsub", "gossip_eth2", "message_router", "batch_validation",
"syncpool"]: "syncpool", "syncman", "fork_choice", "attpool", "val_pool", "consens",
"state_transition"]:
doAssert setTopicState(topicName, Disabled) doAssert setTopicState(topicName, Disabled)
waitFor main(basePort) waitFor main(basePort)