From 2fc2aee4168772e12a88e605943f0f89044cc281 Mon Sep 17 00:00:00 2001 From: kstasi Date: Wed, 16 Jun 2021 13:48:51 +0300 Subject: [PATCH] fix test call --- test/BuyTokenWithRouter.spec.ts | 56 +++++++++++++++++++-------------- test/SellTokenWithRoute.spec.ts | 56 +++++++++++++++++++-------------- test/helpers/types.ts | 4 +-- 3 files changed, 66 insertions(+), 50 deletions(-) diff --git a/test/BuyTokenWithRouter.spec.ts b/test/BuyTokenWithRouter.spec.ts index bc41f72b..a4f07fd8 100644 --- a/test/BuyTokenWithRouter.spec.ts +++ b/test/BuyTokenWithRouter.spec.ts @@ -93,14 +93,16 @@ contract("BuyTokenWithRoute()", function () { token_b_address: tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { buy: null }, }, @@ -110,14 +112,16 @@ contract("BuyTokenWithRoute()", function () { token_b_address: reverseOrder ? tokenAAddress : tokenCAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { sell: null }, }, @@ -213,14 +217,16 @@ contract("BuyTokenWithRoute()", function () { token_b_address: tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { buy: null }, }, @@ -230,14 +236,16 @@ contract("BuyTokenWithRoute()", function () { token_b_address: reverseOrder ? tokenAAddress : tokenCAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { sell: null }, }, diff --git a/test/SellTokenWithRoute.spec.ts b/test/SellTokenWithRoute.spec.ts index e036df6b..204dfbf1 100644 --- a/test/SellTokenWithRoute.spec.ts +++ b/test/SellTokenWithRoute.spec.ts @@ -90,14 +90,16 @@ contract("SellTokenWithRoute()", function () { token_b_address: tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { sell: null }, }, @@ -107,14 +109,16 @@ contract("SellTokenWithRoute()", function () { token_b_address: reverseOrder ? tokenCAddress : tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { buy: null }, }, @@ -210,14 +214,16 @@ contract("SellTokenWithRoute()", function () { token_b_address: tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { sell: null }, }, @@ -227,14 +233,16 @@ contract("SellTokenWithRoute()", function () { token_b_address: reverseOrder ? tokenCAddress : tokenBAddress, token_a_id: new BigNumber(0), token_b_id: new BigNumber(0), - token_a_type: - standard.toLowerCase() == "mixed" + token_a_type: { + [standard.toLowerCase() == "mixed" ? "fa2" - : standard.toLowerCase(), - token_b_type: - standard.toLowerCase() == "mixed" + : standard.toLowerCase()]: null, + }, + token_b_type: { + [standard.toLowerCase() == "mixed" ? "fa12" - : standard.toLowerCase(), + : standard.toLowerCase()]: null, + }, }, operation: { buy: null }, }, diff --git a/test/helpers/types.ts b/test/helpers/types.ts index 4cfa72b1..c8ea857c 100644 --- a/test/helpers/types.ts +++ b/test/helpers/types.ts @@ -5,8 +5,8 @@ export declare type TokenInfo = { token_b_address: string; token_a_id?: BigNumber; token_b_id?: BigNumber; - token_a_type: string; - token_b_type: string; + token_a_type: { [key: string]: any }; + token_b_type: { [key: string]: any }; }; export declare type PairInfo = {