Skip to content

Commit b1d7574

Browse files
authored
Merge pull request #1980 from dedis/fix-be2-daniel-new-server-connected
[BE2] Add notify new server connected
2 parents 2ab5e66 + be1e3a7 commit b1d7574

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ final case class ConnectionMediator(
7474
if (serverMap.isEmpty) {
7575
monitorRef ! Monitor.AtLeastOneServerConnected
7676
gossipManagerRef ! Monitor.AtLeastOneServerConnected
77+
} else {
78+
gossipManagerRef ! ConnectionMediator.NewServerConnected(serverRef, greetServer)
7779
}
7880
serverMap += ((serverRef, greetServer))
7981

be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ class GossipManagerSuite extends TestKit(ActorSystem("GossipManagerSuiteActorSys
317317

318318
Await.result(output, duration)
319319

320-
// include rumor state
321320
peers.map(_.receiveOne(duration)).count(_ != null) shouldBe 1
322321

323322
}
@@ -365,7 +364,7 @@ class GossipManagerSuite extends TestKit(ActorSystem("GossipManagerSuiteActorSys
365364
val response = Right(JsonRpcResponse(
366365
RpcValidator.JSON_RPC_VERSION,
367366
ResultObject(0),
368-
Some(1)
367+
Some(4)
369368
))
370369

371370
// by processing the reponse, gossipManager should send again a rumor to a new peer

0 commit comments

Comments
 (0)