From 9d9c24324886f309356abaff1e049177084bef7e Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Mon, 1 Jul 2024 01:30:01 +0200 Subject: [PATCH 1/2] add message new server connected --- .../scala/ch/epfl/pop/decentralized/ConnectionMediator.scala | 3 +++ .../scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala index 32549677fd..e36b612951 100644 --- a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala +++ b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala @@ -35,6 +35,7 @@ final case class ConnectionMediator( // Connect to some servers case ConnectionMediator.ConnectTo(urlList) => + log.info(s"ConnectTo $urlList") val urlDiff = urlList.toSet.diff(serverMap.values.map(g => g.serverAddress).toSet) urlDiff.map(url => Http().singleWebSocketRequest( @@ -74,6 +75,8 @@ final case class ConnectionMediator( if (serverMap.isEmpty) { monitorRef ! Monitor.AtLeastOneServerConnected gossipManagerRef ! Monitor.AtLeastOneServerConnected + } else { + gossipManagerRef ! ConnectionMediator.NewServerConnected(serverRef, greetServer) } serverMap += ((serverRef, greetServer)) diff --git a/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala index 23ccbaa19b..3fd355a149 100644 --- a/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala +++ b/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala @@ -365,7 +365,7 @@ class GossipManagerSuite extends TestKit(ActorSystem("GossipManagerSuiteActorSys val response = Right(JsonRpcResponse( RpcValidator.JSON_RPC_VERSION, ResultObject(0), - Some(1) + Some(4) )) // by processing the reponse, gossipManager should send again a rumor to a new peer From be1e3a7dd73d87ab09880c0ae02b0bab28a2775c Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Mon, 1 Jul 2024 01:43:03 +0200 Subject: [PATCH 2/2] clean --- .../scala/ch/epfl/pop/decentralized/ConnectionMediator.scala | 1 - .../scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala | 1 - 2 files changed, 2 deletions(-) diff --git a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala index e36b612951..f55cf0f47f 100644 --- a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala +++ b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala @@ -35,7 +35,6 @@ final case class ConnectionMediator( // Connect to some servers case ConnectionMediator.ConnectTo(urlList) => - log.info(s"ConnectTo $urlList") val urlDiff = urlList.toSet.diff(serverMap.values.map(g => g.serverAddress).toSet) urlDiff.map(url => Http().singleWebSocketRequest( diff --git a/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala b/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala index 3fd355a149..5e311c95f7 100644 --- a/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala +++ b/be2-scala/src/test/scala/ch/epfl/pop/decentralized/GossipManagerSuite.scala @@ -317,7 +317,6 @@ class GossipManagerSuite extends TestKit(ActorSystem("GossipManagerSuiteActorSys Await.result(output, duration) - // include rumor state peers.map(_.receiveOne(duration)).count(_ != null) shouldBe 1 }