fix tests with derivation paths matching other networks

sparrowwallet · Mar 7, 2024 · f0bd07b · f0bd07b
1 parent e43b783
commit f0bd07b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -160,7 +160,7 @@ processResources {
 
 test {
  useJUnitPlatform()
- jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED'
+ jvmArgs = ["--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.io=com.google.gson"]
 }
 
 application {

diff --git a/drongo b/drongo
diff --git a/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java b/src/test/java/com/sparrowwallet/sparrow/io/StorageTest.java
@@ -7,6 +7,7 @@
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.MnemonicException;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -15,6 +16,7 @@
 public class StorageTest extends IoTest {
  @Test
  public void loadWallet() throws IOException, MnemonicException, StorageException {
+ System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, "true");
  Storage storage = new Storage(getFile("sparrow-single-wallet"));
  Wallet wallet = storage.loadEncryptedWallet("pass").getWallet();
  Assertions.assertTrue(wallet.isValid());
@@ -64,6 +66,7 @@ public void multipleLoadTest() throws IOException, MnemonicException, StorageExc
 
  @Test
  public void saveWallet() throws IOException, MnemonicException, StorageException {
+ System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, "true");
  Storage storage = new Storage(getFile("sparrow-single-wallet"));
  Wallet wallet = storage.loadEncryptedWallet("pass").getWallet();
  Assertions.assertTrue(wallet.isValid());
@@ -80,4 +83,9 @@ public void saveWallet() throws IOException, MnemonicException, StorageException
  wallet = temp2Storage.loadEncryptedWallet("pass").getWallet();
  Assertions.assertTrue(wallet.isValid());
  }
+
+ @AfterEach
+ void tearDown() {
+ System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, "false");
+ }
 }
diff --git a/src/test/resources/com/sparrowwallet/sparrow/io/cc-multisig-export-1.txt b/src/test/resources/com/sparrowwallet/sparrow/io/cc-multisig-export-1.txt
@@ -2,7 +2,7 @@
 #
 Name: CC-2-of-4
 Policy: 2 of 4
-Derivation: m/48'/1'/0'/2'
+Derivation: m/48'/0'/0'/2'
 Format: P2WSH
 
 0F056943: xpub6EfEGa5isJbQFSswM5Uptw5BSq2Td1ZDJr3QUNUcMySpC7itZ3ccypVHtLPnvMzKQ2qxrAgH49vhVxRcaQLFbixAVRR8RACrYTp88Uv9h8Z