From 3a8581da13c63285d9f608a9f4f115dd5bd9e1e6 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Sat, 23 May 2020 16:54:37 +0200 Subject: [PATCH] test fix, remove custom policy support --- drongo | 2 +- .../com/sparrowwallet/sparrow/wallet/settings.fxml | 2 +- .../java/com/sparrowwallet/sparrow/io/StorageTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drongo b/drongo index 78504089..de70f445 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 785040898babf4b198985531f61af7ce48178b17 +Subproject commit de70f44535916f93d18f66190a217d93f94e1240 diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml b/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml index b22e24ef..e2169dc7 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml @@ -33,7 +33,7 @@ - + diff --git a/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java b/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java index c5cb23d9..f6d9c47c 100644 --- a/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java +++ b/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java @@ -17,14 +17,14 @@ public class StorageTest extends IoTest { @Test public void loadWallet() throws IOException, MnemonicException, StorageException { Storage storage = new Storage(getFile("sparrow-single-wallet")); - Wallet wallet = storage.loadWallet("pass"); + Wallet wallet = storage.loadWallet("pass").wallet; Assert.assertTrue(wallet.isValid()); } @Test public void loadSeedWallet() throws IOException, MnemonicException, StorageException { Storage storage = new Storage(getFile("sparrow-single-seed-wallet")); - Wallet wallet = storage.loadWallet("pass"); + Wallet wallet = storage.loadWallet("pass").wallet; Assert.assertTrue(wallet.isValid()); Assert.assertEquals("testd2", wallet.getName()); @@ -42,7 +42,7 @@ public class StorageTest extends IoTest { @Test public void saveWallet() throws IOException, MnemonicException, StorageException { Storage storage = new Storage(getFile("sparrow-single-wallet")); - Wallet wallet = storage.loadWallet("pass"); + Wallet wallet = storage.loadWallet("pass").wallet; Assert.assertTrue(wallet.isValid()); File tempWallet = File.createTempFile("sparrow", "tmp"); @@ -54,7 +54,7 @@ public class StorageTest extends IoTest { tempStorage.storeWallet(wallet); Storage temp2Storage = new Storage(tempWallet); - wallet = temp2Storage.loadWallet("pass"); + wallet = temp2Storage.loadWallet("pass").wallet; Assert.assertTrue(wallet.isValid()); } }