1 files changed, 80 insertions, 23 deletions

diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
index 337f3ca44..b5197afd7 100644
--- a/packages/taler-harness/src/harness/harness.ts
+++ b/packages/taler-harness/src/harness/harness.ts
@@ -56,6 +56,7 @@ import {
   TippingReserveStatus,
   WalletNotification,
   codecForAny,
+  AccountAddDetails,
 } from "@gnu-taler/taler-util";
 import {
   createPlatformHttpLib,
@@ -760,19 +761,19 @@ export class ExchangeService implements ExchangeServiceInterface {
     return new ExchangeService(gc, ec, cfgFilename, keyPair);
   }
 
-  private currentTimetravel: Duration | undefined;
+  private currentTimetravelOffsetMs: number | undefined;
 
-  setTimetravel(t: Duration | undefined): void {
+  setTimetravel(t: number | undefined): void {
     if (this.isRunning()) {
       throw Error("can't set time travel while the exchange is running");
     }
-    this.currentTimetravel = t;
+    this.currentTimetravelOffsetMs = t;
   }
 
   private get timetravelArg(): string | undefined {
-    if (this.currentTimetravel && this.currentTimetravel.d_ms !== "forever") {
+    if (this.currentTimetravelOffsetMs != null) {
       // Convert to microseconds
-      return `--timetravel=+${this.currentTimetravel.d_ms * 1000}`;
+      return `--timetravel=+${this.currentTimetravelOffsetMs * 1000}`;
     }
     return undefined;
   }
@@ -1360,12 +1361,26 @@ export const harnessHttpLib = createPlatformHttpLib({
 });
 
 export class MerchantApiClient {
-  constructor(
-    private baseUrl: string,
-    public readonly auth: MerchantAuthConfiguration,
-  ) {}
+  /**
+   * Base URL for the particular instance that this merchant API client
+   * is for.
+   */
+  private baseUrl: string;
 
-  httpClient = createPlatformHttpLib({ allowHttp: true, enableThrottling: false });
+  readonly auth: MerchantAuthConfiguration;
+
+  constructor(baseUrl: string, auth?: MerchantAuthConfiguration) {
+    this.baseUrl = baseUrl;
+
+    this.auth = auth ?? {
+      method: "external",
+    };
+  }
+
+  httpClient = createPlatformHttpLib({
+    allowHttp: true,
+    enableThrottling: false,
+  });
 
   async changeAuth(auth: MerchantAuthConfiguration): Promise<void> {
     const url = new URL("private/auth", this.baseUrl);
@@ -1463,7 +1478,38 @@ export class MerchantApiClient {
     }
   }
 
-  makeAuthHeader(): Record<string, string> {
+  async createOrder(
+    req: MerchantPostOrderRequest,
+  ): Promise<MerchantPostOrderResponse> {
+    let url = new URL("private/orders", this.baseUrl);
+    const resp = await harnessHttpLib.fetch(url.href, {
+      method: "POST",
+      body: req,
+      headers: this.makeAuthHeader(),
+    });
+    return readSuccessResponseJsonOrThrow(
+      resp,
+      codecForMerchantPostOrderResponse(),
+    );
+  }
+
+  async queryPrivateOrderStatus(
+    query: PrivateOrderStatusQuery,
+  ): Promise<MerchantOrderPrivateStatusResponse> {
+    const reqUrl = new URL(`private/orders/${query.orderId}`, this.baseUrl);
+    if (query.sessionId) {
+      reqUrl.searchParams.set("session_id", query.sessionId);
+    }
+    const resp = await harnessHttpLib.fetch(reqUrl.href, {
+      headers: this.makeAuthHeader(),
+    });
+    return readSuccessResponseJsonOrThrow(
+      resp,
+      codecForMerchantOrderPrivateStatusResponse(),
+    );
+  }
+
+  private makeAuthHeader(): Record<string, string> {
     switch (this.auth.method) {
       case "external":
         return {};
@@ -1633,23 +1679,23 @@ export class MerchantService implements MerchantServiceInterface {
     private configFilename: string,
   ) {}
 
-  private currentTimetravel: Duration | undefined;
+  private currentTimetravelOffsetMs: number | undefined;
 
   private isRunning(): boolean {
     return !!this.proc;
   }
 
-  setTimetravel(t: Duration | undefined): void {
+  setTimetravel(t: number | undefined): void {
     if (this.isRunning()) {
       throw Error("can't set time travel while the exchange is running");
     }
-    this.currentTimetravel = t;
+    this.currentTimetravelOffsetMs = t;
   }
 
   private get timetravelArg(): string | undefined {
-    if (this.currentTimetravel && this.currentTimetravel.d_ms !== "forever") {
+    if (this.currentTimetravelOffsetMs != null) {
       // Convert to microseconds
-      return `--timetravel=+${this.currentTimetravel.d_ms * 1000}`;
+      return `--timetravel=+${this.currentTimetravelOffsetMs * 1000}`;
     }
     return undefined;
   }
@@ -1756,7 +1802,7 @@ export class MerchantService implements MerchantServiceInterface {
   }
 
   async addDefaultInstance(): Promise<void> {
-    return await this.addInstance({
+    return await this.addInstanceWithWireAccount({
       id: "default",
       name: "Default Instance",
       paytoUris: [getPayto("merchant-default")],
@@ -1766,7 +1812,10 @@ export class MerchantService implements MerchantServiceInterface {
     });
   }
 
-  async addInstance(
+  /**
+   * Add an instance together with a wire account.
+   */
+  async addInstanceWithWireAccount(
     instanceConfig: PartialMerchantInstanceConfig,
   ): Promise<void> {
     if (!this.proc) {
@@ -1798,12 +1847,20 @@ export class MerchantService implements MerchantServiceInterface {
         instanceConfig.defaultPayDelay ??
         Duration.toTalerProtocolDuration(Duration.getForever()),
     };
-    const httpLib = createPlatformHttpLib({
-      allowHttp: true,
-      enableThrottling: false,
-    });
-    const resp = await httpLib.fetch(url, { method: "POST", body });
+    const resp = await harnessHttpLib.fetch(url, { method: "POST", body });
     await expectSuccessResponseOrThrow(resp);
+
+    const accountCreateUrl = `http://localhost:${this.merchantConfig.httpPort}/instances/${instanceConfig.id}/private/accounts`;
+    for (const paytoUri of instanceConfig.paytoUris) {
+      const accountReq: AccountAddDetails = {
+        payto_uri: paytoUri,
+      };
+      const acctResp = await harnessHttpLib.fetch(accountCreateUrl, {
+        method: "POST",
+        body: accountReq,
+      });
+      await expectSuccessResponseOrThrow(acctResp);
+    }
   }
 
   makeInstanceBaseUrl(instanceName?: string): string {