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

Fix Checkpoints fuzz overflow (#4184)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
This commit is contained in:
Ernesto García
2023-04-25 17:57:16 +02:00
committed by GitHub
parent 1a079d258b
commit 8f14d52b73
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/generate/templates/Checkpoints.t.js
View File

@ -86,10 +86,12 @@ function testPush(
if (keys.length > 0) { if (keys.length > 0) {
${opts.keyTypeName} lastKey = keys[keys.length - 1]; ${opts.keyTypeName} lastKey = keys[keys.length - 1];
pastKey = _bound${capitalize(opts.keyTypeName)}(pastKey, 0, lastKey - 1); if (lastKey > 0) {
pastKey = _bound${capitalize(opts.keyTypeName)}(pastKey, 0, lastKey - 1);
vm.expectRevert();
this.push(pastKey, values[keys.length % values.length]); vm.expectRevert();
this.push(pastKey, values[keys.length % values.length]);
}
} }
} }
@ -173,11 +175,13 @@ function testPush(
// Can't push any key in the past // Can't push any key in the past
if (keys.length > 0) { if (keys.length > 0) {
${opts.keyTypeName} lastKey = keys[keys.length - 1]; ${opts.keyTypeName} lastKey = keys[keys.length - 1];
pastKey = _bound${capitalize(opts.keyTypeName)}(pastKey, 0, lastKey - 1); if (lastKey > 0) {
pastKey = _bound${capitalize(opts.keyTypeName)}(pastKey, 0, lastKey - 1);
vm.roll(pastKey);
vm.expectRevert(); vm.roll(pastKey);
this.push(values[keys.length % values.length]); vm.expectRevert();
this.push(values[keys.length % values.length]);
}
} }
} }

26
test/utils/Checkpoints.t.sol
View File

@ -66,11 +66,13 @@ contract CheckpointsHistoryTest is Test {
// Can't push any key in the past // Can't push any key in the past
if (keys.length > 0) { if (keys.length > 0) {
uint32 lastKey = keys[keys.length - 1]; uint32 lastKey = keys[keys.length - 1];
pastKey = _boundUint32(pastKey, 0, lastKey - 1); if (lastKey > 0) {
pastKey = _boundUint32(pastKey, 0, lastKey - 1);
vm.roll(pastKey); vm.roll(pastKey);
vm.expectRevert(); vm.expectRevert();
this.push(values[keys.length % values.length]); this.push(values[keys.length % values.length]);
}
} }
} }
@ -185,10 +187,12 @@ contract CheckpointsTrace224Test is Test {
if (keys.length > 0) { if (keys.length > 0) {
uint32 lastKey = keys[keys.length - 1]; uint32 lastKey = keys[keys.length - 1];
pastKey = _boundUint32(pastKey, 0, lastKey - 1); if (lastKey > 0) {
pastKey = _boundUint32(pastKey, 0, lastKey - 1);
vm.expectRevert(); vm.expectRevert();
this.push(pastKey, values[keys.length % values.length]); this.push(pastKey, values[keys.length % values.length]);
}
} }
} }
@ -291,10 +295,12 @@ contract CheckpointsTrace160Test is Test {
if (keys.length > 0) { if (keys.length > 0) {
uint96 lastKey = keys[keys.length - 1]; uint96 lastKey = keys[keys.length - 1];
pastKey = _boundUint96(pastKey, 0, lastKey - 1); if (lastKey > 0) {
pastKey = _boundUint96(pastKey, 0, lastKey - 1);
vm.expectRevert(); vm.expectRevert();
this.push(pastKey, values[keys.length % values.length]); this.push(pastKey, values[keys.length % values.length]);
}
} }
} }