Renamed getDeck to getDeckCards. Renamed getDeckReal to getDeck.

0xFableOrg · Mar 26, 2024 · f812094 · f812094
1 parent 0b5d9a1
commit f812094
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/contracts/src/Game.sol b/packages/contracts/src/Game.sol
@@ -549,7 +549,7 @@ contract Game {
         uint256[] storage cards = gdata.cards;
         pdata.deckStart = uint8(cards.length);
         inventory.checkDeck(msg.sender, deckID);
-        uint256[] memory deck = inventory.getDeck(msg.sender, deckID);
+        uint256[] memory deck = inventory.getDeckCards(msg.sender, deckID);
 
         for (uint256 i = 0; i < deck.length; i++) {
             cards.push(deck[i]);

diff --git a/packages/contracts/src/Inventory.sol b/packages/contracts/src/Inventory.sol
@@ -331,7 +331,7 @@ contract Inventory is Ownable {
     // ---------------------------------------------------------------------------------------------
 
     // Returns the list of cards in the given deck of the given player.
-    function getDeck(address player, uint8 deckID)
+    function getDeckCards(address player, uint8 deckID)
         external
         view
         exists(player, deckID)
@@ -343,7 +343,7 @@ contract Inventory is Ownable {
     // ---------------------------------------------------------------------------------------------
 
     // Returns the list of cards in the given deck of the given player.
-    function getDeckReal(address player, uint8 deckID)
+    function getDeck(address player, uint8 deckID)
         external
         view
         exists(player, deckID)

diff --git a/packages/contracts/src/test/Integration.t.sol b/packages/contracts/src/test/Integration.t.sol
@@ -71,8 +71,8 @@ contract Integration is Test {
         game.createGame(2);
 
         // IDs don't start at 1 because the deploy script currently airdrops some addresses, might change.
-        inventory.getDeck(player2, 0); // player1 has card id of 49-72 inclusive
-        inventory.getDeck(player2, 0); // player2 has card id of 73-96 inclusive
+        inventory.getDeckCards(player2, 0); // player1 has card id of 49-72 inclusive
+        inventory.getDeckCards(player2, 0); // player2 has card id of 73-96 inclusive
 
         vm.startPrank(player1);
         game.joinGame(gameID, DECK_ID, SALT_HASH, JOIN_DATA);

diff --git a/packages/contracts/src/test/Inventory.t.sol b/packages/contracts/src/test/Inventory.t.sol
@@ -33,7 +33,7 @@ contract InventoryTest is Test {
     // expect revert if player's deck contains a card with more than `MAX_CARD_COPY` copies.
     function testCheckDeckExceedsMaxCopy() public {
         uint8 deckId = 0;
-        uint256 randomCard = inventory.getDeck(player1, deckId)[2];
+        uint256 randomCard = inventory.getDeckCards(player1, deckId)[2];
 
         // increase card `randomCard` copies to 4
         vm.startPrank(player1);

diff --git a/packages/webapp/src/actions/getDeck.ts b/packages/webapp/src/actions/getDeck.ts
@@ -34,7 +34,7 @@ export async function getAllDecks(args: GetDeckArgs): Promise<any> {
 }
 
 /**
- * Fetches the deck of the given player of a given ID by sending the `getDeckReal` transaction.
+ * Fetches the deck of the given player of a given ID by sending the `getDeck` transaction.
  *
  * Returns `true` iff the transaction is successful.
  */
@@ -105,7 +105,7 @@ async function getDeckImpl(args: GetDeckAtArgs): Promise<any> {
     const result = await contractWriteThrowing({
       contract: deployment.Inventory,
       abi: inventoryABI,
-      functionName: "getDeckReal",
+      functionName: "getDeck",
       args: [args.playerAddress, args.index],
     }) 
 

diff --git a/packages/webapp/src/store/network.ts b/packages/webapp/src/store/network.ts
@@ -45,7 +45,7 @@ export async function fetchDeck(player: Address, deckID: number): Promise<readon
     return readContract({
         address: deployment.Inventory,
         abi: inventoryABI,
-        functionName: "getDeck",
+        functionName: "getDeckCards",
         args: [player, deckID],
     })
 }