From 6801b775c1f11b4260b12faf21d38e57d2de68d8 Mon Sep 17 00:00:00 2001
From: ekzyis <ek@stacker.news>
Date: Mon, 19 Aug 2024 17:36:07 -0500
Subject: [PATCH] Fix inconsistency between walletTypeToResolveType and
 generateTypeDefName (#1318)

---
 api/resolvers/wallet.js | 4 ++--
 api/typeDefs/wallet.js  | 4 ++--
 lib/wallet.js           | 7 +------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/api/resolvers/wallet.js b/api/resolvers/wallet.js
index de43a61a..39a46d71 100644
--- a/api/resolvers/wallet.js
+++ b/api/resolvers/wallet.js
@@ -13,7 +13,7 @@ import assertApiKeyNotPermitted from './apiKey'
 import { bolt11Tags } from '@/lib/bolt11'
 import { finalizeHodlInvoice } from 'worker/wallet'
 import walletDefs from 'wallets/server'
-import { generateResolverName, walletTypeToResolveType } from '@/lib/wallet'
+import { generateResolverName, generateTypeDefName } from '@/lib/wallet'
 import { lnAddrOptions } from '@/lib/lnurl'
 
 function injectResolvers (resolvers) {
@@ -353,7 +353,7 @@ const resolvers = {
     wallet: async (wallet) => {
       return {
         ...wallet.wallet,
-        __resolveType: walletTypeToResolveType(wallet.type)
+        __resolveType: generateTypeDefName(wallet.type)
       }
     }
   },
diff --git a/api/typeDefs/wallet.js b/api/typeDefs/wallet.js
index 2baa2d08..203fd94b 100644
--- a/api/typeDefs/wallet.js
+++ b/api/typeDefs/wallet.js
@@ -38,7 +38,7 @@ function rawTypeDefs () {
       .map(fieldToGqlArg)
       .map(s => '  ' + s)
       .join('\n')
-    const typeDefName = generateTypeDefName(w.walletField)
+    const typeDefName = generateTypeDefName(w.walletType)
     const typeDef = `type ${typeDefName} {\n${args}\n}`
     console.log(typeDef)
     return typeDef
@@ -46,7 +46,7 @@ function rawTypeDefs () {
 
   let union = 'union WalletDetails = '
   union += walletDefs.map((w) => {
-    const typeDefName = generateTypeDefName(w.walletField)
+    const typeDefName = generateTypeDefName(w.walletType)
     return typeDefName
   }).join(' | ')
   console.log(union)
diff --git a/lib/wallet.js b/lib/wallet.js
index de24fca5..953c1fb8 100644
--- a/lib/wallet.js
+++ b/lib/wallet.js
@@ -11,12 +11,7 @@ export function generateResolverName (walletField) {
   return `upsert${capitalized}`
 }
 
-export function generateTypeDefName (walletField) {
-  return walletField[0].toUpperCase() + walletField.slice(1)
-}
-
-export function walletTypeToResolveType (walletType) {
-  // wallet type is in UPPER_CASE but __resolveType requires PascalCase
+export function generateTypeDefName (walletType) {
   const PascalCase = walletType.split('_').map(s => s[0].toUpperCase() + s.slice(1).toLowerCase()).join('')
   return `Wallet${PascalCase}`
 }