feat: rename table to tableId #1484
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 8854d92 The changes in this PR will be included in the next version bump. This PR includes changesets to release 28 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
58ef87c to
6edf524
Compare
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
holic
previously approved these changes
Sep 14, 2023
dk1a
previously approved these changes
Sep 14, 2023
Comment on lines
11
to
21
| * Note: if a tableId with composite keys is used, only the first key is indexed | ||
| */ | ||
| contract KeysInTableHook is StoreHook { | ||
| function handleSet(bytes32 tableId, bytes32[] memory key) internal { | ||
| bytes32 keysHash = keccak256(abi.encode(key)); | ||
|
|
||
| // If the key has not yet been set in the table... | ||
| // If the key has not yet been set in the tableId... | ||
| if (!UsedKeysIndex.getHas(tableId, keysHash)) { | ||
| uint40 length = uint40(KeysInTable.lengthKeys0(tableId)); | ||
|
|
||
| // Push the key to the list of keys in this table | ||
| // Push the key to the list of keys in this tableId |
There was a problem hiding this comment.
I think a bunch of comments here (more below) should retain table
dk1a
reviewed
Sep 14, 2023
| } | ||
|
|
||
| function setUp() public { | ||
| // Register table's value schema | ||
| // Register tableId's value schema |
|
I may have missed some, didn't go through every comment |
alvrs
force-pushed
the
alvrs/rename-value-schema
branch
from
9348d50 to
26df50f
Compare
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
eb6ff44 to
bb8cc29
Compare
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
bb8cc29 to
84716aa
Compare
alvrs
force-pushed
the
alvrs/rename-value-schema
branch
from
4189c86 to
14582af
Compare
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
48c5fdc to
09755c6
Compare
holic
reviewed
Sep 15, 2023
| bytes32 table2 = keccak256("other.table"); | ||
| StoreCore.registerTable(table, fieldLayout, defaultKeySchema, valueSchema, new string[](1), new string[](4)); | ||
| bytes32 tableId = keccak256("some.tableId"); | ||
| bytes32 table2 = keccak256("other.tableId"); |
There was a problem hiding this comment.
Suggested change
| bytes32 table2 = keccak256("other.tableId"); | |
| bytes32 tableId2 = keccak256("other.tableId"); |
holic
reviewed
Sep 15, 2023
|
|
||
| startGasReport("Check for existence of table (existent)"); | ||
| StoreCore.hasTable(table); | ||
| startGasReport("Check for existence of tableId (existent)"); |
There was a problem hiding this comment.
Suggested change
| startGasReport("Check for existence of tableId (existent)"); | |
| startGasReport("Check for existence of table (existent)"); |
holic
reviewed
Sep 15, 2023
| endGasReport(); | ||
|
|
||
| startGasReport("check for existence of table (non-existent)"); | ||
| startGasReport("check for existence of tableId (non-existent)"); |
There was a problem hiding this comment.
Suggested change
| startGasReport("check for existence of tableId (non-existent)"); | |
| startGasReport("check for existence of table (non-existent)"); |
holic
reviewed
Sep 15, 2023
| endGasReport(); | ||
| } | ||
|
|
||
| function testSetAndGetStaticDataSpanningWords() public { | ||
| // Register table | ||
| // Register tableId |
There was a problem hiding this comment.
Suggested change
| // Register tableId | |
| // Register table |
holic
reviewed
Sep 15, 2023
|
|
||
| // Register table | ||
| // Register tableId |
There was a problem hiding this comment.
Suggested change
| // Register tableId | |
| // Register table |
holic
reviewed
Sep 15, 2023
|
|
||
| // Register table | ||
| // Register tableId |
There was a problem hiding this comment.
Suggested change
| // Register tableId | |
| // Register table |
(there's a bunch more of this shape I didn't comment on)
holic
reviewed
Sep 15, 2023
| @@ -634,34 +634,34 @@ contract StoreCoreGasTest is Test, GasReporter, StoreMock { | |||
|
|
|||
| bytes memory data = abi.encodePacked(bytes16(0x0102030405060708090a0b0c0d0e0f10)); | |||
|
|
|||
| startGasReport("set record on table with subscriber"); | |||
| StoreCore.setRecord(table, key, data, fieldLayout); | |||
| startGasReport("set record on tableId with subscriber"); | |||
There was a problem hiding this comment.
Suggested change
| startGasReport("set record on tableId with subscriber"); | |
| startGasReport("set record on table with subscriber"); |
holic
reviewed
Sep 15, 2023
| endGasReport(); | ||
|
|
||
| data = abi.encodePacked(bytes16(0x1112131415161718191a1b1c1d1e1f20)); | ||
|
|
||
| startGasReport("set static field on table with subscriber"); | ||
| StoreCore.setField(table, key, 0, data, fieldLayout); | ||
| startGasReport("set static field on tableId with subscriber"); |
There was a problem hiding this comment.
Suggested change
| startGasReport("set static field on tableId with subscriber"); | |
| startGasReport("set static field on table with subscriber"); |
(there's a few more of this shape I didn't comment on)
holic
reviewed
Sep 15, 2023
| @@ -8,7 +8,7 @@ import { KeysInTable } from "./tables/KeysInTable.sol"; | |||
| import { UsedKeysIndex } from "./tables/UsedKeysIndex.sol"; | |||
|
|
|||
| /** | |||
| * Note: if a table with composite keys is used, only the first key is indexed | |||
| * Note: if a tableId with composite keys is used, only the first key is indexed | |||
There was a problem hiding this comment.
Suggested change
| * Note: if a tableId with composite keys is used, only the first key is indexed | |
| * Note: if a table with composite keys is used, only the first key is indexed |
alvrs
dismissed stale reviews from dk1a and holic
The base branch was changed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tabletotableIdwherever it is used as an IDhttps://www.notion.so/latticexyz/MUD-naming-conventions-66e11356a1934465b2aa1a951c61a299