From d881f4fd258a27cc765a25c24e5fef9f86b6226f Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 23 Mar 2022 21:24:23 +0100
Subject: wallet: simplify crypto workers

---
 .../taler-wallet-core/src/operations/exchanges.ts  | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'packages/taler-wallet-core/src/operations/exchanges.ts')

diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts
index 94159369b..51b5c7806 100644
--- a/packages/taler-wallet-core/src/operations/exchanges.ts
+++ b/packages/taler-wallet-core/src/operations/exchanges.ts
@@ -46,7 +46,7 @@ import {
   TalerProtocolDuration,
 } from "@gnu-taler/taler-util";
 import { decodeCrock, encodeCrock, hash } from "@gnu-taler/taler-util";
-import { CryptoApi } from "../crypto/workers/cryptoApi.js";
+import { CryptoDispatcher } from "../crypto/workers/cryptoDispatcher.js";
 import {
   DenominationRecord,
   DenominationVerificationStatus,
@@ -243,12 +243,13 @@ async function validateWireInfo(
     if (ws.insecureTrustExchange) {
       isValid = true;
     } else {
-      isValid = await ws.cryptoApi.isValidWireAccount(
+      const { valid: v } = await ws.cryptoApi.isValidWireAccount({
+        masterPub: masterPublicKey,
+        paytoUri: a.payto_uri,
+        sig: a.master_sig,
         versionCurrent,
-        a.payto_uri,
-        a.master_sig,
-        masterPublicKey,
-      );
+      });
+      isValid = v;
     }
     if (!isValid) {
       throw Error("exchange acct signature invalid");
@@ -272,11 +273,12 @@ async function validateWireInfo(
       if (ws.insecureTrustExchange) {
         isValid = true;
       } else {
-        isValid = await ws.cryptoApi.isValidWireFee(
-          wireMethod,
-          fee,
-          masterPublicKey,
-        );
+        const { valid: v } = await ws.cryptoApi.isValidWireFee({
+          masterPub: masterPublicKey,
+          type: wireMethod,
+          wf: fee,
+        });
+        isValid = v;
       }
       if (!isValid) {
         throw Error("exchange wire fee signature invalid");
-- 
cgit v1.2.3