fixed epoch

Author: GusevTimofey

src/main/scala/mvp2/actors/Blockchainer.scala

@@ -75,6 +75,7 @@ class Blockchainer(settings: Settings) extends PersistentActor with StrictLoggin
       blockchain += block
       blockCache -= block
       planner ! block
+      logger.info(s"Blockchainer sent new bloch to a planner with height ${block.height}")
       informator ! CurrentBlockchainInfo(
         blockchain.chain.lastOption.map(block => block.height).getOrElse(0),
         blockchain.chain.lastOption,

src/main/scala/mvp2/actors/Planner.scala

@@ -31,6 +31,7 @@ class Planner(settings: Settings) extends CommonActor {
   var scheduleForWriting: List[ByteString] = List()
   var hasWritten: Boolean = false
   var needToCheckTimeToPublish: Boolean = true
+  var isRemoved: Boolean = false
 
   override def specialBehavior: Receive = {
     case SyncingDone =>
@@ -61,6 +62,7 @@ class Planner(settings: Settings) extends CommonActor {
       nextPeriod = Period(keyBlock, settings)
       needToCheckTimeToPublish = true
       lastBlock = keyBlock
+      if (!isRemoved) epoch.dropNextPublisherPublicKey
       if (lastBlock.scheduler.nonEmpty) hasWritten = true
       logger.info(s"Last block was updated. Height of last block is: ${lastBlock.height}. Period was updated. " +
         s"New period is: $nextPeriod.")
@@ -86,13 +88,15 @@ class Planner(settings: Settings) extends CommonActor {
       logger.info(s"Current public keys: ${allPublicKeys.map(EncodingUtils.encode2Base16).mkString(",")}")
       scheduleForWriting = epoch.schedule
       checkMyTurn(scheduleForWriting)
+      isRemoved = true
     case Tick if nextPeriod.timeToPublish && needToCheckTimeToPublish =>
+      logger.info(s"nextPeriod.timeToPublish. Height of last block is: ${lastBlock.height}")
       checkMyTurn(scheduleForWriting)
       needToCheckTimeToPublish = false
+      isRemoved = true
       logger.info(s"Current epoch is: $epoch. Height of last block is: ${lastBlock.height}")
       logger.info(s"Current public keys: ${allPublicKeys.map(EncodingUtils.encode2Base16).mkString(",")}")
       checkScheduleUpdateTime()
-      logger.info(s"nextPeriod.timeToPublish. Height of last block is: ${lastBlock.height}")
     case Tick if nextPeriod.noBlocksInTime =>
       logger.info(s"nextPeriod.noBlocksInTime. Height of last block is: ${lastBlock.height}")
       //epoch = epoch.dropNextPublisherPublicKey
@@ -104,6 +108,7 @@ class Planner(settings: Settings) extends CommonActor {
       context.parent ! nextPeriod
       needToCheckTimeToPublish = true
       checkScheduleUpdateTime()
+      isRemoved = true
     case Tick =>
       logger.info("123")
     //      logger.info(s"Current epoch is: $epoch. Height of last block is: ${lastBlock.height}")

src/main/scala/mvp2/actors/Zombie.scala

@@ -11,8 +11,8 @@ class Zombie extends CommonActor {
   }
 
   override def specialBehavior: Receive = {
-    case deadMessage: DeadLetter => logger.info(s"Dead letter: ${deadMessage.toString}.")
-    case unhandled: UnhandledMessage => logger.info(s"Unhandled message ${unhandled.toString}")
+    case deadMessage: DeadLetter => println(s"Dead letter: ${deadMessage.toString}.")
+    case unhandled: UnhandledMessage => println(s"Unhandled message ${unhandled.toString}")
   }
 
 }