Skip to content

Commit f84f33d

Browse files
AmxxAmxx
authored
Migrate @OpenZeppelin/contracts test helpers (#179)
1 parent 3afa1b5 commit f84f33d

30 files changed

+100
-579
lines changed

‎test/account/Account.test.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { PackedUserOperation } = require('../helpers/eip712-types');
7-
const { NonNativeSigner } = require('../helpers/signers');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
6+
const { NonNativeSigner } = require('@openzeppelin/contracts/test/helpers/signers');
87

98
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
109
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountECDSA.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { PackedUserOperation } = require('../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
76

87
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
98
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountERC7702.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { PackedUserOperation } = require('../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
76

87
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
98
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountERC7913.test.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { NonNativeSigner, P256SigningKey, RSASHA256SigningKey, ZKEmailSigningKey } = require('../helpers/signers');
7-
const { PackedUserOperation } = require('../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
6+
const {
7+
NonNativeSigner,
8+
P256SigningKey,
9+
RSASHA256SigningKey,
10+
} = require('@openzeppelin/contracts/test/helpers/signers');
11+
const { ZKEmailSigningKey } = require('../helpers/signers');
812

913
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
1014
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountMultiSigner.test.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ const { ethers, entrypoint } = require('hardhat');
22
const { expect } = require('chai');
33
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
44

5-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
6-
const { ERC4337Helper } = require('../helpers/erc4337');
7-
const { NonNativeSigner, P256SigningKey, RSASHA256SigningKey, MultiERC7913SigningKey } = require('../helpers/signers');
5+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
6+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
7+
const {
8+
NonNativeSigner,
9+
P256SigningKey,
10+
RSASHA256SigningKey,
11+
MultiERC7913SigningKey,
12+
} = require('@openzeppelin/contracts/test/helpers/signers');
813

914
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
1015
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');
1116
const { shouldBehaveLikeERC7821 } = require('./extensions/ERC7821.behavior');
12-
const { PackedUserOperation } = require('../helpers/eip712-types');
1317

1418
// Prepare signers in advance (RSA are long to initialize)
1519
const signerECDSA1 = ethers.Wallet.createRandom();

‎test/account/AccountMultiSignerWeighted.test.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ const { ethers, entrypoint } = require('hardhat');
22
const { expect } = require('chai');
33
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
44

5-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
6-
const { ERC4337Helper } = require('../helpers/erc4337');
7-
const { NonNativeSigner, P256SigningKey, RSASHA256SigningKey, MultiERC7913SigningKey } = require('../helpers/signers');
8-
const { PackedUserOperation } = require('../helpers/eip712-types');
5+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
6+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
7+
const {
8+
NonNativeSigner,
9+
P256SigningKey,
10+
RSASHA256SigningKey,
11+
MultiERC7913SigningKey,
12+
} = require('@openzeppelin/contracts/test/helpers/signers');
913

1014
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
1115
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountP256.test.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { NonNativeSigner, P256SigningKey } = require('../helpers/signers');
7-
const { PackedUserOperation } = require('../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
6+
const { NonNativeSigner, P256SigningKey } = require('@openzeppelin/contracts/test/helpers/signers');
87

98
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
109
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountRSA.test.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../helpers/erc4337');
6-
const { NonNativeSigner, RSASHA256SigningKey } = require('../helpers/signers');
7-
const { PackedUserOperation } = require('../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
6+
const { NonNativeSigner, RSASHA256SigningKey } = require('@openzeppelin/contracts/test/helpers/signers');
87

98
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
109
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');

‎test/account/AccountZKEmail.test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const { ethers } = require('hardhat');
22
const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { ERC4337Helper } = require('../helpers/erc4337');
4+
const { ERC4337Helper } = require('@openzeppelin/contracts/test/helpers/erc4337');
5+
const { NonNativeSigner } = require('@openzeppelin/contracts/test/helpers/signers');
6+
const { ZKEmailSigningKey } = require('../helpers/signers');
57

68
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('./Account.behavior');
79
const { shouldBehaveLikeERC1271 } = require('../utils/cryptography/ERC1271.behavior');
810
const { shouldBehaveLikeERC7821 } = require('./extensions/ERC7821.behavior');
9-
const { ZKEmailSigningKey, NonNativeSigner } = require('../helpers/signers');
1011

1112
const accountSalt = '0x046582bce36cdd0a8953b9d40b8f20d58302bacf3bcecffeb6741c98a52725e2'; // keccak256("[email protected]")
1213
const selector = '12345';

‎test/account/examples/AccountERC7702WithModulesMock.test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
const { ethers, entrypoint } = require('hardhat');
22
const { loadFixture, setBalance } = require('@nomicfoundation/hardhat-network-helpers');
33

4-
const { getDomain } = require('@openzeppelin/contracts/test/helpers/eip712');
5-
const { ERC4337Helper } = require('../../helpers/erc4337');
6-
const { PackedUserOperation } = require('../../helpers/eip712-types');
4+
const { getDomain, PackedUserOperation } = require('@openzeppelin/contracts/test/helpers/eip712');
5+
const { ERC4337Helper } = require('@openzeppelin/contracts/test//helpers/erc4337');
6+
const { MODULE_TYPE_VALIDATOR } = require('@openzeppelin/contracts/test/helpers/erc7579');
77

88
const { shouldBehaveLikeAccountCore, shouldBehaveLikeAccountHolder } = require('../Account.behavior');
99
const { shouldBehaveLikeAccountERC7579 } = require('../extensions/AccountERC7579.behavior');
1010
const { shouldBehaveLikeERC1271 } = require('../../utils/cryptography/ERC1271.behavior');
1111
const { shouldBehaveLikeERC7821 } = require('../extensions/ERC7821.behavior');
1212

13-
const { MODULE_TYPE_VALIDATOR } = require('@openzeppelin/contracts/test/helpers/erc7579');
14-
1513
async function fixture() {
1614
// EOAs and environment
1715
const [beneficiary, other] = await ethers.getSigners();

0 commit comments

Comments
 (0)