refactor code and remove unused file

Pandulis · Jul 28, 2020 · 43c2da6 · 43c2da6
1 parent 3b259d0
commit 43c2da6
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 111 deletions.
diff --git a/actuator/src/main/java/org/tron/core/actuator/ClearABIContractActuator.java b/actuator/src/main/java/org/tron/core/actuator/ClearABIContractActuator.java
@@ -106,7 +106,8 @@ public boolean validate() throws ContractValidateException {
 
     if (!Arrays.equals(ownerAddress, deployedContractOwnerAddress)) {
       throw new ContractValidateException(
-          "Account[" + readableOwnerAddress + "] is not the owner of the contract");
+          ActuatorConstant.ACCOUNT_EXCEPTION_STR
+              + readableOwnerAddress + "] is not the owner of the contract");
     }
 
     return true;

diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java
@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
 import com.google.protobuf.ByteString;
@@ -175,12 +176,12 @@ public boolean validate() throws ContractValidateException {
     long secondTokenBalance = contract.getSecondTokenBalance();
 
     if (dynamicStore.getAllowSameTokenName() == 1) {
-      if (!Arrays.equals(firstTokenID, TRX_SYMBOL_BYTES) && !TransactionUtil
-          .isNumber(firstTokenID)) {
+      if (!Arrays.equals(firstTokenID, TRX_SYMBOL_BYTES)
+          && !isNumber(firstTokenID)) {
         throw new ContractValidateException("first token id is not a valid number");
       }
-      if (!Arrays.equals(secondTokenID, TRX_SYMBOL_BYTES) && !TransactionUtil
-          .isNumber(secondTokenID)) {
+      if (!Arrays.equals(secondTokenID, TRX_SYMBOL_BYTES)
+          && !isNumber(secondTokenID)) {
         throw new ContractValidateException("second token id is not a valid number");
       }
     }

diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeInjectActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeInjectActuator.java
@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
 import com.google.protobuf.ByteString;
@@ -180,7 +181,7 @@ public boolean validate() throws ContractValidateException {
 
     if (dynamicStore.getAllowSameTokenName() == 1 &&
         !Arrays.equals(tokenID, TRX_SYMBOL_BYTES) &&
-        !TransactionUtil.isNumber(tokenID)) {
+        !isNumber(tokenID)) {
       throw new ContractValidateException("token id is not a valid number");
     }
 

diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeTransactionActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeTransactionActuator.java
@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
 import com.google.protobuf.ByteString;
@@ -165,7 +166,7 @@ public boolean validate() throws ContractValidateException {
 
     if (dynamicStore.getAllowSameTokenName() == 1 &&
         !Arrays.equals(tokenID, TRX_SYMBOL_BYTES) &&
-        !TransactionUtil.isNumber(tokenID)) {
+        !isNumber(tokenID)) {
       throw new ContractValidateException("token id is not a valid number");
     }
     if (!Arrays.equals(tokenID, firstTokenID) && !Arrays.equals(tokenID, secondTokenID)) {

diff --git a/actuator/src/main/java/org/tron/core/actuator/ExchangeWithdrawActuator.java b/actuator/src/main/java/org/tron/core/actuator/ExchangeWithdrawActuator.java
@@ -1,5 +1,6 @@
 package org.tron.core.actuator;
 
+import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
 import static org.tron.core.config.Parameter.ChainSymbol.TRX_SYMBOL_BYTES;
 
 import com.google.protobuf.ByteString;
@@ -188,7 +189,7 @@ public boolean validate() throws ContractValidateException {
 
     if (dynamicStore.getAllowSameTokenName() == 1 &&
         !Arrays.equals(tokenID, TRX_SYMBOL_BYTES) &&
-        !TransactionUtil.isNumber(tokenID)) {
+        !isNumber(tokenID)) {
       throw new ContractValidateException("token id is not a valid number");
     }
 

diff --git a/actuator/src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java b/actuator/src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java
@@ -206,7 +206,8 @@ public boolean validate() throws ContractValidateException {
       if (receiverCapsule == null) {
         String readableOwnerAddress = StringUtil.createReadableString(receiverAddress);
         throw new ContractValidateException(
-            "Account[" + readableOwnerAddress + "] not exists");
+            ActuatorConstant.ACCOUNT_EXCEPTION_STR
+                + readableOwnerAddress + "] not exists");
       }
 
       if (dynamicStore.getAllowTvmConstantinople() == 1

diff --git a/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java b/actuator/src/main/java/org/tron/core/actuator/MarketSellAssetActuator.java
@@ -15,6 +15,8 @@
 
 package org.tron.core.actuator;
 
+import static org.tron.core.capsule.utils.TransactionUtil.isNumber;
+
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Arrays;
@@ -203,11 +205,10 @@ public boolean validate() throws ContractValidateException {
       throw new ContractValidateException("Account does not exist!");
     }
 
-    if (!Arrays.equals(sellTokenID, "_".getBytes()) && !TransactionUtil.isNumber(sellTokenID)) {
+    if (!Arrays.equals(sellTokenID, "_".getBytes()) && !isNumber(sellTokenID)) {
       throw new ContractValidateException("sellTokenId is not a valid number");
     }
-    if (!Arrays.equals(buyTokenID, "_".getBytes()) && !TransactionUtil
-        .isNumber(buyTokenID)) {
+    if (!Arrays.equals(buyTokenID, "_".getBytes()) && !isNumber(buyTokenID)) {
       throw new ContractValidateException("buyTokenId is not a valid number");
     }
 

diff --git a/actuator/src/main/java/org/tron/core/actuator/UpdateEnergyLimitContractActuator.java b/actuator/src/main/java/org/tron/core/actuator/UpdateEnergyLimitContractActuator.java
@@ -111,7 +111,8 @@ public boolean validate() throws ContractValidateException {
 
     if (!Arrays.equals(ownerAddress, deployedContractOwnerAddress)) {
       throw new ContractValidateException(
-          "Account[" + readableOwnerAddress + "] is not the owner of the contract");
+          ActuatorConstant.ACCOUNT_EXCEPTION_STR
+              + readableOwnerAddress + "] is not the owner of the contract");
     }
 
     return true;

diff --git a/actuator/src/main/java/org/tron/core/utils/TransactionUtil.java b/actuator/src/main/java/org/tron/core/utils/TransactionUtil.java
@@ -112,19 +112,6 @@ private static boolean validReadableBytes(byte[] bytes, int maxLength) {
     return true;
   }
 
-  public static boolean isNumber(byte[] id) {
-    if (ArrayUtils.isEmpty(id)) {
-      return false;
-    }
-    for (byte b : id) {
-      if (b < '0' || b > '9') {
-        return false;
-      }
-    }
-
-    return !(id.length > 1 && id[0] == '0');
-  }
-
   public static Sha256Hash getTransactionId(Transaction transaction) {
     return Sha256Hash.of(CommonParameter.getInstance().isECKeyCryptoEngine(),
         transaction.getRawData().toByteArray());

diff --git a/chainbase/src/main/java/org/tron/common/utils/LocalWitnesses.java b/chainbase/src/main/java/org/tron/common/utils/LocalWitnesses.java
@@ -107,14 +107,4 @@ public String getPrivateKey() {
     return privateKeys.get(0);
   }
 
-  public byte[] getPublicKey() {
-    if (CollectionUtils.isEmpty(privateKeys)) {
-      logger.warn("privateKey is null");
-      return null;
-    }
-    byte[] privateKey = ByteArray.fromHexString(getPrivateKey());
-    final ECKey ecKey = ECKey.fromPrivate(privateKey);
-    return ecKey.getAddress();
-  }
-
 }
diff --git a/chainbase/src/main/java/org/tron/core/ChainBaseManager.java b/chainbase/src/main/java/org/tron/core/ChainBaseManager.java
@@ -53,6 +53,7 @@
 import org.tron.core.store.StorageRowStore;
 import org.tron.core.store.TransactionHistoryStore;
 import org.tron.core.store.TransactionRetStore;
+import org.tron.core.store.TreeBlockIndexStore;
 import org.tron.core.store.VotesStore;
 import org.tron.core.store.WitnessScheduleStore;
 import org.tron.core.store.WitnessStore;
@@ -191,6 +192,11 @@ public class ChainBaseManager {
   @Getter
   private ForkController forkController = ForkController.instance();
 
+  @Autowired
+  @Getter
+  @Setter
+  private TreeBlockIndexStore merkleTreeIndexStore;
+
   public void closeOneStore(ITronChainBase database) {
     logger.info("******** begin to close " + database.getName() + " ********");
     try {

diff --git a/crypto/src/main/java/org/tron/common/crypto/SignUtils.java b/crypto/src/main/java/org/tron/common/crypto/SignUtils.java
@@ -8,13 +8,6 @@
 
 public class SignUtils {
 
-  public static SignInterface getGeneratedRandomSign(boolean isECKeyCryptoEngine) {
-    if (isECKeyCryptoEngine) {
-      return new ECKey();
-    }
-    return new SM2();
-  }
-
   public static SignInterface getGeneratedRandomSign(
       SecureRandom secureRandom, boolean isECKeyCryptoEngine) {
     if (isECKeyCryptoEngine) {

diff --git a/framework/src/main/java/org/tron/core/Wallet.java b/framework/src/main/java/org/tron/core/Wallet.java
@@ -1372,7 +1372,7 @@ private IncrementalMerkleVoucherContainer createWitness(OutputPoint outPoint, Lo
     ByteString txId = outPoint.getHash();
 
     //Get the tree in blockNum-1 position
-    byte[] treeRoot = dbManager.getMerkleTreeIndexStore().get(blockNumber - 1);
+    byte[] treeRoot = chainBaseManager.getMerkleTreeIndexStore().get(blockNumber - 1);
     if (treeRoot == null) {
       throw new RuntimeException("treeRoot is null, blockNumber:" + (blockNumber - 1));
     }
@@ -1623,9 +1623,9 @@ public IncrementalMerkleTree getMerkleTreeOfBlock(long blockNum) throws ZksnarkE
     }
 
     try {
-      if (dbManager.getMerkleTreeIndexStore().has(ByteArray.fromLong(blockNum))) {
+      if (chainBaseManager.getMerkleTreeIndexStore().has(ByteArray.fromLong(blockNum))) {
         return IncrementalMerkleTree
-            .parseFrom(dbManager.getMerkleTreeIndexStore().get(blockNum));
+            .parseFrom(chainBaseManager.getMerkleTreeIndexStore().get(blockNum));
       }
     } catch (Exception ex) {
       logger.error(ex.getMessage());

diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -178,10 +178,6 @@ public class Manager {
   @Getter
   @Setter
   private MerkleContainer merkleContainer;
-  @Autowired
-  @Getter
-  @Setter
-  private TreeBlockIndexStore merkleTreeIndexStore;
   private ExecutorService validateSignService;
   private boolean isRunRePushThread = true;
   private boolean isRunTriggerCapsuleProcessThread = true;
@@ -350,7 +346,7 @@ public void init() {
     this.setProposalController(ProposalController.createInstance(this));
     this.setMerkleContainer(
         merkleContainer.createInstance(chainBaseManager.getMerkleTreeStore(),
-            this.merkleTreeIndexStore));
+            chainBaseManager.getMerkleTreeIndexStore()));
     this.pendingTransactions = Collections.synchronizedList(Lists.newArrayList());
     this.rePushTransactions = new LinkedBlockingQueue<>();
     this.triggerCapsuleQueue = new LinkedBlockingQueue<>();
@@ -1574,8 +1570,7 @@ private void postBlockTrigger(final BlockCapsule newBlock) {
       BlockLogTriggerCapsule blockLogTriggerCapsule = new BlockLogTriggerCapsule(newBlock);
       blockLogTriggerCapsule.setLatestSolidifiedBlockNumber(getDynamicPropertiesStore()
           .getLatestSolidifiedBlockNum());
-      boolean result = triggerCapsuleQueue.offer(blockLogTriggerCapsule);
-      if (!result) {
+      if (!triggerCapsuleQueue.offer(blockLogTriggerCapsule)) {
         logger.info("too many triggers, block trigger lost: {}", newBlock.getBlockId());
       }
     }
@@ -1591,8 +1586,7 @@ private void postTransactionTrigger(final TransactionCapsule trxCap,
       TransactionLogTriggerCapsule trx = new TransactionLogTriggerCapsule(trxCap, blockCap);
       trx.setLatestSolidifiedBlockNumber(getDynamicPropertiesStore()
           .getLatestSolidifiedBlockNum());
-      boolean result = triggerCapsuleQueue.offer(trx);
-      if (!result) {
+      if (!triggerCapsuleQueue.offer(trx)) {
         logger.info("too many triggers, transaction trigger lost: {}", trxCap.getTransactionId());
       }
     }

diff --git a/framework/src/main/java/org/tron/core/db/common/WrappedResultSet.java b/framework/src/main/java/org/tron/core/db/common/WrappedResultSet.java