commit 054625d2bc67ede866b6a38342f3e4550cb95df2 parent 19183a06e32aadc0205b0718fd763373dfc9054c Author: Florian Dold <florian@dold.me> Date: Mon, 7 Apr 2025 21:31:53 +0200 harness: rename merchant default instance to admin Diffstat:
24 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/packages/taler-harness/src/env-full.ts b/packages/taler-harness/src/env-full.ts @@ -79,7 +79,7 @@ export async function runEnvFull(t: GlobalTestState): Promise<void> { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/harness/environments.ts b/packages/taler-harness/src/harness/environments.ts @@ -286,7 +286,7 @@ export async function useSharedTestkudosEnvironment(t: GlobalTestState) { if (!prevSetupDone) { await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( @@ -417,7 +417,7 @@ export async function createSimpleTestkudosEnvironmentV2( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( @@ -571,7 +571,7 @@ export async function createSimpleTestkudosEnvironmentV3( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( @@ -751,7 +751,7 @@ export async function createFaultInjectedMerchantTestkudosEnvironment( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); @@ -1209,7 +1209,7 @@ export async function createKycTestkudosEnvironment( await merchant.start(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts @@ -2009,8 +2009,8 @@ export class MerchantService implements MerchantServiceInterface { async addDefaultInstance(): Promise<void> { return await this.addInstanceWithWireAccount({ - id: "default", - name: "Default Instance", + id: "admin", + name: "Admin Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], auth: { method: MerchantAuthMethod.EXTERNAL, @@ -2067,7 +2067,7 @@ export class MerchantService implements MerchantServiceInterface { } makeInstanceBaseUrl(instanceName?: string): string { - if (instanceName === undefined || instanceName === "default") { + if (instanceName === undefined || instanceName === "admin") { return `http://localhost:${this.merchantConfig.httpPort}/`; } else { return `http://localhost:${this.merchantConfig.httpPort}/instances/${instanceName}/`; @@ -2410,7 +2410,7 @@ export class WalletCli { constructor( private globalTestState: GlobalTestState, - private name: string = "default", + private name: string = "admin", cliOpts: WalletCliOpts = {}, ) { const self = this; diff --git a/packages/taler-harness/src/integrationtests/test-bank-api.ts b/packages/taler-harness/src/integrationtests/test-bank-api.ts @@ -95,7 +95,7 @@ export async function runBankApiTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-currency-scope.ts b/packages/taler-harness/src/integrationtests/test-currency-scope.ts @@ -153,7 +153,7 @@ export async function runCurrencyScopeTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-exchange-management-fault.ts b/packages/taler-harness/src/integrationtests/test-exchange-management-fault.ts @@ -108,7 +108,7 @@ export async function runExchangeManagementFaultTest( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts b/packages/taler-harness/src/integrationtests/test-exchange-timetravel.ts @@ -171,7 +171,7 @@ export async function runExchangeTimetravelTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-libeufin-bank.ts b/packages/taler-harness/src/integrationtests/test-libeufin-bank.ts @@ -105,7 +105,7 @@ export async function runLibeufinBankTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-merchant-categories.ts b/packages/taler-harness/src/integrationtests/test-merchant-categories.ts @@ -75,7 +75,7 @@ export async function runMerchantCategoriesTest(t: GlobalTestState) { // Add an instance, no auth! await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], auth: { diff --git a/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts b/packages/taler-harness/src/integrationtests/test-merchant-exchange-confusion.ts @@ -135,7 +135,7 @@ export async function createConfusedMerchantTestkudosEnvironment( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts @@ -81,7 +81,7 @@ export async function runMerchantInstancesDeleteTest(t: GlobalTestState) { // Add an instance, no auth! await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], auth: { diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts @@ -63,7 +63,7 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) { succeedOrThrow( await clientForDefault.createInstance(tok, { - id: "default", + id: "admin", address: {}, use_stefan: true, default_pay_delay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances.ts @@ -82,7 +82,7 @@ export async function runMerchantInstancesTest(t: GlobalTestState) { // Add an instance, no auth! await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], auth: { @@ -92,7 +92,7 @@ export async function runMerchantInstancesTest(t: GlobalTestState) { // Add it again, should be idempotent await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], auth: { diff --git a/packages/taler-harness/src/integrationtests/test-multiexchange.ts b/packages/taler-harness/src/integrationtests/test-multiexchange.ts @@ -152,7 +152,7 @@ export async function runMultiExchangeTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-payment-fault.ts b/packages/taler-harness/src/integrationtests/test-payment-fault.ts @@ -138,7 +138,7 @@ export async function runPaymentFaultTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-payment-multiple.ts b/packages/taler-harness/src/integrationtests/test-payment-multiple.ts @@ -111,7 +111,7 @@ async function setupTest(t: GlobalTestState): Promise<{ await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-revocation.ts b/packages/taler-harness/src/integrationtests/test-revocation.ts @@ -150,7 +150,7 @@ async function createTestEnvironment( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-timetravel-autorefresh.ts b/packages/taler-harness/src/integrationtests/test-timetravel-autorefresh.ts @@ -118,7 +118,7 @@ export async function runTimetravelAutorefreshTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], }); diff --git a/packages/taler-harness/src/integrationtests/test-wallet-backup-doublespend.ts b/packages/taler-harness/src/integrationtests/test-wallet-backup-doublespend.ts @@ -122,8 +122,6 @@ export async function runWalletBackupDoublespendTest(t: GlobalTestState) { // Now we double-spend with the second wallet { - const instance = "default"; - const orderResp = succeedOrThrow( await merchantClient.createOrder(undefined, { order: { diff --git a/packages/taler-harness/src/integrationtests/test-wallet-balance.ts b/packages/taler-harness/src/integrationtests/test-wallet-balance.ts @@ -151,7 +151,7 @@ async function createMyEnvironment( await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [`payto://void/merchant-default?receiver-name=Merchant`], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts b/packages/taler-harness/src/integrationtests/test-wallet-insufficient-balance.ts @@ -93,7 +93,7 @@ export async function runWalletInsufficientBalanceTest(t: GlobalTestState) { } await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts b/packages/taler-harness/src/integrationtests/test-wallet-notifications.ts @@ -116,7 +116,7 @@ export async function runWalletNotificationsTest(t: GlobalTestState) { // Fakebank uses x-taler-bank, but merchant is configured to only accept sepa! const label = "mymerchant"; await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [ `payto://iban/SANDBOXX/${generateRandomTestIban( diff --git a/packages/taler-harness/src/integrationtests/test-wallet-wirefees.ts b/packages/taler-harness/src/integrationtests/test-wallet-wirefees.ts @@ -119,7 +119,7 @@ export async function runWalletWirefeesTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration( diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-conversion.ts @@ -200,7 +200,7 @@ export async function runWithdrawalConversionTest(t: GlobalTestState) { await merchant.pingUntilAvailable(); await merchant.addInstanceWithWireAccount({ - id: "default", + id: "admin", name: "Default Instance", paytoUris: [getTestHarnessPaytoForLabel("merchant-default")], defaultWireTransferDelay: Duration.toTalerProtocolDuration(