From 63b6a576e6c736e7a5a5a179c9da67a28548d266 Mon Sep 17 00:00:00 2001 From: Alex Chepurnoy Date: Mon, 2 Nov 2020 13:35:06 +0300 Subject: [PATCH] match => flatmap in PeersApiroute --- .../scorex/core/api/http/PeersApiRoute.scala | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/scala/scorex/core/api/http/PeersApiRoute.scala b/src/main/scala/scorex/core/api/http/PeersApiRoute.scala index 4bcfe3de6..56ac1b6ea 100644 --- a/src/main/scala/scorex/core/api/http/PeersApiRoute.scala +++ b/src/main/scala/scorex/core/api/http/PeersApiRoute.scala @@ -38,17 +38,15 @@ case class PeersApiRoute(peerManager: ActorRef, def connectedPeers: Route = (path("connected") & get) { val result = askActor[Seq[ConnectedPeer]](networkController, GetConnectedPeers).map { - _.map { con => - con.peerInfo match { - case Some(peerInfo) => - PeerInfoResponse( - address = peerInfo.peerSpec.declaredAddress.map(_.toString).getOrElse(""), - lastMessage = con.lastMessage, - lastHandshake = peerInfo.lastHandshake, - name = peerInfo.peerSpec.nodeName, - connectionType = peerInfo.connectionType.map(_.toString) - ) - case None => throw new Exception("Peer is not connected") + _.flatMap { con => + con.peerInfo.map { peerInfo => + PeerInfoResponse( + address = peerInfo.peerSpec.declaredAddress.map(_.toString).getOrElse(""), + lastMessage = con.lastMessage, + lastHandshake = peerInfo.lastHandshake, + name = peerInfo.peerSpec.nodeName, + connectionType = peerInfo.connectionType.map(_.toString) + ) } } }