From 1258fd3592438ab84cbe23477e632ba78a16b9cc Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Thu, 3 Oct 2024 01:00:39 +0000
Subject: [PATCH] Revert "stop testing with broken upstream/version-2-0"
 (#6573)

* Revert "stop testing with broken upstream/version-2-0 (#6554)"

This reverts commit 205dff33781c05a9a342b2d8629d0d205ce07532.

* stop using template which Nim 2.0.10 will apparently make recursive
---
 .github/workflows/ci.yml | 12 +++++++++++-
 ncli/ncli_db.nim         |  3 +--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3db4bac79..bb3025379 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,8 +35,18 @@ jobs:
             cpu: amd64
           - os: windows
             cpu: amd64
-        branch: [~]
+        branch: [~, upstream/version-2-0]
+        exclude:
+          - target:
+              os: macos
+            branch: upstream/version-2-0
+          - target:
+              os: windows
+            branch: upstream/version-2-0
         include:
+          - branch: upstream/version-2-0
+            branch-short: version-2-0
+            nimflags-extra: --mm:refc
           - target:
               os: linux
             builder: ['self-hosted','ubuntu-22.04']
diff --git a/ncli/ncli_db.nim b/ncli/ncli_db.nim
index e29acd345..4f46f9503 100644
--- a/ncli/ncli_db.nim
+++ b/ncli/ncli_db.nim
@@ -777,8 +777,7 @@ proc cmdValidatorPerf(conf: DbConf, cfg: RuntimeConfig) =
       indices
     case info.kind
     of EpochInfoFork.Phase0:
-      template info: untyped = info.phase0Data
-      for i, s in info.validators:
+      for i, s in info.phase0Data.validators:
         let perf = addr perfs[i]
         if RewardFlags.isActiveInPreviousEpoch in s.flags:
           if s.is_previous_epoch_attester.isSome():