mirror of
https://github.com/bitcoinj/bitcoinj.git
synced 2025-02-24 06:47:54 +01:00
Wallet: remove deprecated constructor
Also: Update unit test that used that constructor, add JavaDoc to replacement constructor.
This commit is contained in:
parent
79fbf5ab02
commit
14217dbd7b
2 changed files with 10 additions and 13 deletions
|
@ -317,18 +317,6 @@ public class Wallet extends BaseTaggableObject
|
||||||
return new Wallet(context, KeyChainGroup.builder(context.getParams()).fromRandom(outputScriptType).build());
|
return new Wallet(context, KeyChainGroup.builder(context.getParams()).fromRandom(outputScriptType).build());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
|
|
||||||
* backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
|
|
||||||
* {@link #loadFromFile}.
|
|
||||||
* @deprecated Use {@link #createDeterministic(Context, ScriptType)}
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
@VisibleForTesting
|
|
||||||
protected Wallet(Context context) {
|
|
||||||
this(context, KeyChainGroup.builder(context.getParams()).fromRandom(Script.ScriptType.P2PKH).build());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new, empty wallet with just a basic keychain and no transactions. No deterministic chains will be created
|
* Creates a new, empty wallet with just a basic keychain and no transactions. No deterministic chains will be created
|
||||||
* automatically. This is meant for when you just want to import a few keys and operate on them.
|
* automatically. This is meant for when you just want to import a few keys and operate on them.
|
||||||
|
@ -443,6 +431,13 @@ public class Wallet extends BaseTaggableObject
|
||||||
throw new IllegalArgumentException(base58.substring(0, 4));
|
throw new IllegalArgumentException(base58.substring(0, 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
|
||||||
|
* backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
|
||||||
|
* {@link #loadFromFile}.
|
||||||
|
* @param params network parameters
|
||||||
|
* @param keyChainGroup keychain group to manage keychains
|
||||||
|
*/
|
||||||
public Wallet(NetworkParameters params, KeyChainGroup keyChainGroup) {
|
public Wallet(NetworkParameters params, KeyChainGroup keyChainGroup) {
|
||||||
this(Context.getOrCreate(params), keyChainGroup);
|
this(Context.getOrCreate(params), keyChainGroup);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,7 @@ import org.bitcoinj.store.BlockStore;
|
||||||
import org.bitcoinj.store.MemoryBlockStore;
|
import org.bitcoinj.store.MemoryBlockStore;
|
||||||
import org.bitcoinj.testing.FakeTxBuilder;
|
import org.bitcoinj.testing.FakeTxBuilder;
|
||||||
import org.bitcoinj.utils.BriefLogFormatter;
|
import org.bitcoinj.utils.BriefLogFormatter;
|
||||||
|
import org.bitcoinj.wallet.KeyChainGroup;
|
||||||
import org.bitcoinj.wallet.Wallet;
|
import org.bitcoinj.wallet.Wallet;
|
||||||
import org.bitcoinj.wallet.Wallet.BalanceType;
|
import org.bitcoinj.wallet.Wallet.BalanceType;
|
||||||
|
|
||||||
|
@ -80,7 +81,8 @@ public class BlockChainTest {
|
||||||
Context.propagate(new Context(TESTNET, 100, Coin.ZERO, false));
|
Context.propagate(new Context(TESTNET, 100, Coin.ZERO, false));
|
||||||
testNetChain = new BlockChain(TESTNET, Wallet.createDeterministic(TESTNET, Script.ScriptType.P2PKH), new MemoryBlockStore(TESTNET));
|
testNetChain = new BlockChain(TESTNET, Wallet.createDeterministic(TESTNET, Script.ScriptType.P2PKH), new MemoryBlockStore(TESTNET));
|
||||||
Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
|
Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
|
||||||
wallet = new Wallet(Context.get()) {
|
NetworkParameters params = Context.get().getParams();
|
||||||
|
wallet = new Wallet(params, KeyChainGroup.builder(params).fromRandom(Script.ScriptType.P2PKH).build()) {
|
||||||
@Override
|
@Override
|
||||||
public void receiveFromBlock(Transaction tx, StoredBlock block, BlockChain.NewBlockType blockType,
|
public void receiveFromBlock(Transaction tx, StoredBlock block, BlockChain.NewBlockType blockType,
|
||||||
int relativityOffset) throws VerificationException {
|
int relativityOffset) throws VerificationException {
|
||||||
|
|
Loading…
Add table
Reference in a new issue