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

(gui) Handle non fatal exception when creating connection

Browse Source 
* pubkey conversion to binary from string is prone to failure
This commit is contained in:
dpad85 2017-02-20 17:09:55 +01:00
parent 8c7f6967e8
commit 6c97d82e95
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eclair-node/src/main/scala/fr/acinq/eclair/gui/Handlers.scala
View File

@ -16,7 +16,7 @@ import fr.acinq.eclair.io.Switchboard.{NewChannel, NewConnection}
import fr.acinq.eclair.payment.CreatePayment
import grizzled.slf4j.Logging
import scala.util.{Failure, Success}
import scala.util.{Failure, Success, Try}
/**
* Created by PM on 16/08/2016.
@ -37,11 +37,16 @@ class Handlers(setup: Setup) extends Logging {
hostPort match {
case GUIValidators.hostRegex(remoteNodeId, host, port) =>
logger.info(s"opening a channel with remoteNodeId=$remoteNodeId")
(setup.switchboard ? NewConnection(PublicKey(remoteNodeId), new InetSocketAddress(host, port.toInt), Some(NewChannel(fundingSatoshis, pushMsat)))).mapTo[String].onComplete {
Try((setup.switchboard ? NewConnection(PublicKey(remoteNodeId), new InetSocketAddress(host, port.toInt), Some(NewChannel(fundingSatoshis, pushMsat)))).mapTo[String].onComplete {
case Success(s) => {}
case Failure(t) =>
val message = s"$host:$port"
val message = s"$host:$port\nCause: ${t.getMessage}"
notification("Connection failed", message, NOTIFICATION_ERROR)
}) match {
case Success(s) => {}
case Failure(t) => {
notification("Connection failed", "The pubkey might be incorrect.", NOTIFICATION_ERROR)
}
}
case _ => {}
}