evm: code cleanup

escrin · Mar 23, 2024 · 68ff2b7 · 68ff2b7
1 parent 8e92dcd
commit 68ff2b7
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/evm/src/NFTrout.sol b/evm/src/NFTrout.sol
@@ -159,11 +159,9 @@ contract NFTrout is
     }
 
     /// Returns a cost for the payer to breed the trout that is no larger than the list price.
-    function getBreedingFee(address breeder, TokenId tokenId) public view returns (uint256) {
+    function getBreedingFee(address breeder, TokenId tokenId) public view returns (uint256 fee) {
         if (_isApprovedOrOwner(breeder, tokenId)) return 0;
-        uint256 fee = studFees[tokenId];
-        if (fee == 0) revert Unauthorized();
-        return fee;
+        if ((fee = studFees[tokenId]) == 0) revert Unauthorized();
     }
 
     function tokenURI(uint256 tokenId)
@@ -257,7 +255,7 @@ contract NFTrout is
             if (task.kind == TaskKind.Burn) {
                 BurnTask memory burnTask = abi.decode(task.payload, (BurnTask));
                 for (uint256 j; j < burnTask.tokens.length; j++) {
-                    if (!_exists(burnTask.tokens[j])) continue;
+                    if (!_exists(TokenId.unwrap(burnTask.tokens[j]))) continue;
                     _burn(TokenId.unwrap(burnTask.tokens[j]));
                 }
                 return;
@@ -291,10 +289,6 @@ contract NFTrout is
         return whom == owner || getApproved(tokenId) == whom || isApprovedForAll(owner, whom);
     }
 
-    function _exists(TokenId id) internal view returns (bool) {
-        return _exists(TokenId.unwrap(id));
-    }
-
     function _startTokenId() internal pure override returns (uint256) {
         return 1;
     }