Merge pull request tronprotocol#3110 from gossens/refactor_validbytes_methon

refactor validBytes method

Author: xxo1shine

actuator/src/main/java/org/tron/core/utils/TransactionUtil.java

@@ -23,7 +23,6 @@
 import com.google.protobuf.ByteString;
 import java.security.SignatureException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
@@ -35,7 +34,6 @@
 import org.tron.api.GrpcAPI.TransactionSignWeight;
 import org.tron.api.GrpcAPI.TransactionSignWeight.Result;
 import org.tron.common.parameter.CommonParameter;
-import org.tron.common.crypto.Hash;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.AccountCapsule;
@@ -49,15 +47,18 @@
 import org.tron.protos.Protocol.Transaction.Result.contractResult;
 import org.tron.protos.Protocol.TransactionSign;
 import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
-import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
-import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
-import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI.Entry.StateMutabilityType;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 
 @Slf4j(topic = "capsule")
 @Component
 public class TransactionUtil {
 
+  private static final int maxAccountNameLen = 200;
+  private static final int maxAccountIdLen = 32;
+  private static final int minAccountIdLen = 8;
+  private static final int maxAssetNameLen = 32;
+  private static final int maxTokenAbbrNameLen = 5;
+
   @Autowired
   private ChainBaseManager chainBaseManager;
 
@@ -66,51 +67,25 @@ public static boolean validAccountName(byte[] accountName) {
       return true;   //account name can be empty
     }
 
-    return accountName.length <= 200;
+    return accountName.length <= maxAccountNameLen;
   }
 
   public static boolean validAccountId(byte[] accountId) {
-    if (ArrayUtils.isEmpty(accountId)) {
-      return false;
-    }
-
-    if (accountId.length < 8) {
-      return false;
-    }
-
-    if (accountId.length > 32) {
-      return false;
-    }
-
-    return validBytes(accountId);
-    
+    return validReadableBytes(accountId, maxAccountIdLen) && accountId.length >= minAccountIdLen;
   }
 
   public static boolean validAssetName(byte[] assetName) {
-    if (ArrayUtils.isEmpty(assetName)) {
-      return false;
-    }
-    if (assetName.length > 32) {
-      return false;
-    }
-
-    return validBytes(assetName);
-
+    return validReadableBytes(assetName, maxAssetNameLen);
   }
 
   public static boolean validTokenAbbrName(byte[] abbrName) {
-    if (ArrayUtils.isEmpty(abbrName)) {
-      return false;
-    }
-    if (abbrName.length > 5) {
-      return false;
-    }
-
-    return validBytes(abbrName);
-
+    return validReadableBytes(abbrName, maxTokenAbbrNameLen);
   }
 
-  private static boolean validBytes(byte[] bytes) {
+  private static boolean validReadableBytes(byte[] bytes, int maxLength) {
+    if (ArrayUtils.isEmpty(bytes) || bytes.length > maxLength) {
+      return false;
+    }
     // b must be readable
     for (byte b : bytes) {
       if (b < 0x21) {
@@ -123,7 +98,6 @@ private static boolean validBytes(byte[] bytes) {
     return true;
   }
 
-
   public static boolean validAssetDescription(byte[] description) {
     if (ArrayUtils.isEmpty(description)) {
       return true;   //description can empty