mirror of
https://github.com/sparrowwallet/sparrow.git
synced 2024-12-24 12:46:45 +00:00
fix encrypted storage test
This commit is contained in:
parent
827d35cba3
commit
e7c83e1d3f
1 changed files with 18 additions and 4 deletions
|
@ -1,11 +1,9 @@
|
||||||
package com.sparrowwallet.sparrow.io;
|
package com.sparrowwallet.sparrow.io;
|
||||||
|
|
||||||
import com.sparrowwallet.drongo.Utils;
|
import com.sparrowwallet.drongo.Utils;
|
||||||
import com.sparrowwallet.drongo.crypto.ECIESKeyCrypter;
|
|
||||||
import com.sparrowwallet.drongo.crypto.ECKey;
|
|
||||||
import com.sparrowwallet.drongo.crypto.Pbkdf2KeyDeriver;
|
|
||||||
import com.sparrowwallet.drongo.policy.PolicyType;
|
import com.sparrowwallet.drongo.policy.PolicyType;
|
||||||
import com.sparrowwallet.drongo.protocol.ScriptType;
|
import com.sparrowwallet.drongo.protocol.ScriptType;
|
||||||
|
import com.sparrowwallet.drongo.wallet.Keystore;
|
||||||
import com.sparrowwallet.drongo.wallet.MnemonicException;
|
import com.sparrowwallet.drongo.wallet.MnemonicException;
|
||||||
import com.sparrowwallet.drongo.wallet.Wallet;
|
import com.sparrowwallet.drongo.wallet.Wallet;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
|
@ -24,7 +22,23 @@ public class StorageTest extends IoTest {
|
||||||
@Test
|
@Test
|
||||||
public void loadSeedWallet() throws IOException, MnemonicException, StorageException {
|
public void loadSeedWallet() throws IOException, MnemonicException, StorageException {
|
||||||
Storage storage = new Storage(getFile("sparrow-single-seed-wallet"));
|
Storage storage = new Storage(getFile("sparrow-single-seed-wallet"));
|
||||||
Wallet wallet = storage.loadWallet("pass").wallet;
|
Storage.WalletAndKey walletAndKey = storage.loadWallet("pass");
|
||||||
|
Wallet wallet = walletAndKey.wallet;
|
||||||
|
Wallet copy = wallet.copy();
|
||||||
|
copy.decrypt(walletAndKey.key);
|
||||||
|
|
||||||
|
for(int i = 0; i < wallet.getKeystores().size(); i++) {
|
||||||
|
Keystore keystore = wallet.getKeystores().get(i);
|
||||||
|
if(keystore.hasSeed()) {
|
||||||
|
Keystore copyKeystore = copy.getKeystores().get(i);
|
||||||
|
Keystore derivedKeystore = Keystore.fromSeed(copyKeystore.getSeed(), copyKeystore.getKeyDerivation().getDerivation());
|
||||||
|
keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
|
||||||
|
keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
|
||||||
|
keystore.getSeed().setPassphrase(copyKeystore.getSeed().getPassphrase());
|
||||||
|
copyKeystore.getSeed().clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Assert.assertTrue(wallet.isValid());
|
Assert.assertTrue(wallet.isValid());
|
||||||
|
|
||||||
Assert.assertEquals("testd2", wallet.getName());
|
Assert.assertEquals("testd2", wallet.getName());
|
||||||
|
|
Loading…
Reference in a new issue