feat: finish Transtaction Vote Actuator.

CodeNinjaEvan · CodeNinjaEvan · commit fbe2b31e4b87 · 2018-02-28T16:03:29.000+08:00
diff --git a/src/main/java/org/tron/core/db/actuator/AbstractTransactionActuator.java b/src/main/java/org/tron/core/db/actuator/AbstractTransactionActuator.java
@@ -1,14 +1,15 @@
 package org.tron.core.db.actuator;
 
 import org.tron.core.capsule.TransactionCapsule;
-import org.tron.core.db.TronDatabase;
+import org.tron.core.db.Manager;
 
 public abstract class AbstractTransactionActuator implements Actuator {
 
   protected TransactionCapsule transactionCapsule;
-  protected TronDatabase tronDatabase;
+  protected Manager dbManager;
 
-  AbstractTransactionActuator(TransactionCapsule transactionCapsule, TronDatabase tronDatabase) {
+  AbstractTransactionActuator(TransactionCapsule transactionCapsule, Manager dbManager) {
     this.transactionCapsule = transactionCapsule;
+    this.dbManager = dbManager;
   }
 }
diff --git a/src/main/java/org/tron/core/db/actuator/ActuatorFactory.java b/src/main/java/org/tron/core/db/actuator/ActuatorFactory.java
@@ -1,10 +1,13 @@
 package org.tron.core.db.actuator;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.core.db.Manager;
 
 public class ActuatorFactory {
 
+  private static final Logger logger = LoggerFactory.getLogger("ActuatorFactory");
   public static final ActuatorFactory INSTANCE = new ActuatorFactory();
 
   private ActuatorFactory() {
@@ -17,13 +20,18 @@ public static ActuatorFactory getInstance() {
   public static Actuator createActuator(TransactionCapsule transactionCapsule,
       Manager manager) {
     if (null == transactionCapsule || null == transactionCapsule.getTransaction()) {
+      logger.info("transactionCapsule or Transaction is null");
+      return null;
+    }
+    if (null == manager) {
+      logger.info("manager is null");
       return null;
     }
     switch (transactionCapsule.getTransaction().getType()) {
       case Transfer:
         break;
       case VoteWitess:
-        return new TransactionVoteActuator(transactionCapsule, manager.getWitnessStore());
+        return new TransactionVoteActuator(transactionCapsule, manager);
       case CreateAccount:
         break;
       case DeployContract:
diff --git a/src/main/java/org/tron/core/db/actuator/TransactionCreateAccountActuator.java b/src/main/java/org/tron/core/db/actuator/TransactionCreateAccountActuator.java
@@ -1,14 +1,14 @@
 package org.tron.core.db.actuator;
 
 import org.tron.core.capsule.TransactionCapsule;
-import org.tron.core.db.TronDatabase;
+import org.tron.core.db.Manager;
 
 public class TransactionCreateAccountActuator extends AbstractTransactionActuator {
 
 
   TransactionCreateAccountActuator(TransactionCapsule transactionCapsule,
-      TronDatabase tronDatabase) {
-    super(transactionCapsule, tronDatabase);
+      Manager dbManager) {
+    super(transactionCapsule, dbManager);
   }
 
   @Override
diff --git a/src/main/java/org/tron/core/db/actuator/TransactionTransferActuator.java b/src/main/java/org/tron/core/db/actuator/TransactionTransferActuator.java
@@ -1,14 +1,14 @@
 package org.tron.core.db.actuator;
 
 import org.tron.core.capsule.TransactionCapsule;
-import org.tron.core.db.TronDatabase;
+import org.tron.core.db.Manager;
 
 public class TransactionTransferActuator extends AbstractTransactionActuator {
 
 
   TransactionTransferActuator(TransactionCapsule transactionCapsule,
-      TronDatabase tronDatabase) {
-    super(transactionCapsule, tronDatabase);
+      Manager dbManager) {
+    super(transactionCapsule, dbManager);
   }
 
   @Override
diff --git a/src/main/java/org/tron/core/db/actuator/TransactionVoteActuator.java b/src/main/java/org/tron/core/db/actuator/TransactionVoteActuator.java
@@ -5,8 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tron.core.capsule.TransactionCapsule;
-import org.tron.core.db.TronDatabase;
-import org.tron.core.db.WitnessStore;
+import org.tron.core.db.Manager;
 import org.tron.protos.Contract.VoteWitnessContract;
 import org.tron.protos.Protocal.Transaction;
 
@@ -15,8 +14,8 @@ public class TransactionVoteActuator extends AbstractTransactionActuator {
   private static final Logger logger = LoggerFactory.getLogger("TransactionVoteActuator");
 
   TransactionVoteActuator(TransactionCapsule transactionCapsule,
-      TronDatabase tronDatabase) {
-    super(transactionCapsule, tronDatabase);
+      Manager dbManager) {
+    super(transactionCapsule, dbManager);
   }
 
 
@@ -40,8 +39,8 @@ private boolean voteWitnessCount(Transaction trx) {
         int voteAdd = voteContract.getCount();
         if (voteAdd > 0) {
           voteContract.getVoteAddressList().forEach(voteAddress -> {
-            if (tronDatabase instanceof WitnessStore) {
-              ((WitnessStore) tronDatabase).countvoteWitness(voteAddress, voteAdd);
+            if (null != dbManager) {
+              dbManager.getWitnessStore().countvoteWitness(voteAddress, voteAdd);
             }
           });
         }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -78,6 +78,7 @@
   <logger name="TransactionUtil" level="INFO"/>
   <logger name="TransactionVoteActuator" level="INFO"/>
   <logger name="WitnessStore" level="INFO"/>
+  <logger name="ActuatorFactory" level="INFO"/>
 
 </configuration>
 
