fix conflict

sean-liu55 · sean-liu55 · commit 0ebeb6f9595f · 2018-04-08T11:25:30.000+08:00
diff --git a/src/main/java/org/tron/core/db/Manager.java b/src/main/java/org/tron/core/db/Manager.java
@@ -28,6 +28,7 @@
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.DialogOptional;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.common.utils.StringUtil;
 import org.tron.common.utils.Time;
 import org.tron.core.actuator.Actuator;
 import org.tron.core.actuator.ActuatorFactory;
@@ -507,11 +508,12 @@ public void pushBlock(final BlockCapsule block)
   public void updateDynamicProperties(BlockCapsule block) {
     long slot = 1;
     if (block.getNum() != 1){
-      slot = getSlotAtTime(block.getTimeStamp());
+      slot = witnessController.getSlotAtTime(block.getTimeStamp());
     }
     for (int i = 1; i < slot; ++i){
-      if (!getScheduledWitness(i).equals(block.getWitnessAddress())){
-        WitnessCapsule w = this.witnessStore.get(createDbKey(getScheduledWitness(i)));
+      if (!witnessController.getScheduledWitness(i).equals(block.getWitnessAddress())) {
+        WitnessCapsule w = this.witnessStore
+            .get(StringUtil.createDbKey(witnessController.getScheduledWitness(i)));
         w.setTotalMissed(w.getTotalMissed()+1);
         this.witnessStore.put(w.createDbKey(), w);
         logger.info("{} miss a block. totalMissed = {}",
@@ -828,7 +830,7 @@ public void updateSignedWitness(BlockCapsule block) {
         .get(block.getInstance().getBlockHeader().getRawData().getWitnessAddress().toByteArray());
     witnessCapsule.setTotalProduced(witnessCapsule.getTotalProduced()+1);
     witnessCapsule.setLatestBlockNum(block.getNum());
-    witnessCapsule.setLatestSlotNum(getAbSlotAtTime(block.getTimeStamp()));
+    witnessCapsule.setLatestSlotNum(witnessController.getAbSlotAtTime(block.getTimeStamp()));
 
     this.getWitnessStore().put(witnessCapsule.getAddress().toByteArray(),witnessCapsule);
 
diff --git a/src/main/java/org/tron/core/services/WitnessService.java b/src/main/java/org/tron/core/services/WitnessService.java
@@ -38,7 +38,7 @@ public class WitnessService implements Service {
   private Map<ByteString, byte[]> privateKeyMap = Maps.newHashMap();
   private boolean needSyncCheck = Args.getInstance().isNeedSyncCheck();
 
-  WitnessController controller;
+  private WitnessController controller;
 
   /**
    * Construction method.
diff --git a/src/test/java/org/tron/witness/WitnessControllerTest.java b/src/test/java/org/tron/witness/WitnessControllerTest.java
@@ -5,7 +5,7 @@
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import java.nio.charset.Charset;
-import java.util.List;
+import java.util.Arrays;
 import org.junit.Test;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.WitnessCapsule;
@@ -43,16 +43,14 @@ public boolean lastHeadBlockIsMaintenance() {
     assertEquals(1, controller.getSlotAtTime(1522847891000L));
     assertEquals(3, controller.getHeadSlot());
 
-    List<WitnessCapsule> list = Lists.newArrayList();
     ByteString a = ByteString.copyFrom("1", Charset.defaultCharset());
     ByteString b = ByteString.copyFrom("2", Charset.defaultCharset());
-//    ByteString b = ByteString.copyFrom(new byte[1]);
-
     WitnessCapsule witnessCapsule1 = new WitnessCapsule(a);
     WitnessCapsule witnessCapsule2 = new WitnessCapsule(b);
-    list.add(witnessCapsule1);
-    list.add(witnessCapsule2);
-    controller.setShuffledWitnessStates(list);
+
+    controller.setShuffledWitnessStates(Lists.newArrayList(Arrays.asList(
+        witnessCapsule1, witnessCapsule2
+    )));
 
     assertEquals(a, controller.getScheduledWitness(1));
 
