Skip to content

fix(store): fix internal revert incompatibilities #3612

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(store): fix internal revert incompatibilities #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
774dc1a
change test store calls to public for reverts
dk1a Feb 28, 2025
5255e1d
remove code which is unreachable due to internal revert halting
dk1a Feb 28, 2025
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
2 changes: 1 addition & 1 deletion packages/cli/contracts/test/Tablegen.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ contract TablegenTest is Test, StoreMock {
assertEq(Singleton.lengthV4, 1);
assertEq(Singleton.getItemV4(0), 5);
vm.expectRevert(abi.encodeWithSelector(IStoreErrors.Store_IndexOutOfBounds.selector, 4, 4));
assertEq(Singleton.getItemV4(1), 0);
Singleton.getItemV4(1);
}

function testOffchain() public {
Expand Down
5 changes: 2 additions & 3 deletions packages/store/test/StoreCoreDynamic.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ contract StoreCoreDynamicTest is Test, GasReporter, StoreMock {
assertEq(length, thirdDataBytes.length);
}

/// forge-config: default.allow_internal_expect_revert = true
function testGetDynamicFieldSlice() public {
ResourceId tableId = _tableId;
bytes32[] memory keyTuple = _keyTuple;
Expand All @@ -234,10 +233,10 @@ contract StoreCoreDynamicTest is Test, GasReporter, StoreMock {
// Expect a revert if the end index is out of bounds
uint256 length = secondDataBytes.length;
vm.expectRevert(abi.encodeWithSelector(IStoreErrors.Store_IndexOutOfBounds.selector, length, length));
StoreCore.getDynamicFieldSlice(tableId, keyTuple, 0, 0, length + 1);
this.getDynamicFieldSlice(tableId, keyTuple, 0, 0, length + 1);

// Expect a revert if the start index is out of bounds
vm.expectRevert(abi.encodeWithSelector(IStoreErrors.Store_IndexOutOfBounds.selector, length, length));
StoreCore.getDynamicFieldSlice(tableId, keyTuple, 0, length, length);
this.getDynamicFieldSlice(tableId, keyTuple, 0, length, length);
}
}
3 changes: 1 addition & 2 deletions packages/store/test/StoreCoreGas.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,6 @@ contract StoreCoreGasTest is Test, GasReporter, StoreMock {
endGasReport();
}

/// forge-config: default.allow_internal_expect_revert = true
function testAccessEmptyData() public {
ResourceId tableId = _tableId;

Expand Down Expand Up @@ -629,7 +628,7 @@ contract StoreCoreGasTest is Test, GasReporter, StoreMock {
endGasReport();

vm.expectRevert(abi.encodeWithSelector(IStoreErrors.Store_IndexOutOfBounds.selector, 0, 0));
StoreCore.getDynamicFieldSlice(tableId, keyTuple, 0, 0, 0);
this.getDynamicFieldSlice(tableId, keyTuple, 0, 0, 0);
}

function testHooks() public {
Expand Down
2 changes: 0 additions & 2 deletions packages/world/test/AccessControl.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ contract AccessControlTest is Test, GasReporter, StoreMock {
vm.expectRevert(
abi.encodeWithSelector(IWorldErrors.World_AccessDenied.selector, tableId.toString(), address(this))
);
startGasReport("AccessControl: requireAccess (this address)");
AccessControl.requireAccess(tableId, address(this));
endGasReport();
}

/// forge-config: default.allow_internal_expect_revert = true
Expand Down
Loading