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

Add new EnumerableMap types (#4843)

Browse Source 
Co-authored-by: ernestognw <ernestognw@gmail.com>
This commit is contained in:
Hadrien Croubois
2024-01-22 20:25:01 +01:00
committed by GitHub
parent e5c63635e3
commit a5c4cd8182
6 changed files with 417 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
test/utils/structs/EnumerableMap.test.js
View File

@ -7,60 +7,34 @@ const { TYPES, formatType } = require('../../../scripts/generate/templates/Enume
const { shouldBehaveLikeMap } = require('./EnumerableMap.behavior');
const getMethods = (mock, fnSigs) => {
return mapValues(
fnSigs,
fnSig =>
(...args) =>
mock.getFunction(fnSig)(0, ...args),
);
};
const testTypes = [formatType('bytes32', 'bytes32'), ...TYPES];
// Add Bytes32ToBytes32Map that must be tested but is not part of the generated types.
TYPES.unshift(formatType('bytes32', 'bytes32'));
async function fixture() {
const mock = await ethers.deployContract('$EnumerableMap');
const zeroValue = {
uint256: 0n,
address: ethers.ZeroAddress,
bytes32: ethers.ZeroHash,
};
const env = Object.fromEntries(
testTypes.map(({ name, keyType, valueType }) => [
TYPES.map(({ name, keyType, valueType }) => [
name,
{
keyType,
keys: randomArray(generators[keyType]),
values: randomArray(generators[valueType]),
methods: getMethods(
mock,
testTypes.filter(t => keyType == t.keyType).length == 1
? {
set: `$set(uint256,${keyType},${valueType})`,
get: `$get(uint256,${keyType})`,
tryGet: `$tryGet(uint256,${keyType})`,
remove: `$remove(uint256,${keyType})`,
length: `$length_EnumerableMap_${name}(uint256)`,
at: `$at_EnumerableMap_${name}(uint256,uint256)`,
contains: `$contains(uint256,${keyType})`,
keys: `$keys_EnumerableMap_${name}(uint256)`,
}
: {
set: `$set(uint256,${keyType},${valueType})`,
get: `$get_EnumerableMap_${name}(uint256,${keyType})`,
tryGet: `$tryGet_EnumerableMap_${name}(uint256,${keyType})`,
remove: `$remove_EnumerableMap_${name}(uint256,${keyType})`,
length: `$length_EnumerableMap_${name}(uint256)`,
at: `$at_EnumerableMap_${name}(uint256,uint256)`,
contains: `$contains_EnumerableMap_${name}(uint256,${keyType})`,
keys: `$keys_EnumerableMap_${name}(uint256)`,
},
zeroValue: generators[valueType].zero,
methods: mapValues(
{
set: `$set(uint256,${keyType},${valueType})`,
get: `$get_EnumerableMap_${name}(uint256,${keyType})`,
tryGet: `$tryGet_EnumerableMap_${name}(uint256,${keyType})`,
remove: `$remove_EnumerableMap_${name}(uint256,${keyType})`,
length: `$length_EnumerableMap_${name}(uint256)`,
at: `$at_EnumerableMap_${name}(uint256,uint256)`,
contains: `$contains_EnumerableMap_${name}(uint256,${keyType})`,
keys: `$keys_EnumerableMap_${name}(uint256)`,
},
fnSig =>
(...args) =>
mock.getFunction(fnSig)(0, ...args),
),
zeroValue: zeroValue[valueType],
events: {
setReturn: `return$set_EnumerableMap_${name}_${keyType}_${valueType}`,
removeReturn: `return$remove_EnumerableMap_${name}_${keyType}`,
@ -77,8 +51,7 @@ describe('EnumerableMap', function () {
Object.assign(this, await loadFixture(fixture));
});
// UintToAddressMap
for (const { name } of testTypes) {
for (const { name } of TYPES) {
describe(name, function () {
beforeEach(async function () {
Object.assign(this, this.env[name]);