clean up

Author: allan-almeida-imtbl

test/crafting/Crafting.t.sol

@@ -20,16 +20,19 @@ contract CraftingTest is Test {
 
   uint256 public imtblPrivateKey = 1;
   uint256 public gameStudioPrivateKey = 2;
-  uint256 public playerOnePrivateKey = 3;
-  uint256 public signingAuthorityPrivateKey = 4;
+  uint256 public signingAuthorityPrivateKey = 3;
+  uint256 public playerPrivateKey = 4;
 
   address public imtbl = vm.addr(imtblPrivateKey);
   address public gameStudio = vm.addr(gameStudioPrivateKey);
-  address public playerOne = vm.addr(playerOnePrivateKey);
   address public signingAuthority = vm.addr(signingAuthorityPrivateKey);
+  address public player = vm.addr(playerPrivateKey);
 
   address public proxyAddr;
 
+  string public multicallerName = "multicaller-name";
+  string public multicallerVersion = "multicaller-version";
+
   function setUp() public {
     DeployOperatorAllowlist deployScript = new DeployOperatorAllowlist();
     proxyAddr = deployScript.run(imtbl, imtbl, imtbl);
@@ -50,7 +53,7 @@ contract CraftingTest is Test {
     );
 
     // Deploy game studio's multicaller contract
-    multicaller = new GuardedMulticaller(gameStudio, "multicaller", "1");
+    multicaller = new GuardedMulticaller(gameStudio, multicallerName, multicallerVersion);
     assertTrue(multicaller.hasRole(multicaller.DEFAULT_ADMIN_ROLE(), gameStudio));
 
     // Add multicaller to operator allowlist
@@ -95,24 +98,24 @@ contract CraftingTest is Test {
     assertTrue(multicaller.isFunctionPermitted(address(game721), game721.safeMint.selector));
     assertTrue(multicaller.isFunctionPermitted(address(game1155), game1155.burnBatch.selector));
 
-    sigUtils = new SigUtils("multicaller", "1", address(multicaller));
+    sigUtils = new SigUtils(multicallerName, multicallerVersion, address(multicaller));
   }
 
   function testCraft() public {
-    // Game studio mints 10 of tokenID 1 on 1155 to user A
+    // Game studio mints 10 of tokenID 1 on 1155 to player
     vm.prank(gameStudio);
-    game1155.safeMint(playerOne, 1, 10, "");
-    assertTrue(game1155.balanceOf(playerOne, 1) == 10);
+    game1155.safeMint(player, 1, 10, "");
+    assertTrue(game1155.balanceOf(player, 1) == 10);
 
-    // Game studio mints 10 of tokenID 2 on 1155 to user A
+    // Game studio mints 10 of tokenID 2 on 1155 to player
     vm.prank(gameStudio);
-    game1155.safeMint(playerOne, 2, 10, "");
-    assertTrue(game1155.balanceOf(playerOne, 2) == 10);
+    game1155.safeMint(player, 2, 10, "");
+    assertTrue(game1155.balanceOf(player, 2) == 10);
 
     // Perform a craft using the Multicaller
     // - burn 1 of 1155 tokenID 1
     // - burn 2 of 1155 tokenID 2
-    // - mint 1 721 to playerOne
+    // - mint 1 721 to player
 
     bytes32 referenceID = keccak256("testCraft:1");
 
@@ -130,8 +133,8 @@ contract CraftingTest is Test {
     values[0] = 1;
     values[1] = 2;
 
-    data[0] = abi.encodeWithSignature("burnBatch(address,uint256[],uint256[])", playerOne, ids, values);
-    data[1] = abi.encodeWithSignature("safeMint(address,uint256)", playerOne, 1);
+    data[0] = abi.encodeWithSignature("burnBatch(address,uint256[],uint256[])", player, ids, values);
+    data[1] = abi.encodeWithSignature("safeMint(address,uint256)", player, 1);
 
     uint256 deadline = block.timestamp + 10;
 
@@ -144,15 +147,15 @@ contract CraftingTest is Test {
     vm.stopPrank();
 
     // Give multicaller approve to burn
-    vm.startPrank(playerOne);
+    vm.startPrank(player);
     game1155.setApprovalForAll(address(multicaller), true);
-    assertTrue(game1155.isApprovedForAll(playerOne, address(multicaller)));
+    assertTrue(game1155.isApprovedForAll(player, address(multicaller)));
 
     multicaller.execute(signingAuthority, referenceID, targets, data, deadline, signature);
     vm.stopPrank();
 
-    assertTrue(game1155.balanceOf(playerOne, 1) == 9);
-    assertTrue(game1155.balanceOf(playerOne, 2) == 8);
-    assertTrue(game721.balanceOf(playerOne) == 1);
+    assertTrue(game1155.balanceOf(player, 1) == 9);
+    assertTrue(game1155.balanceOf(player, 2) == 8);
+    assertTrue(game721.balanceOf(player) == 1);
   }
 }