code optimization

Author: niuniublockchain

actuator/src/main/java/org/tron/core/actuator/AccountPermissionUpdateActuator.java

@@ -33,8 +33,8 @@ public AccountPermissionUpdateActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule result = (TransactionResultCapsule)object;
-    if (Objects.isNull(result)){
+    TransactionResultCapsule result = (TransactionResultCapsule) object;
+    if (Objects.isNull(result)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/AssetIssueActuator.java

@@ -49,8 +49,8 @@ public AssetIssueActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ClearABIContractActuator.java

@@ -28,8 +28,8 @@ public ClearABIContractActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/CreateAccountActuator.java

@@ -27,8 +27,8 @@ public CreateAccountActuator() {
   @Override
   public boolean execute(Object result)
       throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ExchangeCreateActuator.java

@@ -32,8 +32,8 @@ public ExchangeCreateActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ExchangeInjectActuator.java

@@ -34,8 +34,8 @@ public ExchangeInjectActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ExchangeTransactionActuator.java

@@ -33,8 +33,8 @@ public ExchangeTransactionActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ExchangeWithdrawActuator.java

@@ -35,8 +35,8 @@ public ExchangeWithdrawActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/FreezeBalanceActuator.java

@@ -34,8 +34,8 @@ public FreezeBalanceActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ParticipateAssetIssueActuator.java

@@ -45,8 +45,8 @@ public ParticipateAssetIssueActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ProposalApproveActuator.java

@@ -35,8 +35,8 @@ public ProposalApproveActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

@@ -30,8 +30,8 @@ public ProposalCreateActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ProposalDeleteActuator.java

@@ -33,8 +33,8 @@ public ProposalDeleteActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/SetAccountIdActuator.java

@@ -25,8 +25,8 @@ public SetAccountIdActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/ShieldedTransferActuator.java

@@ -56,8 +56,8 @@ public ShieldedTransferActuator() {
   @Override
   public boolean execute(Object result)
       throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/TransferActuator.java

@@ -29,8 +29,8 @@ public TransferActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/TransferAssetActuator.java

@@ -46,8 +46,8 @@ public TransferAssetActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UnfreezeAssetActuator.java

@@ -30,8 +30,8 @@ public UnfreezeAssetActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UnfreezeBalanceActuator.java

@@ -41,8 +41,8 @@ public UnfreezeBalanceActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UpdateAccountActuator.java

@@ -24,8 +24,8 @@ public UpdateAccountActuator() {
   @Override
   public boolean execute(Object result) throws ContractExeException {
 
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UpdateAssetActuator.java

@@ -29,8 +29,8 @@ public UpdateAssetActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UpdateBrokerageActuator.java

@@ -28,8 +28,8 @@ public UpdateBrokerageActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UpdateEnergyLimitContractActuator.java

@@ -28,8 +28,8 @@ public UpdateEnergyLimitContractActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/UpdateSettingContractActuator.java

@@ -27,8 +27,8 @@ public UpdateSettingContractActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/VMActuator.java

@@ -105,7 +105,7 @@ private static long getEnergyFee(long callerEnergyUsage, long callerEnergyFrozen
   public void validate(Object object) throws ContractValidateException {
 
     TransactionContext context = (TransactionContext) object;
-    if (Objects.isNull(context)){
+    if (Objects.isNull(context)) {
       throw new RuntimeException("TransactionContext is null");
     }
 
@@ -148,7 +148,7 @@ public void validate(Object object) throws ContractValidateException {
   @Override
   public void execute(Object object) throws ContractExeException {
     TransactionContext context = (TransactionContext) object;
-    if (Objects.isNull(context)){
+    if (Objects.isNull(context)) {
       throw new RuntimeException("TransactionContext is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/VoteWitnessActuator.java

@@ -38,8 +38,8 @@ public VoteWitnessActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/WithdrawBalanceActuator.java

@@ -31,8 +31,8 @@ public WithdrawBalanceActuator() {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/WitnessCreateActuator.java

@@ -29,8 +29,8 @@ public WitnessCreateActuator() {
 
   @Override
   public boolean execute(Object object) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)object;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) object;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/actuator/WitnessUpdateActuator.java

@@ -33,8 +33,8 @@ private void updateWitness(final WitnessUpdateContract contract) {
 
   @Override
   public boolean execute(Object result) throws ContractExeException {
-    TransactionResultCapsule ret = (TransactionResultCapsule)result;
-    if (Objects.isNull(ret)){
+    TransactionResultCapsule ret = (TransactionResultCapsule) result;
+    if (Objects.isNull(ret)) {
       throw new RuntimeException("TransactionResultCapsule is null");
     }
 

actuator/src/main/java/org/tron/core/vm/program/Program.java

@@ -391,6 +391,10 @@ public int getPC() {
     return pc;
   }
 
+  public void setPC(DataWord pc) {
+    this.setPC(pc.intValue());
+  }
+
   public void setPC(int pc) {
     this.pc = pc;
 
@@ -399,10 +403,6 @@ public void setPC(int pc) {
     }
   }
 
-  public void setPC(DataWord pc) {
-    this.setPC(pc.intValue());
-  }
-
   public boolean isStopped() {
     return stopped;
   }

chainbase/src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java

@@ -457,6 +457,7 @@ public Stream<Entry<byte[], byte[]>> parallelStream() {
 
   @Override
   public LevelDbDataSourceImpl newInstance() {
-    return new LevelDbDataSourceImpl(DBConfig.getOutputDirectoryByDbName(dataBaseName), dataBaseName, options, writeOptions);
+    return new LevelDbDataSourceImpl(DBConfig.getOutputDirectoryByDbName(dataBaseName),
+        dataBaseName, options, writeOptions);
   }
 }

chainbase/src/main/java/org/tron/common/utils/DBConfig.java

@@ -3,7 +3,6 @@
 import java.io.File;
 import java.util.Map;
 import java.util.Set;
-
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;

chainbase/src/main/java/org/tron/core/actuator/TransactionFactory.java

@@ -4,7 +4,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.tron.common.utils.DBConfig;
 import org.tron.protos.Protocol.Transaction.Contract.ContractType;
 import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
@@ -23,7 +22,8 @@ public class TransactionFactory {
   public static void register(ContractType type, Class<? extends Actuator> actuatorClass,
       Class<? extends GeneratedMessageV3> clazz) {
     Set<String> actuatorSet = DBConfig.getActuatorSet();
-    if (actuatorClass != null && !actuatorSet.isEmpty() && !actuatorSet.contains(actuatorClass.getSimpleName())) {
+    if (actuatorClass != null && !actuatorSet.isEmpty() && !actuatorSet
+        .contains(actuatorClass.getSimpleName())) {
       return;
     }
 

chainbase/src/main/java/org/tron/core/db2/core/SnapshotManager.java

@@ -318,8 +318,8 @@ private void createCheckpoint() {
     }
 
     checkTmpStore.getDbSource().updateByBatch(batch.entrySet().stream()
-        .map(e -> Maps.immutableEntry(e.getKey().getBytes(), e.getValue().getBytes()))
-        .collect(HashMap::new, (m, k) -> m.put(k.getKey(), k.getValue()), HashMap::putAll),
+            .map(e -> Maps.immutableEntry(e.getKey().getBytes(), e.getValue().getBytes()))
+            .collect(HashMap::new, (m, k) -> m.put(k.getKey(), k.getValue()), HashMap::putAll),
         WriteOptionsWrapper.getInstance().sync(DBConfig.isDbSync()));
   }