From 6ae4070d3f1559f3909cd4ff08051e6a92e5489e Mon Sep 17 00:00:00 2001
From: Zahary Karadjov <zahary@gmail.com>
Date: Mon, 9 Dec 2019 17:30:02 +0200
Subject: [PATCH] Slightly safer testnet reset detection

---
 scripts/connect_to_testnet.nims | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/connect_to_testnet.nims b/scripts/connect_to_testnet.nims
index ddb4e9970..93eab33e8 100644
--- a/scripts/connect_to_testnet.nims
+++ b/scripts/connect_to_testnet.nims
@@ -66,12 +66,17 @@ cli do (testnetName {.argument.}: string):
     depositContractOpt = "--deposit-contract=" & readFile(depositContractFile).strip
 
   if system.dirExists(dataDir):
-    if system.fileExists(dataDir/genesisFile):
-      let localGenesisContent = readFile(dataDir/genesisFile)
-      let testnetGenesisContent = readFile(testnetDir/genesisFile)
-      if localGenesisContent != testnetGenesisContent:
-        echo "Detected testnet restart. Deleting previous database..."
-        rmDir 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
   exec &"""nim c {nimFlags} -d:"const_preset={preset}" -o:"{beaconNodeBinary}" beacon_chain/beacon_node.nim"""