trim require message

Author: jakeloo

contracts/drop/DropERC721.sol

@@ -392,13 +392,10 @@ contract DropERC721 is
 
         uint256 lastConditionStartTimestamp;
         for (uint256 i = 0; i < _phases.length; i++) {
-            require(
-                i == 0 || lastConditionStartTimestamp < _phases[i].startTimestamp,
-                "startTimestamp must be in ascending order."
-            );
+            require(i == 0 || lastConditionStartTimestamp < _phases[i].startTimestamp, "ST");
 
             uint256 supplyClaimedAlready = claimCondition.phases[newStartIndex + i].supplyClaimed;
-            require(supplyClaimedAlready < _phases[i].maxClaimableSupply, "max supply claimed already");
+            require(supplyClaimedAlready < _phases[i].maxClaimableSupply, "MS");
 
             claimCondition.phases[newStartIndex + i] = _phases[i];
             claimCondition.phases[newStartIndex + i].supplyClaimed = supplyClaimedAlready;
@@ -630,7 +627,7 @@ contract DropERC721 is
 
     /// @dev Lets a contract admin set the global maximum supply for collection's NFTs.
     function setMaxTotalSupply(uint256 _maxTotalSupply) external onlyRole(DEFAULT_ADMIN_ROLE) {
-        require(_maxTotalSupply < nextTokenIdToMint, "already minted more than desired max supply");
+        require(_maxTotalSupply < nextTokenIdToMint, "MAX");
         maxTotalSupply = _maxTotalSupply;
         emit MaxTotalSupplyUpdated(_maxTotalSupply);
     }
@@ -646,7 +643,7 @@ contract DropERC721 is
         external
         onlyRole(DEFAULT_ADMIN_ROLE)
     {
-        require(_royaltyBps <= MAX_BPS, "exceed royalty bps");
+        require(_royaltyBps <= MAX_BPS, "MAX_BPS");
 
         royaltyRecipient = _royaltyRecipient;
         royaltyBps = uint16(_royaltyBps);
@@ -660,7 +657,7 @@ contract DropERC721 is
         address _recipient,
         uint256 _bps
     ) external onlyRole(DEFAULT_ADMIN_ROLE) {
-        require(_bps <= MAX_BPS, "exceed royalty bps");
+        require(_bps <= MAX_BPS, "MAX_BPS");
 
         royaltyInfoForToken[_tokenId] = RoyaltyInfo({ recipient: _recipient, bps: _bps });
 
@@ -682,7 +679,7 @@ contract DropERC721 is
 
     /// @dev Lets a contract admin set a new owner for the contract. The new owner must be a contract admin.
     function setOwner(address _newOwner) external onlyRole(DEFAULT_ADMIN_ROLE) {
-        require(hasRole(DEFAULT_ADMIN_ROLE, _newOwner), "new owner not contract admin.");
+        require(hasRole(DEFAULT_ADMIN_ROLE, _newOwner), "!ADMIN");
         address _prevOwner = _owner;
         _owner = _newOwner;
 
@@ -715,7 +712,7 @@ contract DropERC721 is
 
         // if transfer is restricted on the contract, we still want to allow burning and minting
         if (!hasRole(TRANSFER_ROLE, address(0)) && from != address(0) && to != address(0)) {
-            require(hasRole(TRANSFER_ROLE, from) || hasRole(TRANSFER_ROLE, to), "restricted to TRANSFER_ROLE holders");
+            require(hasRole(TRANSFER_ROLE, from) || hasRole(TRANSFER_ROLE, to), "!TRANSFER_ROLE");
         }
     }
 

contracts/marketplace/Marketplace.sol

@@ -99,13 +99,13 @@ contract Marketplace is
 
     /// @dev Checks whether caller is a listing creator.
     modifier onlyListingCreator(uint256 _listingId) {
-        require(listings[_listingId].tokenOwner == _msgSender(), "caller != listing owner");
+        require(listings[_listingId].tokenOwner == _msgSender(), "!OWNER");
         _;
     }
 
     /// @dev Checks whether a listing exists.
     modifier onlyExistingListing(uint256 _listingId) {
-        require(listings[_listingId].assetContract != address(0), "listing DNE");
+        require(listings[_listingId].assetContract != address(0), "DNE");
         _;
     }
 
@@ -338,7 +338,7 @@ contract Marketplace is
     function cancelDirectListing(uint256 _listingId) external onlyListingCreator(_listingId) {
         Listing memory targetListing = listings[_listingId];
 
-        require(targetListing.listingType == ListingType.Direct, "not direct listing");
+        require(targetListing.listingType == ListingType.Direct, "!DIRECT");
 
         delete listings[_listingId];
 
@@ -363,7 +363,7 @@ contract Marketplace is
         // Check whether the settled total price and currency to use are correct.
         require(
             _currency == targetListing.currency && _totalPrice == (targetListing.buyoutPricePerToken * _quantityToBuy),
-            "invalid currency or price"
+            "!PRICE"
         );
 
         executeSale(
@@ -386,11 +386,8 @@ contract Marketplace is
         Offer memory targetOffer = offers[_listingId][_offeror];
         Listing memory targetListing = listings[_listingId];
 
-        require(
-            _currency == targetOffer.currency && _pricePerToken == targetOffer.pricePerToken,
-            "invalid currency or price"
-        );
-        require(targetOffer.expirationTimestamp > block.timestamp, "offer expired");
+        require(_currency == targetOffer.currency && _pricePerToken == targetOffer.pricePerToken, "!PRICE");
+        require(targetOffer.expirationTimestamp > block.timestamp, "EXPIRED");
 
         delete offers[_listingId][_offeror];