sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 13:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve display of json rpc error exceptions

Browse source
This commit is contained in:
Craig Raw 2022-12-01 09:39:47 +02:00
parent 6ac294920e
commit 6871810c7c
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/sparrowwallet/sparrow/event/ConnectionFailedEvent.java
View file

@ -1,5 +1,6 @@
package com.sparrowwallet.sparrow.event; package com.sparrowwallet.sparrow.event;
import com.github.arteam.simplejsonrpc.client.exception.JsonRpcException;
import com.sparrowwallet.sparrow.net.TlsServerException; import com.sparrowwallet.sparrow.net.TlsServerException;
public class ConnectionFailedEvent { public class ConnectionFailedEvent {
@ -20,6 +21,12 @@ public class ConnectionFailedEvent {
Throwable cause = (exception.getCause() != null ? exception.getCause() : exception); Throwable cause = (exception.getCause() != null ? exception.getCause() : exception);
cause = (cause.getCause() != null ? cause.getCause() : cause); cause = (cause.getCause() != null ? cause.getCause() : cause);
if(cause instanceof JsonRpcException jsonRpcException && jsonRpcException.getErrorMessage() != null) {
return jsonRpcException.getErrorMessage().getMessage() +
(jsonRpcException.getErrorMessage().getData() != null ? " (" + jsonRpcException.getErrorMessage().getData().asText() + ")" : "");
}
String message = splitCamelCase(cause.getClass().getSimpleName().replace("Exception", "Error")); String message = splitCamelCase(cause.getClass().getSimpleName().replace("Exception", "Error"));
return message + " (" + cause.getMessage() + ")"; return message + " (" + cause.getMessage() + ")";
} }

13
src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
View file

@ -1,5 +1,7 @@
package com.sparrowwallet.sparrow.preferences; package com.sparrowwallet.sparrow.preferences;
import com.github.arteam.simplejsonrpc.client.exception.JsonRpcException;
import com.google.common.base.Throwables;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.common.net.HostAndPort; import com.google.common.net.HostAndPort;
import com.sparrowwallet.drongo.Network; import com.sparrowwallet.drongo.Network;
@ -623,7 +625,14 @@ public class ServerPreferencesController extends PreferencesDetailController {
private void showConnectionFailure(Throwable exception) { private void showConnectionFailure(Throwable exception) {
log.error("Connection error", exception); log.error("Connection error", exception);
String reason = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
String reason;
if(Throwables.getRootCause(exception) instanceof JsonRpcException jsonRpcException && jsonRpcException.getErrorMessage() != null) {
reason = jsonRpcException.getErrorMessage().getMessage() + (jsonRpcException.getErrorMessage().getData() != null ? " (" + jsonRpcException.getErrorMessage().getData().asText() + ")" : "");
} else {
reason = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
}
if(exception instanceof TlsServerException && exception.getCause() != null) { if(exception instanceof TlsServerException && exception.getCause() != null) {
TlsServerException tlsServerException = (TlsServerException)exception; TlsServerException tlsServerException = (TlsServerException)exception;
if(exception.getCause().getMessage().contains("PKIX path building failed")) { if(exception.getCause().getMessage().contains("PKIX path building failed")) {
@ -649,7 +658,7 @@ public class ServerPreferencesController extends PreferencesDetailController {
reason += ". Check if the proxy server is running."; reason += ". Check if the proxy server is running.";
} else if(exception instanceof TorServerAlreadyBoundException) { } else if(exception instanceof TorServerAlreadyBoundException) {
reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?"; reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?";
} else if(reason != null && reason.contains("Check if Bitcoin Core is running")) { } else if(reason != null && (reason.contains("Check if Bitcoin Core is running") || reason.contains("Could not connect to Bitcoin Core RPC"))) {
reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html"; reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html";
} }