From c57d3c217677f8137f62f103bde4ca7893277f8d Mon Sep 17 00:00:00 2001
From: James Meakin <12661555+jmsmkn@users.noreply.github.com>
Date: Fri, 2 Aug 2024 18:59:21 +0200
Subject: [PATCH] Remove duplication

---
 tests/scripts/create_test_fixtures.py | 17 ++++++++---------
 tests/utils.py                        | 10 ++++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/scripts/create_test_fixtures.py b/tests/scripts/create_test_fixtures.py
index 41c4830..3fd77ee 100644
--- a/tests/scripts/create_test_fixtures.py
+++ b/tests/scripts/create_test_fixtures.py
@@ -55,6 +55,13 @@
     "archive",
 ]
 
+USER_TOKENS = {
+    "admin": "1b9436200001f2eaf57cd77db075cbb60a49a00a",
+    "readerstudy": "01614a77b1c0b4ecd402be50a8ff96188d5b011d",
+    "demop": "00aa710f4dc5621a0cb64b0795fbba02e39d7700",
+    "archive": "0d284528953157759d26c469297afcf6fd367f71",
+}
+
 
 def run():
     """Creates the main project, demo user and demo challenge."""
@@ -294,16 +301,8 @@ def _create_archive(users):
 
 
 def _create_user_tokens(users):
-    # Hard code tokens used in gcapi integration tests
-    user_tokens = {
-        "admin": "1b9436200001f2eaf57cd77db075cbb60a49a00a",
-        "readerstudy": "01614a77b1c0b4ecd402be50a8ff96188d5b011d",
-        "demop": "00aa710f4dc5621a0cb64b0795fbba02e39d7700",
-        "archive": "0d284528953157759d26c469297afcf6fd367f71",
-    }
-
     out = f"{'*' * 80}\n"
-    for user, token in user_tokens.items():
+    for user, token in USER_TOKENS.items():
         digest = crypto.hash_token(token)
 
         AuthToken(
diff --git a/tests/utils.py b/tests/utils.py
index 2685b30..eee8a63 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -3,10 +3,12 @@
 
 from httpx import AsyncHTTPTransport, HTTPStatusError, HTTPTransport
 
-ADMIN_TOKEN = "1b9436200001f2eaf57cd77db075cbb60a49a00a"
-READERSTUDY_TOKEN = "01614a77b1c0b4ecd402be50a8ff96188d5b011d"
-DEMO_PARTICIPANT_TOKEN = "00aa710f4dc5621a0cb64b0795fbba02e39d7700"
-ARCHIVE_TOKEN = "0d284528953157759d26c469297afcf6fd367f71"
+from tests.scripts.create_test_fixtures import USER_TOKENS
+
+ADMIN_TOKEN = USER_TOKENS["admin"]
+READERSTUDY_TOKEN = USER_TOKENS["reader_study"]
+DEMO_PARTICIPANT_TOKEN = USER_TOKENS["demo_participant"]
+ARCHIVE_TOKEN = USER_TOKENS["archive"]
 
 
 def recurse_call(func):