Addressed PR comments (#9672)

Signed-off-by: ilko-iliev-lime <ilko.iliev@limechain.tech>
hashgraph · Nov 7, 2023 · ac8aa65 · ac8aa65
1 parent 79cdc9f
commit ac8aa65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ode/app/service/contract/impl/exec/systemcontracts/hts/nfttokeninfo/NftTokenInfoCall.java b/...ode/app/service/contract/impl/exec/systemcontracts/hts/nfttokeninfo/NftTokenInfoCall.java
@@ -89,7 +89,8 @@ public NftTokenInfoCall(
             return revertResult(status, gasCalculator.viewGasRequirement());
         }
 
-        final var ownerAccount = getOwnerAccount(nft, token);
+        final var nonNullNft = nft != null ? nft : Nft.DEFAULT;
+        final var ownerAccount = getOwnerAccount(nonNullNft, token);
         if (ownerAccount == null) {
             return revertResult(INVALID_ACCOUNT_ID, gasCalculator.viewGasRequirement());
         }
@@ -98,12 +99,11 @@ public NftTokenInfoCall(
                         .getOutputs()
                         .encodeElements(
                                 status.protoOrdinal(),
-                                nftTokenInfoTupleFor(token, nft, serialNumber, ledgerId, ownerAccount)),
+                                nftTokenInfoTupleFor(token, nonNullNft, serialNumber, ledgerId, ownerAccount)),
                 gasRequirement);
     }
 
-    private Account getOwnerAccount(@NonNull Nft nft, Token token) {
-        requireNonNull(nft);
+    private Account getOwnerAccount(Nft nft, Token token) {
         final var explicitId = nft.ownerIdOrElse(AccountID.DEFAULT);
         if (explicitId.account().kind() == AccountID.AccountOneOfType.UNSET) {
             return null;

diff --git a/...ervice/contract/impl/test/exec/systemcontracts/hts/nfttokeninfo/NftTokenInfoCallTest.java b/...ervice/contract/impl/test/exec/systemcontracts/hts/nfttokeninfo/NftTokenInfoCallTest.java
@@ -20,7 +20,6 @@
 import static com.hedera.node.app.service.contract.impl.test.TestHelpers.*;
 import static com.hedera.node.app.service.contract.impl.utils.ConversionUtils.headlongAddressOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 
 import com.esaulpaugh.headlong.abi.Tuple;