Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Switch TestWithWallet to be using an HD key by default.

Browse Source
This commit is contained in:
Mike Hearn 2014-04-04 16:17:52 +02:00
parent d9fa9e4b68
commit 2ce5c16815
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/google/bitcoin/testing/TestWithWallet.java
View File

@ -51,11 +51,10 @@ public class TestWithWallet {
public void setUp() throws Exception { public void setUp() throws Exception {
BriefLogFormatter.init(); BriefLogFormatter.init();
Wallet.SendRequest.DEFAULT_FEE_PER_KB = BigInteger.ZERO; Wallet.SendRequest.DEFAULT_FEE_PER_KB = BigInteger.ZERO;
myKey = new ECKey();
myAddress = myKey.toAddress(params);
wallet = new Wallet(params); wallet = new Wallet(params);
wallet.setKeychainLookaheadSize(5); wallet.setKeychainLookaheadSize(5);
wallet.importKey(myKey); myKey = wallet.currentReceiveKey();
myAddress = myKey.toAddress(params);
blockStore = new MemoryBlockStore(params); blockStore = new MemoryBlockStore(params);
chain = new BlockChain(params, wallet, blockStore); chain = new BlockChain(params, wallet, blockStore);
} }

13
core/src/test/java/com/google/bitcoin/core/WalletTest.java
View File

@ -1097,15 +1097,14 @@ public class WalletTest extends TestWithWallet {
@Test(expected = ECKey.MissingPrivateKeyException.class) @Test(expected = ECKey.MissingPrivateKeyException.class)
public void watchingWallet() throws Exception { public void watchingWallet() throws Exception {
DeterministicKey key = wallet.freshReceiveKey();
DeterministicKey watchKey = wallet.getWatchingKey(); DeterministicKey watchKey = wallet.getWatchingKey();
String serialized = watchKey.serializePubB58(); String serialized = watchKey.serializePubB58();
watchKey = DeterministicKey.deserializeB58(null, serialized); watchKey = DeterministicKey.deserializeB58(null, serialized);
Wallet watchingWallet = Wallet.fromWatchingKey(params, watchKey); Wallet watchingWallet = Wallet.fromWatchingKey(params, watchKey);
DeterministicKey key2 = watchingWallet.freshReceiveKey(); DeterministicKey key2 = watchingWallet.freshReceiveKey();
assertEquals(key, key2); assertEquals(myKey, key2);
key = wallet.freshKey(KeyChain.KeyPurpose.CHANGE); ECKey key = wallet.freshKey(KeyChain.KeyPurpose.CHANGE);
key2 = watchingWallet.freshKey(KeyChain.KeyPurpose.CHANGE); key2 = watchingWallet.freshKey(KeyChain.KeyPurpose.CHANGE);
assertEquals(key, key2); assertEquals(key, key2);
key.sign(Sha256Hash.ZERO_HASH); key.sign(Sha256Hash.ZERO_HASH);
@ -1141,13 +1140,13 @@ public class WalletTest extends TestWithWallet {
@Test @Test
public void watchingScriptsSentFrom() throws Exception { public void watchingScriptsSentFrom() throws Exception {
assertEquals(2, wallet.getBloomFilterElementCount()); int baseElements = wallet.getBloomFilterElementCount();
ECKey key = new ECKey(); ECKey key = new ECKey();
ECKey notMyAddr = new ECKey(); ECKey notMyAddr = new ECKey();
Address watchedAddress = key.toAddress(params); Address watchedAddress = key.toAddress(params);
wallet.addWatchedAddress(watchedAddress); wallet.addWatchedAddress(watchedAddress);
assertEquals(3, wallet.getBloomFilterElementCount()); assertEquals(baseElements + 1, wallet.getBloomFilterElementCount());
Transaction t1 = createFakeTx(params, CENT, watchedAddress); Transaction t1 = createFakeTx(params, CENT, watchedAddress);
Transaction t2 = createFakeTx(params, COIN, notMyAddr); Transaction t2 = createFakeTx(params, COIN, notMyAddr);
@ -1158,9 +1157,9 @@ public class WalletTest extends TestWithWallet {
st2.addInput(t1.getOutput(0)); st2.addInput(t1.getOutput(0));
st2.addInput(t2.getOutput(0)); st2.addInput(t2.getOutput(0));
wallet.receiveFromBlock(t1, b1, BlockChain.NewBlockType.BEST_CHAIN, 0); wallet.receiveFromBlock(t1, b1, BlockChain.NewBlockType.BEST_CHAIN, 0);
assertEquals(4, wallet.getBloomFilterElementCount()); assertEquals(baseElements + 2, wallet.getBloomFilterElementCount());
wallet.receiveFromBlock(st2, b1, BlockChain.NewBlockType.BEST_CHAIN, 0); wallet.receiveFromBlock(st2, b1, BlockChain.NewBlockType.BEST_CHAIN, 0);
assertEquals(4, wallet.getBloomFilterElementCount()); assertEquals(baseElements + 2, wallet.getBloomFilterElementCount());
assertEquals(CENT, st2.getValueSentFromMe(wallet)); assertEquals(CENT, st2.getValueSentFromMe(wallet));
} }