From 96ac81c89ffc55eae8828dc311298bbe4ca40b23 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Sun, 28 Jun 2020 23:22:23 +0300 Subject: [PATCH] Better UX; Don't delete testnet data folders --- beacon_chain/mainchain_monitor.nim | 2 +- scripts/connect_to_testnet.nims | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/beacon_chain/mainchain_monitor.nim b/beacon_chain/mainchain_monitor.nim index 0b777cdfc..7330d989d 100644 --- a/beacon_chain/mainchain_monitor.nim +++ b/beacon_chain/mainchain_monitor.nim @@ -414,7 +414,7 @@ method onBlockHeaders*(p: Web3DataProviderRef, if p.blockHeadersSubscription != nil: await p.blockHeadersSubscription.unsubscribe() - debug "Subscribing for block headers" + info "Waiting for new Eth1 block headers" let options = newJObject() p.blockHeadersSubscription = await p.web3.subscribeForBlockHeaders( diff --git a/scripts/connect_to_testnet.nims b/scripts/connect_to_testnet.nims index bd9bf4b07..bb670cd59 100644 --- a/scripts/connect_to_testnet.nims +++ b/scripts/connect_to_testnet.nims @@ -242,19 +242,6 @@ cli do (skipGoerliKey {. if system.fileExists(depositContractBlockFile): depositContractOpt.add " --deposit-contract-block=" & readFile(depositContractBlockFile).strip - if system.dirExists(dataDir): - block resetDataDir: - # We reset the testnet data dir if the existing data dir is - # incomplete (it misses a genesis file) or if it has a genesis - # file from an older testnet: - if system.fileExists(dataDir/genesisFile): - let localGenesisContent = readFile(dataDir/genesisFile) - let testnetGenesisContent = readFile(testnetDir/genesisFile) - if localGenesisContent == testnetGenesisContent: - break - echo "Detected testnet restart. Deleting previous database..." - rmDir dataDir - cd rootDir mkDir dataDir