Fulfilling Proposal #110

build.gradle

@@ -69,7 +69,6 @@ configure(subprojects) {
         reactfxVersion = '2.0-M3'
         sarxosVersion = '0.3.12'
         slf4jVersion = '1.7.22'
-        log4jVersion = '1.2.17'
         sparkVersion = '2.5.2'
         springBootVersion = '1.5.10.RELEASE'
         springVersion = '4.3.6.RELEASE'
@@ -157,6 +156,8 @@ configure(project(':assets')) {
         compile "com.google.guava:guava:$guavaVersion"
         compile "org.slf4j:slf4j-api:$slf4jVersion"
         compile "org.apache.commons:commons-lang3:$langVersion"
+        compile "junit:junit:$junitVersion"
+        compile "log4j:log4j:1.2.17"
     }
 }
 
@@ -174,6 +175,8 @@ configure(project(':common')) {
 
     dependencies {
         implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+        compile "junit:junit:$junitVersion"
+        compile "log4j:log4j:1.2.17"
         compile "org.openjfx:javafx-base:11:$os"
         compile "org.openjfx:javafx-graphics:11:$os"
         compile "com.google.protobuf:protobuf-java:$protobufVersion"

core/src/main/java/bisq/core/xmr/wallet/XmrWalletRpcWrapper.java

@@ -27,12 +27,10 @@
 import bisq.common.app.DevEnv;
 import bisq.core.locale.Res;
 import bisq.core.user.Preferences;
-import bisq.core.xmr.wallet.listeners.WalletBalanceListener;
+import bisq.core.xmr.wallet.listeners.WalletUiListener;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.TextArea;
 import lombok.extern.slf4j.Slf4j;
 import monero.rpc.MoneroRpcConnection;
 import monero.wallet.MoneroWalletRpc;
@@ -84,7 +82,7 @@ public XmrWalletRpcWrapper(Preferences preferences) {
 		}
     }
 
-    public void update(WalletBalanceListener listener, HashMap<String, Object> walletRpcData) { 
+    public void update(WalletUiListener listener, HashMap<String, Object> walletRpcData) { 
 		Runnable command = new Runnable() {
 
 			@Override
@@ -149,7 +147,7 @@ public boolean test(MoneroTxWallet t) {
     	return list.size() > 100 ? list.subList(0, 100) : list;//Reduce transactions to no more than 100.
     }
 
-    public void searchTx(WalletBalanceListener listener, String commaSeparatedIds) {
+    public void searchTx(WalletUiListener listener, String commaSeparatedIds) {
 		Runnable command = new Runnable() {
 
 			@Override
@@ -177,7 +175,7 @@ public void run() {
 		}
     }
 
-    public void createTx(WalletBalanceListener listener, Integer accountIndex, String address, 
+    public void createTx(WalletUiListener listener, Integer accountIndex, String address, 
     		BigInteger amount, MoneroSendPriority priority, boolean doNotRelay, HashMap<String, Object> walletRpcData) { 
 		Runnable command = new Runnable() {
 
@@ -226,7 +224,7 @@ public void run() {
 		}
     }
 
-    public void relayTx(WalletBalanceListener listener, HashMap<String, Object> walletRpcData) { 
+    public void relayTx(WalletUiListener listener, HashMap<String, Object> walletRpcData) { 
 		Runnable command = new Runnable() {
 
 			@Override
@@ -252,27 +250,8 @@ public void run() {
 			listener.popupErrorWindow(Res.get("shared.account.wallet.popup.error.startupFailed"));
 		}
     }
-
-	public void fetchLanguages(WalletBalanceListener listener, ComboBox<String> languageComboBox) {
-    	log.debug("createWalletRpcInstance - {}, {}");
-        ObservableList<String> languageOptions = FXCollections.observableArrayList();
-		Runnable command = new Runnable() {
-
-			@Override
-			public void run() {
-				checkNotNull(walletRpc, Res.get("mainView.networkWarning.localhostLost", "Monero"));
-        		languageOptions.addAll(walletRpc.getLanguages());
-        		languageComboBox.setItems(languageOptions);
-			}
-		};
-		try {
-			Platform.runLater(command);
-		} catch (Exception e) {
-			listener.popupErrorWindow(Res.get("shared.account.wallet.popup.error.startupFailed"));
-		}
-	}
 
-    public void openWalletRpcInstance(WalletBalanceListener listener) {
+    public void openWalletRpcInstance(WalletUiListener listener) {
     	log.debug("openWalletRpcInstance - {}, {}", HOST, PORT);
         Thread checkIfXmrLocalHostNodeIsRunningThread = new Thread(() -> {
             Thread.currentThread().setName("checkIfXmrLocalHostNodeIsRunningThread");
@@ -306,40 +285,6 @@ public void openWalletRpcInstance(WalletBalanceListener listener) {
     public boolean isXmrWalletRpcRunning() {
     	return xmrWalletRpcRunning;
     }
-
-	public void createWalletRpcInstance(WalletBalanceListener listener, String walletFile, String password, String language, TextArea seedWordsTextArea) {
-    	log.debug("createWalletRpcInstance - {}, {}, {}, {}", HOST, PORT, walletFile, password);
-        Thread checkIfXmrLocalHostNodeIsRunningThread = new Thread(() -> {
-            Thread.currentThread().setName("checkIfXmrLocalHostNodeIsRunningThread");
-            Socket socket = null;
-            try {
-                socket = new Socket();
-                socket.connect(new InetSocketAddress(InetAddresses.forString(HOST), PORT), 5000);
-                log.debug("Localhost Monero Wallet RPC detected.");
-                UserThread.execute(() -> {
-                	xmrWalletRpcRunning = true;
-            		walletRpc = new MoneroWalletRpc(new MoneroRpcConnection("http://" + HOST + ":" + PORT));
-            		walletRpc.createWalletRandom(walletFile, password, language);
-            		String mnemonic = walletRpc.getMnemonic();
-            		seedWordsTextArea.setText(mnemonic);
-                });
-            } catch (Throwable e) {
-            	log.debug("createWalletRpcInstance - {}", e.getMessage());
-            	e.printStackTrace();
-            	if(listener != null) {
-                	listener.popupErrorWindow(Res.get("shared.account.wallet.popup.error.startupFailed", "Monero", e.getLocalizedMessage()));
-            	}
-            } finally {
-                if (socket != null) {
-                    try {
-                        socket.close();
-                    } catch (IOException ignore) {
-                    }
-                }
-            }
-        });
-        checkIfXmrLocalHostNodeIsRunningThread.start();
-	}
 
 	public void handleTxProof(TxProofHandler handler, String txId, String message) {
 		Runnable command = new Runnable() {

core/src/main/java/bisq/core/xmr/wallet/listeners/WalletBalanceListener.java → core/src/main/java/bisq/core/xmr/wallet/listeners/WalletUiListener.java

@@ -19,7 +19,7 @@
 
 import java.util.HashMap;
 
-public interface WalletBalanceListener {
+public interface WalletUiListener {
 	/**
 	 * 
 	 * @param walletRpcData

desktop/src/main/java/bisq/desktop/main/account/content/wallet/monero/XmrBalanceUtil.java

@@ -14,14 +14,14 @@
 import bisq.core.locale.Res;
 import bisq.core.xmr.XmrFormatter;
 import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
-import bisq.core.xmr.wallet.listeners.WalletBalanceListener;
+import bisq.core.xmr.wallet.listeners.WalletUiListener;
 import bisq.desktop.main.overlays.popups.Popup;
 import bisq.desktop.util.FormBuilder;
 import bisq.desktop.util.Layout;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.GridPane;
 
-public class XmrBalanceUtil implements WalletBalanceListener {
+public class XmrBalanceUtil implements WalletUiListener {
     // Displaying general XMR info
     private TextField actualBalanceTextField, unlockedBalanceTextField;
     private XmrWalletRpcWrapper walletWrapper;

desktop/src/main/java/bisq/desktop/main/account/content/wallet/monero/receive/XmrReceiveView.java

@@ -28,7 +28,7 @@
 import bisq.common.util.Tuple3;
 import bisq.core.locale.Res;
 import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
-import bisq.core.xmr.wallet.listeners.WalletBalanceListener;
+import bisq.core.xmr.wallet.listeners.WalletUiListener;
 import bisq.desktop.common.view.ActivatableView;
 import bisq.desktop.common.view.FxmlView;
 import bisq.desktop.components.BusyAnimation;
@@ -43,7 +43,7 @@
 import javafx.scene.layout.VBox;
 
 @FxmlView
-public class XmrReceiveView extends ActivatableView<GridPane, Void> implements WalletBalanceListener {
+public class XmrReceiveView extends ActivatableView<GridPane, Void> implements WalletUiListener {
 
     private WalletAddressTextField addressTextField;
     private final XmrWalletRpcWrapper walletWrapper;

desktop/src/main/java/bisq/desktop/main/account/content/wallet/monero/send/XmrSendView.java

@@ -36,7 +36,7 @@
 import bisq.core.locale.Res;
 import bisq.core.xmr.XmrFormatter;
 import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
-import bisq.core.xmr.wallet.listeners.WalletBalanceListener;
+import bisq.core.xmr.wallet.listeners.WalletUiListener;
 import bisq.desktop.Navigation;
 import bisq.desktop.common.view.ActivatableView;
 import bisq.desktop.common.view.FxmlView;
@@ -64,7 +64,7 @@
 import monero.wallet.model.MoneroTxWallet;
 
 @FxmlView
-public class XmrSendView extends ActivatableView<GridPane, Void> implements WalletBalanceListener {
+public class XmrSendView extends ActivatableView<GridPane, Void> implements WalletUiListener {
 	private final XmrWalletRpcWrapper walletWrapper;
     private final XmrFormatter xmrFormatter;
     private final Navigation navigation;

desktop/src/main/java/bisq/desktop/main/account/content/wallet/monero/tx/XmrTxView.java

@@ -28,7 +28,7 @@
 import bisq.core.xmr.XmrFormatter;
 import bisq.core.xmr.wallet.XmrTxListItem;
 import bisq.core.xmr.wallet.XmrWalletRpcWrapper;
-import bisq.core.xmr.wallet.listeners.WalletBalanceListener;
+import bisq.core.xmr.wallet.listeners.WalletUiListener;
 import bisq.desktop.common.view.ActivatableView;
 import bisq.desktop.common.view.FxmlView;
 import bisq.desktop.components.AutoTooltipTableColumn;
@@ -59,7 +59,7 @@
 import monero.wallet.model.MoneroTxWallet;
 
 @FxmlView
-public class XmrTxView extends ActivatableView<GridPane, Void> implements WalletBalanceListener {
+public class XmrTxView extends ActivatableView<GridPane, Void> implements WalletUiListener {
 
     private TableView<XmrTxListItem> tableView;
     private final XmrWalletRpcWrapper walletWrapper;