fix review

Author: Sunny Jiao

common/src/main/java/org/tron/core/exception/MaintenanceClearingException.java

@@ -0,0 +1,20 @@
+package org.tron.core.exception;
+
+/**
+ * Maintenance clearing exception - thrown when system is in maintenance clearing state
+ * Please try again later
+ */
+public class MaintenanceUnavailableException extends TronException {
+
+  public MaintenanceUnavailableException() {
+    super();
+  }
+
+  public MaintenanceUnavailableException(String message) {
+    super(message);
+  }
+
+  public MaintenanceUnavailableException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}

common/src/main/java/org/tron/core/exception/MaintenanceUnavailableException.java

@@ -182,7 +182,7 @@
 import org.tron.core.exception.HeaderNotFound;
 import org.tron.core.exception.ItemNotFoundException;
 import org.tron.core.exception.JsonRpcInvalidParamsException;
-import org.tron.core.exception.MaintenanceClearingException;
+import org.tron.core.exception.MaintenanceUnavailableException;
 import org.tron.core.exception.NonUniqueObjectException;
 import org.tron.core.exception.PermissionException;
 import org.tron.core.exception.SignatureFormatException;
@@ -771,7 +771,8 @@ public WitnessList getWitnessList() {
     return builder.build();
   }
 
-  public WitnessList getPaginatedNowWitnessList(long offset, long limit) throws MaintenanceClearingException {
+  public WitnessList getPaginatedNowWitnessList(long offset, long limit) throws
+      MaintenanceUnavailableException {
     if (limit <= 0 || offset < 0) {
       return null;
     }
@@ -784,9 +785,8 @@ public WitnessList getPaginatedNowWitnessList(long offset, long limit) throws Ma
       To avoid the race condition of VoteStores deleted but Witness vote counts not updated, return retry error.
     */
     if (chainBaseManager.getDynamicPropertiesStore().getStateFlag() == 1) {
-      long maintenanceLogicTime = chainBaseManager.getDynamicPropertiesStore().getMaintenanceSkipSlots() * BLOCK_PRODUCED_INTERVAL / 1000;
-      String message = "Maintenance clearing, please try again later after " + maintenanceLogicTime + " seconds.";
-      throw new MaintenanceClearingException(message);
+      String message = "Service temporarily unavailable during maintenance period. Please try again later.";
+      throw new MaintenanceUnavailableException(message);
     }
     // It contains the final vote count at the end of the last epoch.
     List<WitnessCapsule> witnessCapsuleList = chainBaseManager.getWitnessStore().getAllWitnesses();

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

@@ -89,7 +89,7 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.ItemNotFoundException;
-import org.tron.core.exception.MaintenanceClearingException;
+import org.tron.core.exception.MaintenanceUnavailableException;
 import org.tron.core.exception.NonUniqueObjectException;
 import org.tron.core.exception.StoreException;
 import org.tron.core.exception.VMIllegalException;
@@ -403,7 +403,7 @@ public void getPaginatedNowWitnessList(PaginatedMessage request,
       try {
         responseObserver.onNext(
             wallet.getPaginatedNowWitnessList(request.getOffset(), request.getLimit()));
-      } catch (MaintenanceClearingException e) {
+      } catch (MaintenanceUnavailableException e) {
         responseObserver.onError(getRunTimeException(e));
       }
       responseObserver.onCompleted();
@@ -1891,7 +1891,7 @@ public void getPaginatedNowWitnessList(PaginatedMessage request,
       try {
         responseObserver.onNext(
             wallet.getPaginatedNowWitnessList(request.getOffset(), request.getLimit()));
-      } catch (MaintenanceClearingException e) {
+      } catch (MaintenanceUnavailableException e) {
         responseObserver.onError(getRunTimeException(e));
       }
       responseObserver.onCompleted();

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -8,7 +8,7 @@
 import org.springframework.stereotype.Component;
 import org.tron.api.GrpcAPI;
 import org.tron.core.Wallet;
-import org.tron.core.exception.MaintenanceClearingException;
+import org.tron.core.exception.MaintenanceUnavailableException;
 
 // Get the paged list of witnesses info with realtime vote counts
 @Component
@@ -41,7 +41,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
   }
 
   private void fillResponse(long offset, long limit, boolean visible, HttpServletResponse response)
-      throws IOException, MaintenanceClearingException {
+      throws IOException, MaintenanceUnavailableException {
     GrpcAPI.WitnessList reply = wallet.getPaginatedNowWitnessList(offset, limit);
     if (reply != null) {
       response.getWriter().println(JsonFormat.printToString(reply, visible));

framework/src/main/java/org/tron/core/services/http/GetPaginatedNowWitnessListServlet.java

@@ -32,7 +32,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import javax.annotation.Resource;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -74,7 +73,7 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
-import org.tron.core.exception.MaintenanceClearingException;
+import org.tron.core.exception.MaintenanceUnavailableException;
 import org.tron.core.exception.NonUniqueObjectException;
 import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.core.utils.ProposalUtil.ProposalType;
@@ -866,7 +865,7 @@ public void testGetPaginatedNowWitnessList_Error() {
       Assert.fail("Should throw error when in maintenance period");
     } catch (Exception e) {
       Assert.assertTrue("Should throw MaintenanceClearingException",
-          e instanceof MaintenanceClearingException);
+          e instanceof MaintenanceUnavailableException);
     }
     dbManager.getChainBaseManager().getDynamicPropertiesStore().saveStateFlag(0);
   }
@@ -902,7 +901,7 @@ public void testGetPaginatedNowWitnessList_CornerCase() {
         chainBaseManager.getWitnessStore()
             .delete(ByteString.copyFromUtf8(fakeWitnessAddressPrefix + i).toByteArray());
       }
-    } catch (MaintenanceClearingException e) {
+    } catch (MaintenanceUnavailableException e) {
        Assert.fail(e.getMessage());
     }
   }
@@ -941,7 +940,7 @@ public void testGetPaginatedNowWitnessList() {
       // To avoid throw MaintenanceClearingException
       dbManager.getChainBaseManager().getDynamicPropertiesStore().saveStateFlag(0);
       witnessList2 = wallet.getPaginatedNowWitnessList(0, 10);
-    } catch (MaintenanceClearingException e) {
+    } catch (MaintenanceUnavailableException e) {
       Assert.fail(e.getMessage());
     }
     // Check the returned witness list should contain 10 witnesses with descending vote count