NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate MerkleProof tests among other testing utilities (#4689)

Browse Source
This commit is contained in:
Hadrien Croubois
2023-10-23 20:24:46 +02:00
committed by GitHub
parent 149e1b79fe
commit 7c8b7a2728
17 changed files with 257 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/utils/Create2.test.js
View File

@ -1,6 +1,6 @@
const { balance, ether, expectEvent, expectRevert, send } = require('@openzeppelin/test-helpers');
const { ethers } = require('hardhat');
const { expect } = require('chai');
const { computeCreate2Address } = require('../helpers/create');
const { balance, ether, expectEvent, expectRevert, send } = require('@openzeppelin/test-helpers');
const { expectRevertCustomError } = require('../helpers/customError');
const Create2 = artifacts.require('$Create2');
@ -26,7 +26,11 @@ contract('Create2', function (accounts) {
describe('computeAddress', function () {
it('computes the correct contract address', async function () {
const onChainComputed = await this.factory.$computeAddress(saltHex, web3.utils.keccak256(constructorByteCode));
const offChainComputed = computeCreate2Address(saltHex, constructorByteCode, this.factory.address);
const offChainComputed = ethers.getCreate2Address(
this.factory.address,
saltHex,
ethers.keccak256(constructorByteCode),
);
expect(onChainComputed).to.equal(offChainComputed);
});
@ -36,14 +40,22 @@ contract('Create2', function (accounts) {
web3.utils.keccak256(constructorByteCode),
deployerAccount,
);
const offChainComputed = computeCreate2Address(saltHex, constructorByteCode, deployerAccount);
const offChainComputed = ethers.getCreate2Address(
deployerAccount,
saltHex,
ethers.keccak256(constructorByteCode),
);
expect(onChainComputed).to.equal(offChainComputed);
});
});
describe('deploy', function () {
it('deploys a contract without constructor', async function () {
const offChainComputed = computeCreate2Address(saltHex, ConstructorLessContract.bytecode, this.factory.address);
const offChainComputed = ethers.getCreate2Address(
this.factory.address,
saltHex,
ethers.keccak256(ConstructorLessContract.bytecode),
);
expectEvent(await this.factory.$deploy(0, saltHex, ConstructorLessContract.bytecode), 'return$deploy', {
addr: offChainComputed,
@ -53,7 +65,11 @@ contract('Create2', function (accounts) {
});
it('deploys a contract with constructor arguments', async function () {
const offChainComputed = computeCreate2Address(saltHex, constructorByteCode, this.factory.address);
const offChainComputed = ethers.getCreate2Address(
this.factory.address,
saltHex,
ethers.keccak256(constructorByteCode),
);
expectEvent(await this.factory.$deploy(0, saltHex, constructorByteCode), 'return$deploy', {
addr: offChainComputed,
@ -69,7 +85,11 @@ contract('Create2', function (accounts) {
await send.ether(deployerAccount, this.factory.address, deposit);
expect(await balance.current(this.factory.address)).to.be.bignumber.equal(deposit);
const offChainComputed = computeCreate2Address(saltHex, constructorByteCode, this.factory.address);
const offChainComputed = ethers.getCreate2Address(
this.factory.address,
saltHex,
ethers.keccak256(constructorByteCode),
);
expectEvent(await this.factory.$deploy(deposit, saltHex, constructorByteCode), 'return$deploy', {
addr: offChainComputed,