From 411330ace9981b571693f6aca6ef534aaadc69d1 Mon Sep 17 00:00:00 2001 From: Christopher Cooper Date: Wed, 7 May 2025 18:51:20 -0700 Subject: [PATCH] [myt/wacca] remove version compat code --- .../import-types/api/myt-wacca/class-handler.ts | 11 +---------- server/src/proto/generated/wacca/common_pb.d.ts | 5 ----- server/src/proto/generated/wacca/common_pb.js | 5 ----- server/src/proto/myt/wacca/common.proto | 8 -------- 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/server/src/lib/score-import/import-types/api/myt-wacca/class-handler.ts b/server/src/lib/score-import/import-types/api/myt-wacca/class-handler.ts index e181b9e67f..1ea9288f9c 100644 --- a/server/src/lib/score-import/import-types/api/myt-wacca/class-handler.ts +++ b/server/src/lib/score-import/import-types/api/myt-wacca/class-handler.ts @@ -18,12 +18,7 @@ export default async function CreateMytWACCAClassHandler( const data = dataRes; return (_gptString, _userID, _ratings, _logger) => { - // In Apr/May 2025, the keys for version data are changing from - // 0-indexed (starting at WACCA) to custom enum values. - // TODO: Once MYT transitions over to the new enum, remove the _OLD - // values from the enum proto definition, and remove the compatibility - // code below. - // Currently (Apr. 2025) Reverse and Plus are supported on Myt. + // Currently (May 2025) Reverse and Plus are supported on Myt. // We look for both Reverse and PLUS version data, PLUS being prioritized if exists. // If / when custom dans are added, this will need to change. const versionDataMap = data.getVersionDataMap(); @@ -31,12 +26,8 @@ export default async function CreateMytWACCAClassHandler( if (versionDataMap.has(WaccaVersion.WACCA_VERSION_PLUS)) { versionData = versionDataMap.get(WaccaVersion.WACCA_VERSION_PLUS); - } else if (versionDataMap.has(WaccaVersion.WACCA_VERSION_PLUS_OLD)) { - versionData = versionDataMap.get(WaccaVersion.WACCA_VERSION_PLUS_OLD); } else if (versionDataMap.has(WaccaVersion.WACCA_VERSION_REVERSE)) { versionData = versionDataMap.get(WaccaVersion.WACCA_VERSION_REVERSE); - } else if (versionDataMap.has(WaccaVersion.WACCA_VERSION_REVERSE_OLD)) { - versionData = versionDataMap.get(WaccaVersion.WACCA_VERSION_REVERSE_OLD); } // rank: diff --git a/server/src/proto/generated/wacca/common_pb.d.ts b/server/src/proto/generated/wacca/common_pb.d.ts index 6a2e35cf17..54e38fc6c4 100644 --- a/server/src/proto/generated/wacca/common_pb.d.ts +++ b/server/src/proto/generated/wacca/common_pb.d.ts @@ -73,11 +73,6 @@ export namespace WaccaJudge { export interface WaccaVersionMap { WACCA_VERSION_UNSPECIFIED: 0; - WACCA_VERSION_S_OLD: 1; - WACCA_VERSION_LILY_OLD: 2; - WACCA_VERSION_LILY_R_OLD: 3; - WACCA_VERSION_REVERSE_OLD: 4; - WACCA_VERSION_PLUS_OLD: 5; WACCA_VERSION_WACCA: 100; WACCA_VERSION_S: 150; WACCA_VERSION_LILY: 200; diff --git a/server/src/proto/generated/wacca/common_pb.js b/server/src/proto/generated/wacca/common_pb.js index f22039711f..d28b9626d6 100644 --- a/server/src/proto/generated/wacca/common_pb.js +++ b/server/src/proto/generated/wacca/common_pb.js @@ -544,11 +544,6 @@ proto.mythos.wacca.v0.WaccaJudge.prototype.setMiss = function(value) { */ proto.mythos.wacca.v0.WaccaVersion = { WACCA_VERSION_UNSPECIFIED: 0, - WACCA_VERSION_S_OLD: 1, - WACCA_VERSION_LILY_OLD: 2, - WACCA_VERSION_LILY_R_OLD: 3, - WACCA_VERSION_REVERSE_OLD: 4, - WACCA_VERSION_PLUS_OLD: 5, WACCA_VERSION_WACCA: 100, WACCA_VERSION_S: 150, WACCA_VERSION_LILY: 200, diff --git a/server/src/proto/myt/wacca/common.proto b/server/src/proto/myt/wacca/common.proto index 008d4e726d..5f1f3e9efd 100644 --- a/server/src/proto/myt/wacca/common.proto +++ b/server/src/proto/myt/wacca/common.proto @@ -5,14 +5,6 @@ package mythos.wacca.v0; enum WaccaVersion { WACCA_VERSION_UNSPECIFIED = 0; - - // TODO: once MYT transitions over to the new enum, remove the _OLD values - WACCA_VERSION_S_OLD = 1; - WACCA_VERSION_LILY_OLD = 2; - WACCA_VERSION_LILY_R_OLD = 3; - WACCA_VERSION_REVERSE_OLD = 4; - WACCA_VERSION_PLUS_OLD = 5; - WACCA_VERSION_WACCA = 100; WACCA_VERSION_S = 150; WACCA_VERSION_LILY = 200;