From 514d8f9232a58c8117a51c271405bf95dc6a4695 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Sun, 14 Apr 2019 20:17:22 +1000
Subject: [PATCH] Fix runner/handler references

---
 test_generators/bls/main.py                 | 6 ++++++
 test_generators/operations/deposits.py      | 6 ++++--
 test_generators/shuffling/main.py           | 2 ++
 test_generators/ssz/main.py                 | 9 ++++++---
 test_libs/gen_helpers/gen_base/gen_suite.py | 2 ++
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/test_generators/bls/main.py b/test_generators/bls/main.py
index da6a79aae..ef80635de 100644
--- a/test_generators/bls/main.py
+++ b/test_generators/bls/main.py
@@ -166,6 +166,7 @@ def bls_msg_hash_uncompressed_suite(configs_path: str) -> gen_typing.TestSuiteOu
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="msg_hash_uncompressed",
         test_cases=case01_message_hash_G2_uncompressed()))
 
@@ -177,6 +178,7 @@ def bls_msg_hash_compressed_suite(configs_path: str) -> gen_typing.TestSuiteOutp
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="msg_hash_compressed",
         test_cases=case02_message_hash_G2_compressed()))
 
@@ -189,6 +191,7 @@ def bls_priv_to_pub_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="priv_to_pub",
         test_cases=case03_private_to_public_key()))
 
@@ -200,6 +203,7 @@ def bls_sign_msg_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="sign_msg",
         test_cases=case04_sign_messages()))
 
@@ -211,6 +215,7 @@ def bls_aggregate_sigs_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="aggregate_sigs",
         test_cases=case06_aggregate_sigs()))
 
@@ -222,6 +227,7 @@ def bls_aggregate_pubkeys_suite(configs_path: str) -> gen_typing.TestSuiteOutput
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="bls",
         handler="aggregate_pubkeys",
         test_cases=case07_aggregate_pubkeys()))
 
diff --git a/test_generators/operations/deposits.py b/test_generators/operations/deposits.py
index a72b1fbaa..e92731cbb 100644
--- a/test_generators/operations/deposits.py
+++ b/test_generators/operations/deposits.py
@@ -155,7 +155,8 @@ def mini_deposits_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="testing",
         forks=["phase0"],
         config="minimal",
-        handler="core",
+        runner="operations",
+        handler="deposits",
         test_cases=deposit_cases()))
 
 
@@ -169,5 +170,6 @@ def full_deposits_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
-        handler="core",
+        runner="operations",
+        handler="deposits",
         test_cases=deposit_cases()))
diff --git a/test_generators/shuffling/main.py b/test_generators/shuffling/main.py
index e8b2054a2..2c4faeb8f 100644
--- a/test_generators/shuffling/main.py
+++ b/test_generators/shuffling/main.py
@@ -30,6 +30,7 @@ def mini_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="testing",
         forks=["phase0"],
         config="minimal",
+        runner="shuffling",
         handler="core",
         test_cases=shuffling_test_cases()))
 
@@ -44,6 +45,7 @@ def full_shuffling_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline="mainnet",
         forks=["phase0"],
         config="mainnet",
+        runner="shuffling",
         handler="core",
         test_cases=shuffling_test_cases()))
 
diff --git a/test_generators/ssz/main.py b/test_generators/ssz/main.py
index 0e5d9d7c8..c1af4ce5f 100644
--- a/test_generators/ssz/main.py
+++ b/test_generators/ssz/main.py
@@ -14,7 +14,8 @@ def ssz_random_uint_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline= "mainnet",
         forks=["phase0"],
         config="mainnet",
-        handler="core",
+        runner="ssz",
+        handler="uint",
         test_cases=generate_random_uint_test_cases()))
 
 def ssz_wrong_uint_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
@@ -24,7 +25,8 @@ def ssz_wrong_uint_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline= "mainnet",
         forks=["phase0"],
         config="mainnet",
-        handler="core",
+        runner="ssz",
+        handler="uint",
         test_cases=generate_uint_wrong_length_test_cases()))
 
 def ssz_uint_bounds_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
@@ -34,7 +36,8 @@ def ssz_uint_bounds_suite(configs_path: str) -> gen_typing.TestSuiteOutput:
         forks_timeline= "mainnet",
         forks=["phase0"],
         config="mainnet",
-        handler="core",
+        runner="ssz",
+        handler="uint",
         test_cases=generate_uint_bounds_test_cases() + generate_uint_out_of_bounds_test_cases()))
 
 
diff --git a/test_libs/gen_helpers/gen_base/gen_suite.py b/test_libs/gen_helpers/gen_base/gen_suite.py
index 3459d9ae3..a3f88791f 100644
--- a/test_libs/gen_helpers/gen_base/gen_suite.py
+++ b/test_libs/gen_helpers/gen_base/gen_suite.py
@@ -9,6 +9,7 @@ def render_suite(*,
                  title: str, summary: str,
                  forks_timeline: str, forks: Iterable[str],
                  config: str,
+                 runner: str,
                  handler: str,
                  test_cases: Iterable[TestCase]):
     yield "title", title
@@ -16,5 +17,6 @@ def render_suite(*,
     yield "forks_timeline", forks_timeline,
     yield "forks", forks
     yield "config", config
+    yield "runner", runner
     yield "handler", handler
     yield "test_cases", test_cases