From 3bf00fb5b221bf37dce6155b36cb22ad7e92fe13 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 22 Mar 2019 14:39:05 +0100 Subject: [PATCH] Rename EclairApi into Eclair and move it to root package --- .../{api/EclairApi.scala => Eclair.scala} | 25 ++++++++++--------- .../main/scala/fr/acinq/eclair/Setup.scala | 14 +++++------ .../scala/fr/acinq/eclair/api/Service.scala | 5 ++-- .../fr/acinq/eclair/api/ApiServiceSpec.scala | 6 +++-- 4 files changed, 27 insertions(+), 23 deletions(-) rename eclair-core/src/main/scala/fr/acinq/eclair/{api/EclairApi.scala => Eclair.scala} (95%) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/api/EclairApi.scala b/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala similarity index 95% rename from eclair-core/src/main/scala/fr/acinq/eclair/api/EclairApi.scala rename to eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala index b09b11993..5ca90ea35 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/api/EclairApi.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala @@ -1,24 +1,25 @@ -package fr.acinq.eclair.api +package fr.acinq.eclair -import akka.util.Timeout +import akka.actor.ActorRef import akka.pattern._ +import akka.util.Timeout import fr.acinq.bitcoin.Crypto.PublicKey import fr.acinq.bitcoin.{ByteVector32, MilliSatoshi, Satoshi} -import fr.acinq.eclair.{Globals, Kit, ShortChannelId} -import fr.acinq.eclair.io.{NodeURI, Peer} -import akka.actor.{Actor, ActorRef, ActorSystem, Props} +import fr.acinq.eclair.api.{AuditResponse, GetInfoResponse} import fr.acinq.eclair.channel._ import fr.acinq.eclair.db.{NetworkFee, Stats} import fr.acinq.eclair.io.Peer.{GetPeerInfo, PeerInfo} +import fr.acinq.eclair.io.{NodeURI, Peer} import fr.acinq.eclair.payment.PaymentLifecycle._ -import fr.acinq.eclair.payment.{PaymentLifecycle, PaymentReceived, PaymentRequest} -import fr.acinq.eclair.router.{ChannelDesc, RouteNotFound, RouteRequest, RouteResponse} -import fr.acinq.eclair.wire.{ChannelAnnouncement, ChannelUpdate, NodeAddress, NodeAnnouncement} +import fr.acinq.eclair.payment.{PaymentLifecycle, PaymentRequest} +import fr.acinq.eclair.router.{ChannelDesc, RouteRequest, RouteResponse} +import fr.acinq.eclair.wire.{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement} import scodec.bits.ByteVector -import scala.concurrent.duration._ -import scala.concurrent.Future -trait EclairApi { +import scala.concurrent.Future +import scala.concurrent.duration._ + +trait Eclair { def connect(uri: String): Future[String] @@ -60,7 +61,7 @@ trait EclairApi { } -class EclairApiImpl (appKit: Kit) extends EclairApi { +class EclairApiImpl (appKit: Kit) extends Eclair { implicit val ec = appKit.system.dispatcher implicit val timeout = Timeout(60 seconds) // used by akka ask diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala b/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala index 54def5917..890d54988 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala @@ -275,17 +275,17 @@ class Setup(datadir: File, } val apiRoute = if (!config.getBoolean("api.use-old-api")) { new Service { - val actorSystem = kit.system - val mat = materializer - val password = apiPassword - def eclairApi: EclairApi = new EclairApiImpl(kit) + override val actorSystem = kit.system + override val mat = materializer + override val password = apiPassword + override val eclairApi: Eclair = new EclairApiImpl(kit) }.route } else { new OldService { - override def scheduler = system.scheduler + override val scheduler = system.scheduler override val password = apiPassword - override def getInfoResponse: Future[GetInfoResponse] = Future.successful(getInfo) - override def appKit: Kit = kit + override val getInfoResponse: Future[GetInfoResponse] = Future.successful(getInfo) + override val appKit: Kit = kit override val socketHandler = makeSocketHandler(system)(materializer) }.route } diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala b/eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala index dc631a5db..9a2840da1 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala @@ -3,7 +3,7 @@ package fr.acinq.eclair.api import akka.http.scaladsl.server._ import fr.acinq.bitcoin.Crypto.PublicKey import fr.acinq.bitcoin.{ByteVector32, MilliSatoshi, Satoshi} -import fr.acinq.eclair.{Kit, ShortChannelId} +import fr.acinq.eclair.{Eclair, Kit, ShortChannelId} import FormParamExtractors._ import akka.NotUsed import akka.actor.{Actor, ActorRef, ActorSystem, Props} @@ -18,6 +18,7 @@ import akka.stream.scaladsl.{BroadcastHub, Flow, Keep, Source} import fr.acinq.eclair.payment.{PaymentLifecycle, PaymentReceived, PaymentRequest} import grizzled.slf4j.Logging import scodec.bits.ByteVector + import scala.concurrent.{ExecutionContext, Future} import scala.concurrent.duration._ @@ -30,7 +31,7 @@ trait Service extends Directives with Logging { def password: String - def eclairApi: EclairApi + val eclairApi: Eclair implicit val actorSystem: ActorSystem implicit val mat: ActorMaterializer diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/api/ApiServiceSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/api/ApiServiceSpec.scala index bcb4a3aab..fc0c3b1ab 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/api/ApiServiceSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/api/ApiServiceSpec.scala @@ -18,12 +18,13 @@ package fr.acinq.eclair.api import java.nio.file.{Files, Path, Paths, StandardOpenOption} + import akka.actor.{Actor, ActorSystem, Props, Scheduler} import org.scalatest.FunSuite import akka.http.scaladsl.model.StatusCodes._ import akka.http.scaladsl.testkit.{RouteTestTimeout, ScalatestRouteTest} import fr.acinq.eclair.blockchain.TestWallet -import fr.acinq.eclair.{Kit, TestConstants} +import fr.acinq.eclair.{Eclair, EclairApiImpl, Kit, TestConstants} import fr.acinq.eclair.io.Peer.{GetPeerInfo, PeerInfo} import TestConstants._ import akka.http.scaladsl.model.headers.BasicHttpCredentials @@ -33,6 +34,7 @@ import fr.acinq.eclair.channel.Register.ForwardShortId import org.json4s.{Formats, JValue} import akka.http.scaladsl.model.{ContentTypes, FormData, MediaTypes, Multipart} import fr.acinq.eclair.io.Peer + import scala.concurrent.duration._ import scala.io.Source @@ -74,7 +76,7 @@ class ApiServiceSpec extends FunSuite with ScalatestRouteTest { } class MockService(kit: Kit = defaultMockKit, getInfoResp: GetInfoResponse = defaultGetInfo) extends Service { - override def eclairApi: EclairApi = new EclairApiImpl(kit) + override def eclairApi: Eclair = new EclairApiImpl(kit) override def password: String = "mock"