fix merge conflicts and rewrite qbft tests

sigp · Jan 14, 2025 · 1753155 · 1753155
2 parents 626d00c + 9389ccd
commit 1753155
Show file tree

Hide file tree

Showing 37 changed files with 4,355 additions and 1,044 deletions.
diff --git a/.github/wordlist.txt b/.github/wordlist.txt
@@ -42,4 +42,9 @@ TODOs
 UI
 Validator
 validator
-validators
+validators
+Holesky
+Mainnet
+lifecycle
+Syncer
+
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,4 @@ perf.data*
 /.vscode
 
 # cross
-/zcross
+/zcross
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ perf.data* @@
     /.vscode
     # cross
-    /zcross
+    /zcross