Skip to content

Commit d595dd7

Browse files
authored
Merge pull request #339 from moonstream-to/inventory-override
Made `equip` and `unequip` public overrides on `InventoryFacet`
2 parents 85a8edd + 5819527 commit d595dd7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cli/web3cli/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.3
1+
0.0.7

contracts/inventory/InventoryFacet.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ contract InventoryFacet is
371371
address itemAddress,
372372
uint256 itemTokenId,
373373
uint256 amount
374-
) external diamondNonReentrant {
374+
) public override diamondNonReentrant {
375375
require(
376376
itemType == LibInventory.ERC20_ITEM_TYPE ||
377377
itemType == LibInventory.ERC721_ITEM_TYPE ||
@@ -408,7 +408,7 @@ contract InventoryFacet is
408408
// TODO(zomglings): The current implementation makes it so that players cannot increase the
409409
// number of tokens of a given type that are equipped into a persistent slot. I would consider
410410
// this a bug. For more details, see comment at bottom of the following test:
411-
// web3cli.test_inventory.TestPlayerFlow.test_player_cannot_unequip_erc20_tokens_from_persistent_slot_but_can_increase_amount
411+
// web3cli.test_inventory.TestPlayerFlow.test_player_cannot_unequip_erc20_tokens_from_persistent_slot
412412
if (
413413
istore
414414
.EquippedItems[istore.ContractERC721Address][subjectTokenId][slot]
@@ -491,7 +491,7 @@ contract InventoryFacet is
491491
uint256 slot,
492492
bool unequipAll,
493493
uint256 amount
494-
) external diamondNonReentrant {
494+
) public override diamondNonReentrant {
495495
LibInventory.InventoryStorage storage istore = LibInventory
496496
.inventoryStorage();
497497

0 commit comments

Comments
 (0)