mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-20 02:27:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into extended-api-pm

Browse Source
This commit is contained in:
Andrea 2019-03-28 11:24:12 +01:00
commit cd703f2d4a
No known key found for this signature in database
GPG Key ID: FFB3470FFF04CA76
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclair-core/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-SNAPSHOT</version>
<version>0.3-SNAPSHOT</version>
</parent>
<artifactId>eclair-core_2.11</artifactId>

11
eclair-core/src/main/scala/fr/acinq/eclair/api/Service.scala
View File

@ -61,6 +61,7 @@ trait Service extends Directives with Logging {
// a named and typed URL parameter used across several routes, 32-bytes hex-encoded
val channelId = "channelId".as[ByteVector32](sha256HashUnmarshaller)
val nodeId = "nodeId".as[PublicKey]
val shortChannelId = "shortChannelId".as[ShortChannelId](shortChannelIdUnmarshaller)
val apiExceptionHandler = ExceptionHandler {
@ -138,12 +139,12 @@ trait Service extends Directives with Logging {
path("connect") {
formFields("uri".as[String]) { uri =>
complete(eclairApi.connect(uri))
} ~ formFields("nodeId".as[PublicKey], "host".as[String], "port".as[Int].?) { (nodeId, host, port_opt) =>
} ~ formFields(nodeId, "host".as[String], "port".as[Int].?) { (nodeId, host, port_opt) =>
complete(eclairApi.connect(s"$nodeId@$host:${port_opt.getOrElse(NodeURI.DEFAULT_PORT)}"))
}
} ~
path("open") {
formFields("nodeId".as[PublicKey], "fundingSatoshis".as[Long], "pushMsat".as[Long].?, "fundingFeerateSatByte".as[Long].?, "channelFlags".as[Int].?) {
formFields(nodeId, "fundingSatoshis".as[Long], "pushMsat".as[Long].?, "fundingFeerateSatByte".as[Long].?, "channelFlags".as[Int].?) {
(nodeId, fundingSatoshis, pushMsat, fundingFeerateSatByte, channelFlags) =>
complete(eclairApi.open(nodeId, fundingSatoshis, pushMsat, fundingFeerateSatByte, channelFlags))
}
@ -171,7 +172,7 @@ trait Service extends Directives with Logging {
complete(eclairApi.peersInfo())
} ~
path("channels") {
formFields("toRemoteNodeId".as[PublicKey].?) { toRemoteNodeId_opt =>
formFields(nodeId.?) { toRemoteNodeId_opt =>
complete(eclairApi.channelsInfo(toRemoteNodeId_opt))
}
} ~
@ -187,7 +188,7 @@ trait Service extends Directives with Logging {
complete(eclairApi.allchannels())
} ~
path("allupdates") {
formFields("nodeId".as[PublicKey].?) { nodeId_opt =>
formFields(nodeId.?) { nodeId_opt =>
complete(eclairApi.allupdates(nodeId_opt))
}
} ~
@ -208,7 +209,7 @@ trait Service extends Directives with Logging {
case _ => reject(MalformedFormFieldRejection("invoice", "The invoice must have an amount or you need to specify one using 'amountMsat'"))
}
} ~ path("findroutetonode") {
formFields("nodeId".as[PublicKey], "amountMsat".as[Long]) { (nodeId, amount) =>
formFields(nodeId, "amountMsat".as[Long]) { (nodeId, amount) =>
complete(eclairApi.findRoute(nodeId, amount))
}
} ~

2
eclair-node-gui/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-SNAPSHOT</version>
<version>0.3-SNAPSHOT</version>
</parent>
<artifactId>eclair-node-gui_2.11</artifactId>

2
eclair-node/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-SNAPSHOT</version>
<version>0.3-SNAPSHOT</version>
</parent>
<artifactId>eclair-node_2.11</artifactId>

2
pom.xml
View File

@ -20,7 +20,7 @@
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-SNAPSHOT</version>
<version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>