fix(freezeV2): optimize the query return of the interface

Author: lxcmyf

framework/src/main/java/org/tron/core/Wallet.java

@@ -765,19 +765,26 @@ public DelegatedResourceList getDelegatedResourceV2(
         .createDbKeyV2(fromAddress.toByteArray(), toAddress.toByteArray(), false);
     DelegatedResourceCapsule unlockResource = chainBaseManager.getDelegatedResourceStore()
         .get(dbKey);
-    if (unlockResource != null) {
+    if (nonEmptyResource(unlockResource)) {
       builder.addDelegatedResource(unlockResource.getInstance());
     }
     dbKey = DelegatedResourceCapsule
         .createDbKeyV2(fromAddress.toByteArray(), toAddress.toByteArray(), true);
     DelegatedResourceCapsule lockResource = chainBaseManager.getDelegatedResourceStore()
         .get(dbKey);
-    if (lockResource != null) {
+    if (nonEmptyResource(lockResource)) {
       builder.addDelegatedResource(lockResource.getInstance());
     }
     return builder.build();
   }
 
+  private boolean nonEmptyResource(DelegatedResourceCapsule resource) {
+    return Objects.nonNull(resource) && !(resource.getExpireTimeForBandwidth() == 0
+        && resource.getExpireTimeForEnergy() == 0
+        && resource.getFrozenBalanceForBandwidth() == 0
+        && resource.getFrozenBalanceForEnergy() == 0);
+  }
+
   public GrpcAPI.CanWithdrawUnfreezeAmountResponseMessage getCanWithdrawUnfreezeAmount(
           ByteString ownerAddress, long timestamp) {
     GrpcAPI.CanWithdrawUnfreezeAmountResponseMessage.Builder builder =

framework/src/test/java/org/tron/core/WalletTest.java

@@ -728,7 +728,7 @@ private Any getLockedDelegateContractForBandwidth(String ownerAddress, String re
         .setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(ownerAddress)))
         .setReceiverAddress(ByteString.copyFrom(ByteArray.fromHexString(receiveAddress)))
         .setBalance(unfreezeBalance)
-        .setResource(Common.ResourceCode.BANDWIDTH)
+        .setResource(BANDWIDTH)
         .setLock(lock)
         .build());
   }
@@ -753,6 +753,11 @@ public void testGetDelegatedResourceV2() {
           ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
           ByteString.copyFrom(ByteArray.fromHexString(RECEIVER_ADDRESS)));
 
+      Protocol.Account account = Protocol.Account.newBuilder()
+          .setAddress(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS))).build();
+      wallet.getAccount(account);
+      wallet.getProposalList();
+      wallet.getWitnessList();
       Assert.assertEquals(1L, delegatedResourceList.getDelegatedResourceCount());
       Assert.assertEquals(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
           delegatedResourceList.getDelegatedResource(0).getFrom());
@@ -809,7 +814,7 @@ public void testGetCanDelegatedMaxSizeBandWidth() {
 
     GrpcAPI.CanDelegatedMaxSizeResponseMessage message = wallet.getCanDelegatedMaxSize(
         ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)),
-        Common.ResourceCode.BANDWIDTH.getNumber());
+        BANDWIDTH.getNumber());
     Assert.assertEquals(initBalance - 280L, message.getMaxSize());
 
   }
@@ -832,7 +837,7 @@ private Any getContractForBandwidthV2(String ownerAddress, long unfreezeBalance)
                 ByteString.copyFrom(ByteArray.fromHexString(ownerAddress))
             )
             .setUnfreezeBalance(unfreezeBalance)
-            .setResource(Common.ResourceCode.BANDWIDTH)
+            .setResource(BANDWIDTH)
             .build()
     );
   }