diff --git a/src/e2e.ts b/src/e2e.ts index 1589729e..bb2cb17d 100644 --- a/src/e2e.ts +++ b/src/e2e.ts @@ -21,7 +21,7 @@ const start = async () => { return } - const { mainHandler, local, wizard, adminManager } = keepOn + const { mainHandler, localProviderClient, wizard, adminManager } = keepOn const serverMethods = GetServerMethods(mainHandler) const nostrSettings = settingsManager.getSettings().nostrRelaySettings log("initializing nostr middleware") @@ -33,8 +33,8 @@ const start = async () => { privateKey: app.privateKey, publicKey: app.publicKey, name: app.name, - provider: app.publicKey === local.publicKey ? { - clientId: `client_${local.appId}`, + provider: app.publicKey === localProviderClient.publicKey ? { + clientId: `client_${localProviderClient.appId}`, pubkey: settingsManager.getSettings().liquiditySettings.liquidityProviderPub, relayUrl: settingsManager.getSettings().liquiditySettings.providerRelayUrl } : undefined @@ -49,7 +49,7 @@ const start = async () => { log("starting server") mainHandler.attachNostrSend(Send) mainHandler.StartBeacons() - const appNprofile = nprofileEncode({ pubkey: local.publicKey, relays: nostrSettings.relays }) + const appNprofile = nprofileEncode({ pubkey: localProviderClient.publicKey, relays: nostrSettings.relays }) if (wizard) { wizard.AddConnectInfo(appNprofile, nostrSettings.relays) } diff --git a/src/index.ts b/src/index.ts index 0eacaf06..fbe6802c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,7 +23,7 @@ const start = async () => { return } - const { mainHandler, local, wizard, adminManager } = keepOn + const { mainHandler, localProviderClient, wizard, adminManager } = keepOn const serverMethods = GetServerMethods(mainHandler) log("initializing nostr middleware") const relays = settingsManager.getSettings().nostrRelaySettings.relays @@ -34,8 +34,8 @@ const start = async () => { privateKey: app.privateKey, publicKey: app.publicKey, name: app.name, - provider: app.publicKey === local.publicKey ? { - clientId: `client_${local.appId}`, + provider: app.publicKey === localProviderClient.publicKey ? { + clientId: `client_${localProviderClient.appId}`, pubkey: settingsManager.getSettings().liquiditySettings.liquidityProviderPub, relayUrl: settingsManager.getSettings().liquiditySettings.providerRelayUrl } : undefined @@ -53,7 +53,7 @@ const start = async () => { mainHandler.attachNostrProcessPing(Ping) mainHandler.attachNostrReset(Reset) mainHandler.StartBeacons() - const appNprofile = nprofileEncode({ pubkey: local.publicKey, relays }) + const appNprofile = nprofileEncode({ pubkey: localProviderClient.publicKey, relays }) if (wizard) { wizard.AddConnectInfo(appNprofile, relays) } diff --git a/src/services/main/init.ts b/src/services/main/init.ts index d3e4c6b0..776e989a 100644 --- a/src/services/main/init.ts +++ b/src/services/main/init.ts @@ -63,11 +63,11 @@ export const initMainHandler = async (log: PubLogger, settingsManager: SettingsM return { privateKey: app.nostr_private_key, publicKey: app.nostr_public_key, appId: app.app_id, name: app.name } } })) - const local = apps.find(app => defaultNames.includes(app.name)) - if (!local) { + const localProviderClient = apps.find(app => defaultNames.includes(app.name)) + if (!localProviderClient) { throw new Error("local app not initialized correctly") } - mainHandler.liquidityProvider.setNostrInfo({ localId: `client_${local.appId}`, localPubkey: local.publicKey }) + mainHandler.liquidityProvider.setNostrInfo({ localId: `client_${localProviderClient.appId}`, localPubkey: localProviderClient.publicKey }) const stop = await processArgs(mainHandler) if (stop) { return @@ -77,7 +77,7 @@ export const initMainHandler = async (log: PubLogger, settingsManager: SettingsM await mainHandler.appUserManager.CleanupInactiveUsers() await mainHandler.appUserManager.CleanupNeverActiveUsers() await mainHandler.paymentManager.watchDog.Start() - return { mainHandler, apps, local, wizard, adminManager } + return { mainHandler, apps, localProviderClient, wizard, adminManager } } const processArgs = async (mainHandler: Main) => { diff --git a/src/tests/setupBootstrapped.ts b/src/tests/setupBootstrapped.ts index 92bdb69c..81e2e8bd 100644 --- a/src/tests/setupBootstrapped.ts +++ b/src/tests/setupBootstrapped.ts @@ -20,13 +20,13 @@ export const initBootstrappedInstance = async (T: TestBase) => { if (!initialized) { throw new Error("failed to initialize bootstrapped main handler") } - const { mainHandler: bootstrapped, local } = initialized + const { mainHandler: bootstrapped, localProviderClient } = initialized T.main.attachNostrSend(async (_, data, r) => { if (data.type === 'event') { throw new Error("unsupported event type") } - if (data.pub !== local.publicKey) { - throw new Error("invalid pub " + data.pub + " expected " + local.publicKey) + if (data.pub !== localProviderClient.publicKey) { + throw new Error("invalid pub " + data.pub + " expected " + localProviderClient.publicKey) } const j = JSON.parse(data.content) as { requestId: string } console.log("sending new operation to provider") @@ -42,7 +42,7 @@ export const initBootstrappedInstance = async (T: TestBase) => { } bootstrapped.liquidityProvider.onEvent(res, data.pub) }) - bootstrapped.liquidityProvider.setNostrInfo({ localId: `client_${local.appId}`, localPubkey: local.publicKey }) + bootstrapped.liquidityProvider.setNostrInfo({ localId: `client_${localProviderClient.appId}`, localPubkey: localProviderClient.publicKey }) await new Promise(res => { const interval = setInterval(async () => { const canHandle = bootstrapped.liquidityProvider.IsReady() @@ -54,10 +54,10 @@ export const initBootstrappedInstance = async (T: TestBase) => { } }, 500) }) - const bUser = await bootstrapped.applicationManager.AddAppUser(local.appId, { identifier: "user1_bootstrapped", balance: 0, fail_if_exists: true }) - const bootstrappedUser: TestUserData = { userId: bUser.info.userId, appUserIdentifier: bUser.identifier, appId: local.appId } + const bUser = await bootstrapped.applicationManager.AddAppUser(localProviderClient.appId, { identifier: "user1_bootstrapped", balance: 0, fail_if_exists: true }) + const bootstrappedUser: TestUserData = { userId: bUser.info.userId, appUserIdentifier: bUser.identifier, appId: localProviderClient.appId } return { - bootstrapped, local, bootstrappedUser, stop: () => { + bootstrapped, localProviderClient, bootstrappedUser, stop: () => { bootstrapped.Stop() } }