feat: rename key to keyTuple #1492
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
alvrs
force-pushed
the
alvrs/rename-key-tuple
branch
from
3c2536f to
c93145b
Compare
🦋 Changeset detectedLatest commit: 95dc04c 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 |
This was referenced Sep 14, 2023
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
bb8cc29 to
84716aa
Compare
alvrs
force-pushed
the
alvrs/rename-key-tuple
branch
from
c93145b to
af1c6da
Compare
alvrs
force-pushed
the
alvrs/rename-key-tuple
branch
from
af1c6da to
6810138
Compare
Co-authored-by: Kevin Ingersoll <[email protected]>
alvrs
force-pushed
the
alvrs/rename-table-id-key-tuple
branch
from
48c5fdc to
09755c6
Compare
alvrs
force-pushed
the
alvrs/rename-key-tuple
branch
from
6810138 to
7232778
Compare
holic
reviewed
Sep 15, 2023
|
|
||
| // If the key has not yet been set in the table... | ||
| // If the keyTuple has not yet been set in the table... |
There was a problem hiding this comment.
Suggested change
| // If the keyTuple has not yet been set in the table... | |
| // If the key has not yet been set in the table... |
holic
reviewed
Sep 15, 2023
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Update the index to avoid duplicating this key in the array | ||
| // Update the index to avoid duplicating this keyTuple in the array |
There was a problem hiding this comment.
Suggested change
| // Update the index to avoid duplicating this keyTuple in the array | |
| // Update the index to avoid duplicating this key in the array |
holic
reviewed
Sep 15, 2023
| (bool has, uint40 index) = UsedKeysIndex.get(tableId, keysHash); | ||
|
|
||
| // If the key was part of the table... | ||
| // If the keyTuple was part of the table... |
There was a problem hiding this comment.
Suggested change
| // If the keyTuple was part of the table... | |
| // If the key was part of the table... |
holic
reviewed
Sep 15, 2023
| if (has) { | ||
| // Delete the index as the key is not in the table | ||
| // Delete the index as the keyTuple is not in the table anymore |
There was a problem hiding this comment.
Suggested change
| // Delete the index as the keyTuple is not in the table anymore | |
| // Delete the index as the key is not in the table anymore |
holic
reviewed
Sep 15, 2023
| @@ -112,15 +113,15 @@ contract KeysInTableHook is StoreHook { | |||
| } | |||
| } | |||
|
|
|||
| // Update the index of lastKey after swapping it with the deleted key | |||
| // Update the index of lastKey after swapping it with the deleted keyTuple | |||
There was a problem hiding this comment.
Suggested change
| // Update the index of lastKey after swapping it with the deleted keyTuple | |
| // Update the index of lastKey after swapping it with the deleted key |
holic
reviewed
Sep 15, 2023
| @@ -6,22 +6,22 @@ import { IStore } from "@latticexyz/store/src/IStore.sol"; | |||
| import { UsedKeysIndex } from "./tables/UsedKeysIndex.sol"; | |||
|
|
|||
| /** | |||
| * Get whether the key is in the given table. | |||
| * Get whether the keyTuple is in the given table. | |||
There was a problem hiding this comment.
Suggested change
| * Get whether the keyTuple is in the given table. | |
| * Get whether the key is in the given table. |
holic
reviewed
Sep 15, 2023
|
|
||
| return UsedKeysIndex.getHas(tableId, keysHash); | ||
| } | ||
|
|
||
| /** | ||
| * Get whether the key is in the given table for the given store. | ||
| * Get whether the keyTuple is in the given table for the given store. |
There was a problem hiding this comment.
Suggested change
| * Get whether the keyTuple is in the given table for the given store. | |
| * Get whether the key is in the given table for the given store. |
…to alvrs/rename-key-tuple
|
re: |
|
did another pass of self-review, gonna go ahead with merging this to unblock other PRs |
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.
Fixes #1128
https://www.notion.so/latticexyz/MUD-naming-conventions-66e11356a1934465b2aa1a951c61a299