From 774dc1aeb0aedf2fcf5c40f9ee2d52250c8b3ba6 Mon Sep 17 00:00:00 2001 From: dk1a Date: Fri, 28 Feb 2025 20:20:01 +0300 Subject: [PATCH 1/2] change test store calls to public for reverts --- packages/store/test/StoreCoreDynamic.t.sol | 5 ++--- packages/store/test/StoreCoreGas.t.sol | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/store/test/StoreCoreDynamic.t.sol b/packages/store/test/StoreCoreDynamic.t.sol index 9b5f0a8754..06929d11f6 100644 --- a/packages/store/test/StoreCoreDynamic.t.sol +++ b/packages/store/test/StoreCoreDynamic.t.sol @@ -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; @@ -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); } } diff --git a/packages/store/test/StoreCoreGas.t.sol b/packages/store/test/StoreCoreGas.t.sol index 2891b907c0..e01fca6b9a 100644 --- a/packages/store/test/StoreCoreGas.t.sol +++ b/packages/store/test/StoreCoreGas.t.sol @@ -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; @@ -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 { From 5255e1dc3b35de9298b8f934b2a19902f20df8d8 Mon Sep 17 00:00:00 2001 From: dk1a Date: Fri, 28 Feb 2025 20:28:12 +0300 Subject: [PATCH 2/2] remove code which is unreachable due to internal revert halting --- packages/cli/contracts/test/Tablegen.t.sol | 2 +- packages/world/test/AccessControl.t.sol | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/cli/contracts/test/Tablegen.t.sol b/packages/cli/contracts/test/Tablegen.t.sol index f36d6429f4..548233b48b 100644 --- a/packages/cli/contracts/test/Tablegen.t.sol +++ b/packages/cli/contracts/test/Tablegen.t.sol @@ -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 { diff --git a/packages/world/test/AccessControl.t.sol b/packages/world/test/AccessControl.t.sol index eb0386dab7..07576b9f1b 100644 --- a/packages/world/test/AccessControl.t.sol +++ b/packages/world/test/AccessControl.t.sol @@ -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