Skip to content

Commit

Permalink
test: updated names
Browse files Browse the repository at this point in the history
  • Loading branch information
pcheremu committed Mar 7, 2024
1 parent 25109d6 commit 572b272
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "integration-tests",
"version": "0.0.0",
"title": "Integration tests",
"description": "The test solution for transaction processing`",
"description": "The test solution for Block Explorer API and UI",
"repository": "https://github.com/matter-labs/block-explorer",
"private": true,
"author": "Matter Labs",
Expand Down
2 changes: 1 addition & 1 deletion packages/integration-tests/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Wallets } from "./constants";

export const localConfig = {
gasLimit: { gasLimit: 10000000 },
l1GasLimit: { gasLimit: 10000000 },
l2GasLimit: 10000000,
L1Network: "http://localhost:8545",
L2Network: "http://localhost:3050",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {

const deployer = new Deployer(hre, wallet);
const artifact = await deployer.loadArtifact("Greeter");
const contract = await deployer.deploy(artifact, [], localConfig.gasLimit);
const contract = await deployer.deploy(artifact, [], localConfig.l1GasLimit);
const contractAddress = contract.address;
console.log(`${artifact.contractName} was deployed to ${contractAddress}`);
await helper.writeFile(Path.absolutePathToBufferFiles, Buffer.greeterL2, contractAddress);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async function main() {
console.log("Account balance:", await ethers.utils.formatEther(weiAmount));

const contract = await ethers.getContractFactory("L1");
const token = await contract.deploy(Wallets.richWalletAddress, localConfig.gasLimit);
const token = await contract.deploy(Wallets.richWalletAddress, localConfig.l1GasLimit);

await helper.writeFile(Path.absolutePathToBufferFiles, Buffer.L1, token.address);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {

const deployer = new Deployer(hre, wallet);
const artifact = await deployer.loadArtifact("L2");
const contract = await deployer.deploy(artifact, [], localConfig.gasLimit);
const contract = await deployer.deploy(artifact, [], localConfig.l1GasLimit);
const contractAddress = contract.address;
console.log(`${artifact.contractName} was deployed to ${contractAddress}`);
await helper.writeFile(Path.absolutePathToBufferFiles, Buffer.L2, contractAddress);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {
const attachedContract = new ethers.Contract(TRANSFER_CONTRACT_ADDRESS, factoryArtifact.abi, wallet);
console.log(`Contract said something like this by default: ${await attachedContract.newCallGreeter()}`);
const newGreet = "New Greet!";
const setNewGreetingHandle = await attachedContract.newSetGreet(newGreet, localConfig.gasLimit);
const setNewGreetingHandle = await attachedContract.newSetGreet(newGreet, localConfig.l1GasLimit);
await setNewGreetingHandle.wait(1);

const txHash = setNewGreetingHandle.hash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default async function callMultiTransferETH(hre: HardhatRuntimeEnvironmen
to: contractAddress,
token: token,
amount,
overrides: localConfig.gasLimit,
overrides: localConfig.l1GasLimit,
});

// await commitment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const depositERC20 = async function (sum = "0.5", tokenAddress: string, u
amount: ethers.utils.parseUnits(sum, units),
approveERC20: true,
l2GasLimit: localConfig.l2GasLimit,
overrides: localConfig.gasLimit,
overrides: localConfig.l1GasLimit,
});

await deposit.wait(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const transferERC20 = async function (sum: string, tokenAddress: string,
to: syncWallet2.address,
token: tokenAddress,
amount: ethers.utils.parseEther(sum),
overrides: localConfig.gasLimit,
overrides: localConfig.l1GasLimit,
});

const txHash = transfer.hash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const transferFailedState = async function (tokenAddress: string, tokenNa
to: "0x0000000000000000000000000000000000000000",
token: tokenAddress,
amount,
overrides: localConfig.gasLimit,
overrides: localConfig.l1GasLimit,
});

const txHash = transfer.hash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const withdrawERC20 = async function (tokenAddress: string, sum = "0.2")
amount: ethers.utils.parseEther(sum),
token: tokenAddress,
bridgeAddress: bridges.erc20L2,
// overrides: localConfig.gasLimit,
// overrides: localConfig.l1GasLimit,
});

const txHash = withdrawL2.hash;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const withdrawERC20toOtherAddress = async function (tokenAddress: string,
amount: ethers.utils.parseEther(sum),
token: tokenAddress,
bridgeAddress: bridges.erc20L2,
overrides: localConfig.gasLimit,
overrides: localConfig.l1GasLimit,
});

const txHash = withdrawL2.hash;
Expand Down

0 comments on commit 572b272

Please sign in to comment.