possible deadlock fix

Author: omerfirmak

cmd/migration-checker/main.go

@@ -255,10 +255,18 @@ func loadZkTrie(zkTrie *trie.ZkTrie, top, paranoid bool) chan map[string][]byte
 				fmt.Println("ZK Accounts Loaded:", len(zkLeafMap))
 			}
 		}, func(f func()) {
-			<-trieLoaders
+			select {
+			case <-trieLoaders:
+			case <-time.After(time.Minute * 5):
+				f()
+				return
+			}
+
 			go func() {
+				defer func() {
+					trieLoaders <- struct{}{}
+				}()
 				f()
-				trieLoaders <- struct{}{}
 			}()
 		}, parallelismCutoffDepth, paranoid)
 		zkDone <- zkLeafMap

trie/zk_trie.go

@@ -272,15 +272,12 @@ func (t *ZkTrie) countLeaves(depth int, root *zkt.Hash, cb func(key, value []byt
 		return 1
 	} else {
 		if depth < parallelismCutoffDepth {
-			count := make(chan uint64)
+			count := make(chan uint64, 1)
 			leftT := t.Copy()
-			rightT := t.Copy()
-			go func() {
-				spawnWorker(func() {
-					count <- leftT.countLeaves(depth+1, rootNode.ChildL, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes)
-				})
-			}()
-			return rightT.countLeaves(depth+1, rootNode.ChildR, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes) + <-count
+			spawnWorker(func() {
+				count <- leftT.countLeaves(depth+1, rootNode.ChildL, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes)
+			})
+			return t.countLeaves(depth+1, rootNode.ChildR, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes) + <-count
 		} else {
 			return t.countLeaves(depth+1, rootNode.ChildL, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes) +
 				t.countLeaves(depth+1, rootNode.ChildR, cb, spawnWorker, parallelismCutoffDepth, verifyNodeHashes)