Skip to content

Commit f8415eb

Browse files
dyodxdyodx
committed
TS Lint
1 parent 385e3d5 commit f8415eb

File tree

4 files changed

+45
-60
lines changed

4 files changed

+45
-60
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
"anchor-bankrun": "^0.4.0",
3232
"chai": "^5.1.1",
3333
"solana-bankrun": "^0.3.0"
34-
}
34+
},
35+
"packageManager": "[email protected]+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387"
3536
}

‎tokens/token-swap/anchor/tests/deposit-liquidity.ts‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as anchor from '@coral-xyz/anchor';
22
import type { Program } from '@coral-xyz/anchor';
3+
import { BN } from 'bn.js';
34
import { expect } from 'chai';
45
import type { SwapExample } from '../target/types/swap_example';
56
import { type TestValues, createValues, mintingTokens } from './utils';
6-
import { BN } from 'bn.js';
77

88
describe('Deposit liquidity', () => {
99
const provider = anchor.AnchorProvider.env();
@@ -66,7 +66,7 @@ describe('Deposit liquidity', () => {
6666
expect(depositTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply.sub(values.depositAmountA).toString());
6767
const depositTokenAccountB = await connection.getTokenAccountBalance(values.holderAccountB);
6868
expect(depositTokenAccountB.value.amount).to.equal(values.defaultHolderAccountSupply.sub(values.depositAmountA).toString());
69-
69+
7070
await program.methods
7171
.depositLiquidity(values.depositAmountB, values.depositAmountB)
7272
.accounts({
@@ -87,20 +87,18 @@ describe('Deposit liquidity', () => {
8787

8888
const depositTokenAccountLiquidity2 = await connection.getTokenAccountBalance(values.liquidityAccount);
8989
// No minimumLiquidity subtraction since it's not the first deposit
90-
expect(depositTokenAccountLiquidity2.value.amount).to.equal(new BN(depositTokenAccountLiquidity.value.amount)
91-
.add(values.depositAmountB).toString());
90+
expect(depositTokenAccountLiquidity2.value.amount).to.equal(
91+
new BN(depositTokenAccountLiquidity.value.amount).add(values.depositAmountB).toString(),
92+
);
9293
const depositTokenAccountA2 = await connection.getTokenAccountBalance(values.holderAccountA);
93-
expect(depositTokenAccountA2.value.amount).to.equal(new BN(depositTokenAccountA.value.amount)
94-
.sub(values.depositAmountB).toString());
94+
expect(depositTokenAccountA2.value.amount).to.equal(new BN(depositTokenAccountA.value.amount).sub(values.depositAmountB).toString());
9595
const depositTokenAccountB2 = await connection.getTokenAccountBalance(values.holderAccountB);
96-
expect(depositTokenAccountB2.value.amount).to.equal(new BN(depositTokenAccountB.value.amount)
97-
.sub(values.depositAmountB).toString());
96+
expect(depositTokenAccountB2.value.amount).to.equal(new BN(depositTokenAccountB.value.amount).sub(values.depositAmountB).toString());
9897
});
9998

100-
10199
it('Deposit amounts a > b, then a < b', async () => {
102-
var depositAmountA = new BN(9 * 10 ** 6)
103-
var depositAmountB = new BN(4 * 10 ** 6)
100+
const depositAmountA = new BN(9 * 10 ** 6);
101+
const depositAmountB = new BN(4 * 10 ** 6);
104102
await program.methods
105103
.depositLiquidity(depositAmountA, depositAmountB)
106104
.accounts({
@@ -120,8 +118,7 @@ describe('Deposit liquidity', () => {
120118
.rpc({ skipPreflight: true });
121119

122120
const depositTokenAccountLiquidity = await connection.getTokenAccountBalance(values.liquidityAccount);
123-
expect(depositTokenAccountLiquidity.value.amount).to.equal(new BN(6 * 10 ** 6)
124-
.sub(values.minimumLiquidity).toString());
121+
expect(depositTokenAccountLiquidity.value.amount).to.equal(new BN(6 * 10 ** 6).sub(values.minimumLiquidity).toString());
125122
const depositTokenAccountA = await connection.getTokenAccountBalance(values.holderAccountA);
126123
expect(depositTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply.sub(depositAmountA).toString());
127124
const depositTokenAccountB = await connection.getTokenAccountBalance(values.holderAccountB);
@@ -130,10 +127,10 @@ describe('Deposit liquidity', () => {
130127
// Expected behavior is that depositAmountA gets increased to
131128
// (27 * 10 ** 6) * (9/4) = 60.75 * 10 ** 6
132129
// to maintain the ratio established in the above deposit
133-
depositAmountA = new BN(18 * 10 ** 6)
134-
depositAmountB = new BN(27 * 10 ** 6)
130+
const depositAmountA2 = new BN(18 * 10 ** 6);
131+
const depositAmountB2 = new BN(27 * 10 ** 6);
135132
await program.methods
136-
.depositLiquidity(depositAmountA, depositAmountB)
133+
.depositLiquidity(depositAmountA2, depositAmountB2)
137134
.accounts({
138135
pool: values.poolKey,
139136
poolAuthority: values.poolAuthority,
@@ -151,20 +148,18 @@ describe('Deposit liquidity', () => {
151148
.rpc({ skipPreflight: true });
152149

153150
const depositTokenAccountLiquidity2 = await connection.getTokenAccountBalance(values.liquidityAccount);
154-
expect(depositTokenAccountLiquidity2.value.amount).to.equal(new BN(40.5 * 10 ** 6)
155-
.add(new BN(depositTokenAccountLiquidity.value.amount))
156-
.toString());
151+
expect(depositTokenAccountLiquidity2.value.amount).to.equal(
152+
new BN(40.5 * 10 ** 6).add(new BN(depositTokenAccountLiquidity.value.amount)).toString(),
153+
);
157154
const depositTokenAccountA2 = await connection.getTokenAccountBalance(values.holderAccountA);
158-
expect(depositTokenAccountA2.value.amount).to.equal(new BN (depositTokenAccountA.value.amount)
159-
.sub(new BN(60.75 * 10 ** 6)).toString());
155+
expect(depositTokenAccountA2.value.amount).to.equal(new BN(depositTokenAccountA.value.amount).sub(new BN(60.75 * 10 ** 6)).toString());
160156
const depositTokenAccountB2 = await connection.getTokenAccountBalance(values.holderAccountB);
161-
expect(depositTokenAccountB2.value.amount).to.equal(new BN (depositTokenAccountB.value.amount)
162-
.sub(depositAmountB).toString());
157+
expect(depositTokenAccountB2.value.amount).to.equal(new BN(depositTokenAccountB.value.amount).sub(depositAmountB2).toString());
163158
});
164159

165160
it('Deposit amounts a < b, then a > b', async () => {
166-
var depositAmountA = new BN(4 * 10 ** 6)
167-
var depositAmountB = new BN(9 * 10 ** 6)
161+
const depositAmountA = new BN(4 * 10 ** 6);
162+
const depositAmountB = new BN(9 * 10 ** 6);
168163
await program.methods
169164
.depositLiquidity(depositAmountA, depositAmountB)
170165
.accounts({
@@ -184,20 +179,19 @@ describe('Deposit liquidity', () => {
184179
.rpc({ skipPreflight: true });
185180

186181
const depositTokenAccountLiquidity = await connection.getTokenAccountBalance(values.liquidityAccount);
187-
expect(depositTokenAccountLiquidity.value.amount).to.equal(new BN(6 * 10 ** 6)
188-
.sub(values.minimumLiquidity).toString());
182+
expect(depositTokenAccountLiquidity.value.amount).to.equal(new BN(6 * 10 ** 6).sub(values.minimumLiquidity).toString());
189183
const depositTokenAccountA = await connection.getTokenAccountBalance(values.holderAccountA);
190184
expect(depositTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply.sub(depositAmountA).toString());
191185
const depositTokenAccountB = await connection.getTokenAccountBalance(values.holderAccountB);
192186
expect(depositTokenAccountB.value.amount).to.equal(values.defaultHolderAccountSupply.sub(depositAmountB).toString());
193-
187+
194188
// Expected behavior is that depositAmountB gets increased to
195189
// (27 * 10 ** 6) * (9/4) = 60.75 * 10 ** 6
196190
// to maintain the ratio established in the above deposit
197-
depositAmountA = new BN(27 * 10 ** 6)
198-
depositAmountB = new BN(18 * 10 ** 6)
191+
const depositAmountA2 = new BN(27 * 10 ** 6);
192+
const depositAmountB2 = new BN(18 * 10 ** 6);
199193
await program.methods
200-
.depositLiquidity(depositAmountA, depositAmountB)
194+
.depositLiquidity(depositAmountA2, depositAmountB2)
201195
.accounts({
202196
pool: values.poolKey,
203197
poolAuthority: values.poolAuthority,
@@ -215,14 +209,12 @@ describe('Deposit liquidity', () => {
215209
.rpc({ skipPreflight: true });
216210

217211
const depositTokenAccountLiquidity2 = await connection.getTokenAccountBalance(values.liquidityAccount);
218-
expect(depositTokenAccountLiquidity2.value.amount).to.equal(new BN(40.5 * 10 ** 6)
219-
.add(new BN(depositTokenAccountLiquidity.value.amount))
220-
.toString());
212+
expect(depositTokenAccountLiquidity2.value.amount).to.equal(
213+
new BN(40.5 * 10 ** 6).add(new BN(depositTokenAccountLiquidity.value.amount)).toString(),
214+
);
221215
const depositTokenAccountA2 = await connection.getTokenAccountBalance(values.holderAccountA);
222-
expect(depositTokenAccountA2.value.amount).to.equal(new BN (depositTokenAccountA.value.amount)
223-
.sub(depositAmountA).toString());
216+
expect(depositTokenAccountA2.value.amount).to.equal(new BN(depositTokenAccountA.value.amount).sub(depositAmountA2).toString());
224217
const depositTokenAccountB2 = await connection.getTokenAccountBalance(values.holderAccountB);
225-
expect(depositTokenAccountB2.value.amount).to.equal(new BN (depositTokenAccountB.value.amount)
226-
.sub(new BN(60.75 * 10 ** 6)).toString());
227-
})
218+
expect(depositTokenAccountB2.value.amount).to.equal(new BN(depositTokenAccountB.value.amount).sub(new BN(60.75 * 10 ** 6)).toString());
219+
});
228220
});

‎tokens/token-swap/anchor/tests/swap.ts‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ describe('Swap', () => {
3939
poolAccountB: values.poolAccountB,
4040
})
4141
.rpc();
42-
4342
});
4443

4544
it('Swap from a to b, initial deposit a > b', async () => {
@@ -80,19 +79,16 @@ describe('Swap', () => {
8079

8180
const traderTokenAccountA = await connection.getTokenAccountBalance(values.holderAccountA);
8281
const traderTokenAccountB = await connection.getTokenAccountBalance(values.holderAccountB);
83-
expect(traderTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply
84-
.sub(values.depositAmountA)
85-
.sub(input).toString());
86-
expect(Number(traderTokenAccountB.value.amount)).to.be.greaterThan(values.defaultHolderAccountSupply
87-
.sub(values.depositAmountB).toNumber());
88-
expect(Number(traderTokenAccountB.value.amount)).to.be.lessThan(values.defaultHolderAccountSupply
89-
.sub(values.depositAmountB)
90-
.add(input).toNumber());
82+
expect(traderTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply.sub(values.depositAmountA).sub(input).toString());
83+
expect(Number(traderTokenAccountB.value.amount)).to.be.greaterThan(values.defaultHolderAccountSupply.sub(values.depositAmountB).toNumber());
84+
expect(Number(traderTokenAccountB.value.amount)).to.be.lessThan(
85+
values.defaultHolderAccountSupply.sub(values.depositAmountB).add(input).toNumber(),
86+
);
9187
});
92-
88+
9389
it('Swap from a to b, initial deposit a < b', async () => {
94-
const depositAmountA = new BN(10 * 10 ** 6)
95-
const depositAmountB = new BN(30 * 10 ** 6)
90+
const depositAmountA = new BN(10 * 10 ** 6);
91+
const depositAmountB = new BN(30 * 10 ** 6);
9692
await program.methods
9793
.depositLiquidity(depositAmountA, depositAmountB)
9894
.accounts({
@@ -130,11 +126,7 @@ describe('Swap', () => {
130126

131127
const traderTokenAccountA = await connection.getTokenAccountBalance(values.holderAccountA);
132128
const traderTokenAccountB = await connection.getTokenAccountBalance(values.holderAccountB);
133-
expect(traderTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply
134-
.sub(depositAmountA)
135-
.sub(input).toString());
136-
expect(Number(traderTokenAccountB.value.amount)).to.be.greaterThan(values.defaultHolderAccountSupply
137-
.sub(depositAmountB)
138-
.add(input).toNumber());
129+
expect(traderTokenAccountA.value.amount).to.equal(values.defaultHolderAccountSupply.sub(depositAmountA).sub(input).toString());
130+
expect(Number(traderTokenAccountB.value.amount)).to.be.greaterThan(values.defaultHolderAccountSupply.sub(depositAmountB).add(input).toNumber());
139131
});
140132
});

‎tokens/token-swap/anchor/tests/utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ export const expectRevert = async (promise: Promise<any>) => {
2020
}
2121
};
2222

23-
const defaultMintedAmount = 100
24-
const defaultDecimals = 6
23+
const defaultMintedAmount = 100;
24+
const defaultDecimals = 6;
2525
export const mintingTokens = async ({
2626
connection,
2727
creator,

0 commit comments

Comments
 (0)