Reduce heartbeatbuild logic duplication #1808
Conversation
…gic-duplication stay up to date# the commit.
…Reduce-heartbeatbuild-logic-duplication
…educe-heartbeatbuild-logic-duplication
Pull reviewers statsStats of the last 30 days for popstellar:
|
| val securityModuleActorRef: AskableActorRef = system.actorOf(Props(SecurityModuleActor(RuntimeEnvironment.securityPath))) | ||
|
|
||
| // Create necessary actors for server-server communications | ||
| val heartbeatGenRef: ActorRef = system.actorOf(HeartbeatGenerator.props(dbActorRef)) | ||
| val monitorRef: ActorRef = system.actorOf(Monitor.props(heartbeatGenRef)) | ||
| // val heartbeatGenRef: ActorRef = system.actorOf(HeartbeatGenerator.props(dbActorRef)) |
There was a problem hiding this comment.
Could be good to remove the unnecessary code :)
| val heartbeat: HashMap[Channel, Set[Hash]] = | ||
| Await.ready(askForHeartbeat, duration).value.get match | ||
| case Success(DbActor.DbActorGenerateHeartbeatAck(Some(map))) => map | ||
| case Failure(ex: DbActorNAckException) => HashMap.empty[Channel, Set[Hash]] // Specific failure |
There was a problem hiding this comment.
Why keep the specific failure if the handling is the same as the case _? Isn't it possible to combine both?
| val setOfChannels = getAllChannels | ||
| if (setOfChannels.isEmpty) return None | ||
| var heartbeatMap: HashMap[Channel, Set[Hash]] = HashMap() | ||
| setOfChannels.foreach(channel => { |
There was a problem hiding this comment.
I think you can replace this by a setOfChannels.map and avoid the HashMap creation
be2-scala/src/main/scala/ch/epfl/pop/decentralized/Monitor.scala
Outdated
Show resolved
Hide resolved
be2-scala/src/main/scala/ch/epfl/pop/decentralized/Monitor.scala
Outdated
Show resolved
Hide resolved
be2-scala/src/main/scala/ch/epfl/pop/decentralized/Monitor.scala
Outdated
Show resolved
Hide resolved
be2-scala/src/main/scala/ch/epfl/pop/pubsub/graph/handlers/ParamsWithMapHandler.scala
Outdated
Show resolved
Hide resolved
| @@ -369,6 +370,21 @@ final case class DbActor( | |||
| (publicKey, privateKey) | |||
| } | |||
|
|
|||
| @throws[DbActorNAckException] | |||
| private def generateHeartbeat(): Option[HashMap[Channel, Set[Hash]]] = { | |||
There was a problem hiding this comment.
I feel like an Option is not necessary here, you might as well return an empty map directly ?
|
|
||
| monitorRef ! PoisonPill | ||
| mockConnectionMediator.expectTerminated(monitorRef) | ||
|
|
|
|
||
| monitorRef ! PoisonPill | ||
| mockConnectionMediator.expectTerminated(monitorRef) | ||
|
|
|
|
|
|
|
onsriahi14
deleted the
work-be2-onsriahi-Reduce-heartbeatbuild-logic-duplication
branch
No description provided.