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

Rename EclairApi into Eclair and move it to root package

Browse source
This commit is contained in:
Andrea 2019-03-22 14:39:05 +01:00
parent 8567979a85
commit 3bf00fb5b2
No known key found for this signature in database
GPG key ID: FFB3470FFF04CA76
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
eclair-core/src/main/scala/fr/acinq/eclair/api/EclairApi.scala → eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala
View file

@ -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

14
eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala
View file

@ -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
}

5
eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala
View file

@ -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

6
eclair-core/src/test/scala/fr/acinq/eclair/api/ApiServiceSpec.scala
View file

@ -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"