Skip to content

Commit

Permalink
remove system test & custom erc20 bridge & zk fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Raid Ateir committed Apr 3, 2024
1 parent 26334bb commit 7b85dc7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 128 deletions.
3 changes: 2 additions & 1 deletion core/tests/ts-integration/tests/api/web3.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,10 @@ describe('web3 API compatibility tests', () => {
});

test('Should test L1 transaction details', async () => {
// ToDo: remove when server is fixed
const baseTokenAddress = process.env.CONTRACTS_BASE_TOKEN_ADDR!;
const isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
if (testMaster.isFastMode() || !isETHBasedChain) { // ToDo: rmemove when server is fixed
if (testMaster.isFastMode() || !isETHBasedChain) {
return;
}
let amount = 1;
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ts-integration/tests/base-token.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ describe('base ERC20 contract checks', () => {
afterAll(async () => {
await testMaster.deinitialize();
});
});
});
120 changes: 0 additions & 120 deletions core/tests/ts-integration/tests/custom-erc20-bridge.test.ts

This file was deleted.

4 changes: 2 additions & 2 deletions core/tests/ts-integration/tests/erc20.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ describe('ERC20 contract checks', () => {
amount,
approveERC20: true,
approveBaseERC20: true,
l2GasLimit: 5_000_000, // Setting the limit manually to avoid estimation for L1->L2 transaction
l2GasLimit: 5_000_000 // Setting the limit manually to avoid estimation for L1->L2 transaction
});
const l1Receipt = await depositHandle.waitL1Commit();

Expand Down Expand Up @@ -245,4 +245,4 @@ describe('ERC20 contract checks', () => {
afterAll(async () => {
await testMaster.deinitialize();
});
});
});
9 changes: 5 additions & 4 deletions core/tests/ts-integration/tests/ether.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('ETH token checks', () => {
// 'alice.getBalanceL1(NATIVE TOKEN): ',
// await alice.getBalanceL1(process.env.CONTRACTS_BASE_TOKEN_ADDR)
// );

const depositOp = alice.deposit({
token: ETH_ADDRESS,
amount,
Expand Down Expand Up @@ -103,7 +103,8 @@ describe('ETH token checks', () => {
});
const l1EthBalanceAfter = await alice.getBalanceL1();

if (isETHBasedChain) { // ToDo: after server fix has to be removed
if (isETHBasedChain) {
// ToDo: after server fix has to be removed
expect(l1EthBalanceBefore.sub(depositFee).sub(l1EthBalanceAfter)).bnToBeEq(amount);
}
});
Expand Down Expand Up @@ -249,7 +250,7 @@ describe('ETH token checks', () => {
const maxAmount = await alice.getBalanceL1(baseTokenDetails.l1Address);
await (await alice.approveERC20(process.env.CONTRACTS_BASE_TOKEN_ADDR!, maxAmount)).wait();
}

const depositFee = await alice.getFullRequiredDepositFee({
token: ETH_ADDRESS
});
Expand Down Expand Up @@ -288,4 +289,4 @@ describe('ETH token checks', () => {
afterAll(async () => {
await testMaster.deinitialize();
});
});
});

0 comments on commit 7b85dc7

Please sign in to comment.