Skip to content

Commit e61f6b7

Browse files
committed
change logic of asking modifier from unknown node
1 parent 1a2f69a commit e61f6b7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/scala/encry/network/MessageBuilder.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import akka.actor.{Actor, ActorRef, Props}
66
import akka.pattern._
77
import akka.util.Timeout
88
import com.typesafe.scalalogging.StrictLogging
9-
import encry.consensus.HistoryConsensus.{Equal, Older, Unknown, Younger}
9+
import encry.consensus.HistoryConsensus.{Equal, Fork, Older, Unknown, Younger}
1010
import encry.network.ConnectedPeersCollection.PeerInfo
1111
import encry.network.DM.{IsRequested, RequestSent, RequestStatus}
1212
import encry.network.MessageBuilder.{GetPeerInfo, GetPeers, MsgSent}
@@ -41,7 +41,7 @@ case class MessageBuilder(peersKeeper: ActorRef,
4141
}
4242
case RequestFromLocal(None, modTypeId, modsIds) =>
4343
Try {
44-
(peersKeeper ? (MessageBuilder.PeerWithOlderHistory || MessageBuilder.PeerWithEqualHistory || MessageBuilder.PeerWithYoungerHistory || MessageBuilder.PeerWithUnknownHistory)).mapTo[ConnectedPeer].map { peer =>
44+
(peersKeeper ? (MessageBuilder.PeerWithOlderHistory || MessageBuilder.PeerWithEqualHistory || MessageBuilder.PeerWithForkHistory)).mapTo[ConnectedPeer].map { peer =>
4545
logger.info(s"Going to req mods from ${peer.socketAddress} of type ${modTypeId}")
4646
(deliveryManager ? IsRequested(modsIds)).mapTo[RequestStatus].foreach { status =>
4747
logger.info(s"Requested or received: ${status.requested.length}. Not request or not received: ${status.notRequested.length}")
@@ -114,6 +114,7 @@ object MessageBuilder {
114114
val PeerWithOlderHistory = GetPeerByPredicate((info: PeerInfo) => info.historyComparisonResult == Older)
115115
val PeerWithYoungerHistory = GetPeerByPredicate((info: PeerInfo) => info.historyComparisonResult == Younger)
116116
val PeerWithUnknownHistory = GetPeerByPredicate((info: PeerInfo) => info.historyComparisonResult == Unknown)
117+
val PeerWithForkHistory = GetPeerByPredicate((info: PeerInfo) => info.historyComparisonResult == Fork)
117118
def props(peersKeeper: ActorRef,
118119
deliveryManager: ActorRef): Props = Props(new MessageBuilder(peersKeeper, deliveryManager))
119120
}

0 commit comments

Comments
 (0)