reorder tests

Author: kumaryash90

src/test/drop/SignatureDrop.t.sol

@@ -58,34 +58,32 @@ contract SignatureDropTest is BaseTest {
     }
 
     /*
-     *  note: Testing state changes; a batch of tokens, and nextTokenIdToMint
+     *  note: Testing revert condition; calling tokenURI for invalid batch id.
      */
-    function test_state_lazyMint_batchMintAndNextTokenIdToMint() public {
+    function test_revert_lazyMint_batchMintAndTokenURI() public {
         vm.startPrank(deployer_signer);
 
         sigdrop.lazyMint(100, "ipfs://", "");
 
-        uint256 slot = stdstore.target(address(sigdrop)).sig("nextTokenIdToMint()").find();
-        bytes32 loc = bytes32(slot);
-        uint256 nextTokenIdToMint = uint256(vm.load(address(sigdrop), loc));
+        vm.expectRevert("No batch id for token.");
+        sigdrop.tokenURI(100);
 
-        assertEq(nextTokenIdToMint, 100);
         vm.stopPrank();
     }
 
     /*
-     *  note: Fuzz testing; a batch of tokens, and nextTokenIdToMint
+     *  note: Testing state changes; a batch of tokens, and nextTokenIdToMint
      */
-    function test_fuzz_lazyMint_batchMintAndNextTokenIdToMint(uint256 x) public {
+    function test_state_lazyMint_batchMintAndNextTokenIdToMint() public {
         vm.startPrank(deployer_signer);
 
-        sigdrop.lazyMint(x, "ipfs://", "");
+        sigdrop.lazyMint(100, "ipfs://", "");
 
         uint256 slot = stdstore.target(address(sigdrop)).sig("nextTokenIdToMint()").find();
         bytes32 loc = bytes32(slot);
         uint256 nextTokenIdToMint = uint256(vm.load(address(sigdrop), loc));
 
-        assertEq(nextTokenIdToMint, x);
+        assertEq(nextTokenIdToMint, 100);
         vm.stopPrank();
     }
 
@@ -106,20 +104,6 @@ contract SignatureDropTest is BaseTest {
         vm.stopPrank();
     }
 
-    /*
-     *  note: Testing revert condition; calling tokenURI for invalid batch id.
-     */
-    function test_revert_lazyMint_batchMintAndTokenURI() public {
-        vm.startPrank(deployer_signer);
-
-        sigdrop.lazyMint(100, "ipfs://", "");
-
-        vm.expectRevert("No batch id for token.");
-        sigdrop.tokenURI(100);
-
-        vm.stopPrank();
-    }
-
     /*
      *  note: Testing state changes; a batch of tokens with encrypted base URI, and associated URI for tokens
      */
@@ -148,6 +132,22 @@ contract SignatureDropTest is BaseTest {
         vm.stopPrank();
     }
 
+    /*
+     *  note: Fuzz testing; a batch of tokens, and nextTokenIdToMint
+     */
+    function test_fuzz_lazyMint_batchMintAndNextTokenIdToMint(uint256 x) public {
+        vm.startPrank(deployer_signer);
+
+        sigdrop.lazyMint(x, "ipfs://", "");
+
+        uint256 slot = stdstore.target(address(sigdrop)).sig("nextTokenIdToMint()").find();
+        bytes32 loc = bytes32(slot);
+        uint256 nextTokenIdToMint = uint256(vm.load(address(sigdrop), loc));
+
+        assertEq(nextTokenIdToMint, x);
+        vm.stopPrank();
+    }
+
     /*///////////////////////////////////////////////////////////////
                                 Delayed Reveal Tests
     //////////////////////////////////////////////////////////////*/
@@ -532,6 +532,36 @@ contract SignatureDropTest is BaseTest {
                                 Claim Tests
     //////////////////////////////////////////////////////////////*/
 
+    /**
+     *  note: Testing revert condition; not allowed to claim again before wait time is over.
+     */
+    function test_revert_claimCondition_waitTimeInSecondsBetweenClaims() public {
+        vm.warp(1);
+
+        address receiver = getActor(0);
+        bytes32[] memory proofs = new bytes32[](0);
+
+        SignatureDrop.AllowlistProof memory alp;
+        alp.proof = proofs;
+
+        SignatureDrop.ClaimCondition[] memory conditions = new SignatureDrop.ClaimCondition[](1);
+        conditions[0].maxClaimableSupply = 100;
+        conditions[0].quantityLimitPerTransaction = 100;
+        conditions[0].waitTimeInSecondsBetweenClaims = type(uint256).max;
+
+        vm.prank(deployer_signer);
+        sigdrop.lazyMint(100, "ipfs://", "");
+        vm.prank(deployer_signer);
+        sigdrop.setClaimConditions(conditions, false, "");
+
+        vm.prank(getActor(5), getActor(5));
+        sigdrop.claim(receiver, 1, address(0), 0, alp, "");
+
+        vm.expectRevert("cannot claim.");
+        vm.prank(getActor(5), getActor(5));
+        sigdrop.claim(receiver, 1, address(0), 0, alp, "");
+    }
+    
     /**
      *  note: Testing state changes; check startId and count after setting claim conditions.
      */
@@ -614,36 +644,6 @@ contract SignatureDropTest is BaseTest {
         assertEq(sigdrop.getActiveClaimConditionId(), 2);
     }
 
-    /**
-     *  note: Testing revert condition; not allowed to claim again before wait time is over.
-     */
-    function test_revert_claimCondition_waitTimeInSecondsBetweenClaims() public {
-        vm.warp(1);
-
-        address receiver = getActor(0);
-        bytes32[] memory proofs = new bytes32[](0);
-
-        SignatureDrop.AllowlistProof memory alp;
-        alp.proof = proofs;
-
-        SignatureDrop.ClaimCondition[] memory conditions = new SignatureDrop.ClaimCondition[](1);
-        conditions[0].maxClaimableSupply = 100;
-        conditions[0].quantityLimitPerTransaction = 100;
-        conditions[0].waitTimeInSecondsBetweenClaims = type(uint256).max;
-
-        vm.prank(deployer_signer);
-        sigdrop.lazyMint(100, "ipfs://", "");
-        vm.prank(deployer_signer);
-        sigdrop.setClaimConditions(conditions, false, "");
-
-        vm.prank(getActor(5), getActor(5));
-        sigdrop.claim(receiver, 1, address(0), 0, alp, "");
-
-        vm.expectRevert("cannot claim.");
-        vm.prank(getActor(5), getActor(5));
-        sigdrop.claim(receiver, 1, address(0), 0, alp, "");
-    }
-
     /**
      *  note: Testing state changes; reset eligibility of claim conditions and claiming again for same condition id.
      */