From 768e0857408fa7e04b89c587c31d738251be6660 Mon Sep 17 00:00:00 2001
From: kstasi <nastasiakondaurova@gmail.com>
Date: Wed, 16 Jun 2021 12:02:42 +0300
Subject: [PATCH] update tests

---
 test/helpers/ttdexFA2.ts | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/test/helpers/ttdexFA2.ts b/test/helpers/ttdexFA2.ts
index 9adeccbd..bd6c4f08 100644
--- a/test/helpers/ttdexFA2.ts
+++ b/test/helpers/ttdexFA2.ts
@@ -116,16 +116,18 @@ export class TTDex extends TokenFA2 {
         );
       }
     }
+
     const operation = await this.contract.methods
       .use(
         "initializeExchange",
-        null,
         tokenAAddress,
         tokenAid,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa2" : standard.toLowerCase(),
+        null,
         tokenBAddress,
         tokenBid,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa12" : standard.toLowerCase(),
+        null,
         tokenAAmount,
         tokenBAmount
       )
@@ -225,13 +227,14 @@ export class TTDex extends TokenFA2 {
     const operation = await this.contract.methods
       .use(
         "tokenToTokenPayment",
-        null,
         tokenAAddress,
         tokenAid,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa2" : standard.toLowerCase(),
+        null,
         tokenBAddress,
         tokenBid,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa12" : standard.toLowerCase(),
+        null,
         opType,
         null,
         amountIn,
@@ -283,13 +286,14 @@ export class TTDex extends TokenFA2 {
     const operation = await this.contract.methods
       .use(
         "investLiquidity",
-        null,
         pair.token_a_address,
         pair.token_a_id,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa2" : standard.toLowerCase(),
+        null,
         pair.token_b_address,
         pair.token_b_id,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa12" : standard.toLowerCase(),
+        null,
         tokenAAmount,
         tokenBAmount,
         minShares
@@ -310,14 +314,14 @@ export class TTDex extends TokenFA2 {
     const operation = await this.contract.methods
       .use(
         "divestLiquidity",
-        standard.toLowerCase(),
-        null,
         pair.token_a_address,
         pair.token_a_id,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa2" : standard.toLowerCase(),
+        null,
         pair.token_b_address,
         pair.token_b_id,
-        standard.toLowerCase(),
+        standard.toLowerCase() == "mixed" ? "fa12" : standard.toLowerCase(),
+        null,
         tokenAAmount,
         tokenBAmount,
         sharesBurned