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

Finalize test migration: remove legacy dependencies and test helpers (#4797)

Browse Source
This commit is contained in:
Hadrien Croubois
2023-12-26 23:46:06 +01:00
committed by GitHub
parent abcf9dd8b7
commit a72c9561b9
96 changed files with 951 additions and 6503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/metatx/ERC2771Context.test.js
View File

@ -30,7 +30,7 @@ describe('ERC2771Context', function () {
});
it('returns the trusted forwarder', async function () {
expect(await this.context.trustedForwarder()).to.equal(this.forwarder.target);
expect(await this.context.trustedForwarder()).to.equal(this.forwarder);
});
describe('when called directly', function () {
@ -57,14 +57,14 @@ describe('ERC2771Context', function () {
expect(await this.forwarder.verify(req)).to.equal(true);
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender.address);
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender);
});
it('returns the original sender when calldata length is less than 20 bytes (address length)', async function () {
// The forwarder doesn't produce calls with calldata length less than 20 bytes so `this.forwarderAsSigner` is used instead.
await expect(this.context.connect(this.forwarderAsSigner).msgSender())
.to.emit(this.context, 'Sender')
.withArgs(this.forwarder.target);
.withArgs(this.forwarder);
});
});
@ -128,6 +128,6 @@ describe('ERC2771Context', function () {
expect(await this.forwarder.verify(req)).to.equal(true);
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender.address);
await expect(this.forwarder.execute(req)).to.emit(this.context, 'Sender').withArgs(this.sender);
});
});

6
test/metatx/ERC2771Forwarder.test.js
View File

@ -3,8 +3,8 @@ const { expect } = require('chai');
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
const { getDomain, ForwardRequest } = require('../helpers/eip712');
const { bigint: time } = require('../helpers/time');
const { sum } = require('../helpers/math');
const time = require('../helpers/time');
async function fixture() {
const [sender, refundReceiver, another, ...accounts] = await ethers.getSigners();
@ -140,7 +140,7 @@ describe('ERC2771Forwarder', function () {
} else {
await expect(promise)
.to.be.revertedWithCustomError(this.forwarder, 'ERC2771UntrustfulTarget')
.withArgs(request.to, this.forwarder.target);
.withArgs(request.to, this.forwarder);
}
});
}
@ -299,7 +299,7 @@ describe('ERC2771Forwarder', function () {
} else {
await expect(promise)
.to.be.revertedWithCustomError(this.forwarder, 'ERC2771UntrustfulTarget')
.withArgs(this.requests[idx].to, this.forwarder.target);
.withArgs(this.requests[idx].to, this.forwarder);
}
});
}