Skip to content

Commit

Permalink
fix test call
Browse files Browse the repository at this point in the history
  • Loading branch information
@KStasi
KStasi committed Jun 16, 2021
1 parent c5fa5c3 commit 2fc2aee
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 50 deletions.
56 changes: 32 additions & 24 deletions test/BuyTokenWithRouter.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
},
Expand All @@ -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 },
},
Expand Down Expand Up @@ -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 },
},
Expand All @@ -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 },
},
Expand Down
56 changes: 32 additions & 24 deletions test/SellTokenWithRoute.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
},
Expand All @@ -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 },
},
Expand Down Expand Up @@ -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 },
},
Expand All @@ -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 },
},
Expand Down
4 changes: 2 additions & 2 deletions test/helpers/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 2fc2aee

Please sign in to comment.