Skip to content

Commit e2cebce

Browse files
feat: fixed test for wrapped new interface
1 parent c8441e7 commit e2cebce

File tree

6 files changed

+7
-31
lines changed

6 files changed

+7
-31
lines changed

packages/contract-helpers/src/lendingPool-contract-bundle/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class LendingPoolBundle
164164
if (reserve.toLowerCase() === API_ETH_MOCK_ADDRESS.toLowerCase()) {
165165
if (!debtTokenAddress) {
166166
throw new Error(
167-
`To borrow ETH you need to pass the stable or variable WETH debt Token Address corresponding the interestRateMode`,
167+
`To borrow ETH you need to pass the variable WETH debt Token Address`,
168168
);
169169
}
170170

@@ -173,7 +173,6 @@ export class LendingPoolBundle
173173
user,
174174
amount,
175175
debtTokenAddress,
176-
interestRateMode,
177176
referralCode: referralCodeParam,
178177
});
179178
} else {
@@ -209,7 +208,6 @@ export class LendingPoolBundle
209208
lendingPool: this.lendingPoolAddress,
210209
user,
211210
amount,
212-
interestRateMode,
213211
onBehalfOf,
214212
});
215213
}

packages/contract-helpers/src/lendingPool-contract-bundle/lendingPoolBundle.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ describe('LendingPoolBundle', () => {
220220
expect(result.from).toEqual(USER);
221221
expect(result.value).toEqual(undefined);
222222
expect(result.data).toEqual(
223-
'0x66514c970000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000',
223+
'0xe74f7b85000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000',
224224
);
225225

226226
await expect(async () =>
@@ -233,7 +233,7 @@ describe('LendingPoolBundle', () => {
233233
referralCode: '0',
234234
}),
235235
).rejects.toThrowError(
236-
`To borrow ETH you need to pass the stable or variable WETH debt Token Address corresponding the interestRateMode`,
236+
`To borrow ETH you need to pass the variable WETH debt Token Address`,
237237
);
238238
});
239239
});
@@ -300,7 +300,7 @@ describe('LendingPoolBundle', () => {
300300
expect(result.from).toEqual(USER);
301301
expect(result.value).toEqual(BigNumber.from('1'));
302302
expect(result.data).toEqual(
303-
'0x02c5fcf80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003',
303+
'0xbcc3c255000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003',
304304
);
305305
});
306306

packages/contract-helpers/src/lendingPool-contract/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@ export class LendingPool
367367
user,
368368
amount,
369369
debtTokenAddress,
370-
interestRateMode,
371370
referralCode,
372371
});
373372
}
@@ -421,7 +420,6 @@ export class LendingPool
421420
lendingPool: this.lendingPoolAddress,
422421
user,
423422
amount,
424-
interestRateMode,
425423
onBehalfOf,
426424
});
427425
}

packages/contract-helpers/src/v3-pool-contract-bundle/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ export class PoolBundle
316316
user,
317317
amount,
318318
debtTokenAddress,
319-
interestRateMode,
320319
referralCode: referralCodeParam,
321320
});
322321
} else {
@@ -375,7 +374,6 @@ export class PoolBundle
375374
lendingPool: this.poolAddress,
376375
user,
377376
amount,
378-
interestRateMode,
379377
onBehalfOf: onBehalfOfParam,
380378
});
381379
}

packages/contract-helpers/src/v3-pool-contract-bundle/pool-bundle.test.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -475,16 +475,6 @@ describe('PoolBundle', () => {
475475
debtTokenAddress: API_ETH_MOCK_ADDRESS.toLowerCase(),
476476
});
477477

478-
const resultStable = instance.borrowTxBuilder.generateTxData({
479-
user: USER,
480-
reserve: API_ETH_MOCK_ADDRESS.toLowerCase(),
481-
amount: '1',
482-
onBehalfOf: USER,
483-
interestRateMode: InterestRate.Stable,
484-
referralCode: '0',
485-
debtTokenAddress: API_ETH_MOCK_ADDRESS.toLowerCase(),
486-
});
487-
488478
const differentParamsSameResult = instance.borrowTxBuilder.generateTxData(
489479
{
490480
user: USER,
@@ -495,20 +485,14 @@ describe('PoolBundle', () => {
495485
},
496486
);
497487
const variableTxData =
498-
'0x66514c970000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000';
499-
const stableTxData =
500-
'0x66514c970000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000';
488+
'0xe74f7b85000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000';
501489
expect(result.to).toEqual(WETH_GATEWAY);
502490
expect(result.from).toEqual(USER);
503491
expect(result.value).toEqual(undefined);
504492
expect(result.data).toEqual(variableTxData);
505493
expect(differentParamsSameResult.to).toEqual(WETH_GATEWAY);
506494
expect(differentParamsSameResult.from).toEqual(USER);
507495
expect(differentParamsSameResult.data).toEqual(variableTxData);
508-
expect(resultStable.to).toEqual(WETH_GATEWAY);
509-
expect(resultStable.from).toEqual(USER);
510-
expect(resultStable.value).toEqual(undefined);
511-
expect(resultStable.data).toEqual(stableTxData);
512496
});
513497

514498
it('generates borrow tx data with generateTxData and L2POOL', () => {
@@ -711,12 +695,12 @@ describe('PoolBundle', () => {
711695
expect(result.from).toEqual(USER);
712696
expect(result.value).toEqual(BigNumber.from('1'));
713697
expect(result.data).toEqual(
714-
'0x02c5fcf80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003',
698+
'0xbcc3c255000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003',
715699
);
716700
expect(differentParamsSameResult.to).toEqual(WETH_GATEWAY);
717701
expect(differentParamsSameResult.from).toEqual(USER);
718702
expect(differentParamsSameResult.data).toEqual(
719-
'0x02c5fcf80000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003',
703+
'0xbcc3c255000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003',
720704
);
721705
});
722706

packages/contract-helpers/src/v3-pool-contract/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ export class Pool extends BaseService<IPool> implements PoolInterface {
681681
user,
682682
amount,
683683
debtTokenAddress,
684-
interestRateMode,
685684
referralCode,
686685
});
687686
}
@@ -750,7 +749,6 @@ export class Pool extends BaseService<IPool> implements PoolInterface {
750749
lendingPool: this.poolAddress,
751750
user,
752751
amount,
753-
interestRateMode,
754752
onBehalfOf,
755753
});
756754
}

0 commit comments

Comments
 (0)