mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-23 22:46:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix networkstats API call (#1309)

Browse source 
Use the correct type in `networkstats` API.
This commit is contained in:
n1bor 2020-02-10 09:32:29 +00:00 • committed by GitHub
parent 41f466c30e
commit 13f5b0339a
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala
View file

@ -284,7 +284,7 @@ class EclairImpl(appKit: Kit) extends Eclair {
override def channelStats()(implicit timeout: Timeout): Future[Seq[Stats]] = Future(appKit.nodeParams.db.audit.stats)
override def networkStats()(implicit timeout: Timeout): Future[Option[NetworkStats]] = (appKit.router ? GetNetworkStats).mapTo[Option[NetworkStats]]
override def networkStats()(implicit timeout: Timeout): Future[Option[NetworkStats]] = (appKit.router ? GetNetworkStats).mapTo[GetNetworkStatsResponse].map(_.stats)
override def allInvoices(from_opt: Option[Long], to_opt: Option[Long])(implicit timeout: Timeout): Future[Seq[PaymentRequest]] = Future {
val filter = getDefaultTimestampFilters(from_opt, to_opt)

4
eclair-core/src/test/scala/fr/acinq/eclair/EclairImplSpec.scala
View file

@ -34,7 +34,7 @@ import fr.acinq.eclair.payment.receive.MultiPartHandler.ReceivePayment
import fr.acinq.eclair.payment.receive.PaymentHandler
import fr.acinq.eclair.payment.send.PaymentInitiator.{SendPaymentRequest, SendPaymentToRouteRequest}
import fr.acinq.eclair.router.RouteCalculationSpec.makeUpdate
import fr.acinq.eclair.router.{Announcements, PublicChannel, Router, GetNetworkStats, NetworkStats, Stats}
import fr.acinq.eclair.router.{Announcements, GetNetworkStats, GetNetworkStatsResponse, NetworkStats, PublicChannel, Router, Stats}
import org.mockito.Mockito
import org.mockito.scalatest.IdiomaticMockito
import org.scalatest.{Outcome, ParallelTestExecution, fixture}
@ -217,7 +217,7 @@ class EclairImplSpec extends TestKit(ActorSystem("test")) with fixture.FunSuiteL
val fResp = eclair.networkStats()
f.router.expectMsg(GetNetworkStats)
f.router.reply(Some(new NetworkStats(1, 2, capStat, cltvStat, feeBaseStat, feePropStat)))
f.router.reply(GetNetworkStatsResponse(Some(new NetworkStats(1, 2, capStat, cltvStat, feeBaseStat, feePropStat))))
awaitCond({
fResp.value match {

2
eclair-core/src/test/scala/fr/acinq/eclair/router/RouterSpec.scala
View file

@ -251,6 +251,8 @@ class RouterSpec extends BaseRouterSpec {
sender.send(router, GetNetworkStats)
val GetNetworkStatsResponse(Some(stats)) = sender.expectMsgType[GetNetworkStatsResponse]
// if you change this test update test "router returns Network Stats" in EclairImpSpec that mocks this call.
// else will break the networkstats API call
assert(stats.channels === 4)
assert(stats.nodes === 6)
assert(stats.capacity.median === 1000000.sat)