Skip to content

Add new EnumerableMap types #4843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ernestognw merged 7 commits into from
Jan 22, 2024
Merged

Add new EnumerableMap types #4843

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
373e247
Add new enumerable map types
Amxx Jan 18, 2024
dfc87bc
add changeset
Amxx Jan 18, 2024
9677b6b
refactor
Amxx Jan 18, 2024
6c4fa3e
Update test/utils/structs/EnumerableMap.test.js
Amxx Jan 18, 2024
3df011a
List new map types in NatSpec
ernestognw Jan 19, 2024
62fdb92
fix generation
Amxx Jan 19, 2024
a204a95
Update .changeset/yellow-deers-walk.md
ernestognw Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
@Amxx
Amxx committed Jan 18, 2024
commit 9677b6b755efff7cf68d2629edf5761cdf271566
33 changes: 15 additions & 18 deletions test/utils/structs/EnumerableMap.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ const { TYPES, formatType } = require('../../../scripts/generate/templates/Enume

const { shouldBehaveLikeMap } = require('./EnumerableMap.behavior');

const getMethods = (mock, fnSigs) =>
mapValues(
fnSigs,
fnSig =>
(...args) =>
mock.getFunction(fnSig)(0, ...args),
);

// Add Bytes32ToBytes32Map that must be tested but is not part of the generated types.
TYPES.unshift(formatType('bytes32', 'bytes32'));

Expand All @@ -28,16 +20,21 @@ async function fixture() {
keys: randomArray(generators[keyType]),
values: randomArray(generators[valueType]),
zeroValue: generators[valueType].zero,
methods: getMethods(mock, {
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)`,
}),
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),
),
events: {
setReturn: `return$set_EnumerableMap_${name}_${keyType}_${valueType}`,
removeReturn: `return$remove_EnumerableMap_${name}_${keyType}`,
Expand Down