mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-22 22:25:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

WalletAppKit: make walletFactory @Nonnull

Browse source 
This is a minor breaking change. If anyone is calling `setWalletFactory(null)` they
will need to replace it with `setWalletFactory(WalletProtobufSerializer.WalletFactory.DEFAULT)`.

A `checkNotNull` makes sure anyone doing this should discover the problem as early
as possible.
This commit is contained in:
Sean Gilligan 2022-03-30 14:18:55 -07:00 • committed by Andreas Schildbach
parent 04a9834e0a
commit 3c6e7e0b37
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
View file

@ -81,7 +81,7 @@ public class WalletAppKit extends AbstractIdleService {
protected InputStream checkpoints; protected InputStream checkpoints;
protected boolean blockingStartup = true; protected boolean blockingStartup = true;
protected String userAgent, version; protected String userAgent, version;
protected WalletProtobufSerializer.WalletFactory walletFactory; @Nonnull protected WalletProtobufSerializer.WalletFactory walletFactory = WalletProtobufSerializer.WalletFactory.DEFAULT;
@Nullable protected DeterministicSeed restoreFromSeed; @Nullable protected DeterministicSeed restoreFromSeed;
@Nullable protected DeterministicKey restoreFromKey; @Nullable protected DeterministicKey restoreFromKey;
@Nullable protected PeerDiscovery discovery; @Nullable protected PeerDiscovery discovery;
@ -193,8 +193,11 @@ public class WalletAppKit extends AbstractIdleService {
/** /**
* Sets a wallet factory which will be used when the kit creates a new wallet. * Sets a wallet factory which will be used when the kit creates a new wallet.
* @param walletFactory Factory for making new wallets (Use {@link WalletProtobufSerializer.WalletFactory#DEFAULT} for default behavior)
* @return WalletAppKit for method chaining purposes
*/ */
public WalletAppKit setWalletFactory(WalletProtobufSerializer.WalletFactory walletFactory) { public WalletAppKit setWalletFactory(@Nonnull WalletProtobufSerializer.WalletFactory walletFactory) {
checkNotNull(walletFactory);
this.walletFactory = walletFactory; this.walletFactory = walletFactory;
return this; return this;
} }
@ -407,11 +410,7 @@ public class WalletAppKit extends AbstractIdleService {
List<WalletExtension> extensions = provideWalletExtensions(); List<WalletExtension> extensions = provideWalletExtensions();
WalletExtension[] extArray = extensions.toArray(new WalletExtension[extensions.size()]); WalletExtension[] extArray = extensions.toArray(new WalletExtension[extensions.size()]);
Protos.Wallet proto = WalletProtobufSerializer.parseToProto(walletStream); Protos.Wallet proto = WalletProtobufSerializer.parseToProto(walletStream);
final WalletProtobufSerializer serializer; final WalletProtobufSerializer serializer = new WalletProtobufSerializer(walletFactory);
if (walletFactory != null)
serializer = new WalletProtobufSerializer(walletFactory);
else
serializer = new WalletProtobufSerializer();
wallet = serializer.readWallet(params, extArray, proto); wallet = serializer.readWallet(params, extArray, proto);
if (shouldReplayWallet) if (shouldReplayWallet)
wallet.reset(); wallet.reset();
@ -427,11 +426,8 @@ public class WalletAppKit extends AbstractIdleService {
kcg.fromKey(restoreFromKey, preferredOutputScriptType).build(); kcg.fromKey(restoreFromKey, preferredOutputScriptType).build();
else else
kcg.fromRandom(preferredOutputScriptType); kcg.fromRandom(preferredOutputScriptType);
if (walletFactory != null) {
return walletFactory.create(params, kcg.build()); return walletFactory.create(params, kcg.build());
} else {
return new Wallet(params, kcg.build()); // default
}
} }
private void maybeMoveOldWalletOutOfTheWay() { private void maybeMoveOldWalletOutOfTheWay() {