mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-15 20:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add error messages for when DLC GUI functions timeout (#3184)

Browse source
This commit is contained in:
benthecarman 2021-05-28 17:17:13 -07:00 • committed by GitHub
parent 5a79acb59c
commit bcda2467ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPaneModel.scala
View file

@ -115,7 +115,11 @@ class DLCPaneModel(resultArea: TextArea) extends Logging {
op = { op = {
ConsoleCli.exec(command, GlobalData.consoleCliConfig) match { ConsoleCli.exec(command, GlobalData.consoleCliConfig) match {
case Success(commandReturn) => case Success(commandReturn) =>
resultArea.text = commandReturn val string = if (commandReturn.isEmpty) {
"Accepting DLC Offer timed out! Try again in a bit."
} else commandReturn
resultArea.text = string
case Failure(err) => case Failure(err) =>
err.printStackTrace() err.printStackTrace()
resultArea.text = s"Error executing command:\n${err.getMessage}" resultArea.text = s"Error executing command:\n${err.getMessage}"
@ -137,7 +141,10 @@ class DLCPaneModel(resultArea: TextArea) extends Logging {
op = { op = {
ConsoleCli.exec(command, GlobalData.consoleCliConfig) match { ConsoleCli.exec(command, GlobalData.consoleCliConfig) match {
case Success(commandReturn) => case Success(commandReturn) =>
resultArea.text = commandReturn val string = if (commandReturn.isEmpty) {
"Signing DLC timed out! Try again in a bit."
} else commandReturn
resultArea.text = string
case Failure(err) => case Failure(err) =>
err.printStackTrace() err.printStackTrace()
resultArea.text = s"Error executing command:\n${err.getMessage}" resultArea.text = s"Error executing command:\n${err.getMessage}"
@ -150,7 +157,12 @@ class DLCPaneModel(resultArea: TextArea) extends Logging {
} }
def onAddSigs(): Unit = { def onAddSigs(): Unit = {
printDLCDialogResult("AddDLCSigs", new AddSigsDLCDialog) val processStr: String => String = str => {
if (str.isEmpty) {
"Broadcasting DLC timed out! Try again in a bit."
} else str
}
printDLCDialogResult("AddDLCSigs", new AddSigsDLCDialog, processStr)
} }
def onGetFunding(): Unit = { def onGetFunding(): Unit = {