WalletAppKit: simplify by using the Wallet.loadFromFile()

This commit is contained in:
Sean Gilligan 2022-04-13 19:53:36 -07:00 committed by Andreas Schildbach
parent bb8687f278
commit 9423d02b4d

View file

@ -405,17 +405,8 @@ public class WalletAppKit extends AbstractIdleService {
}
private Wallet loadWallet(boolean shouldReplayWallet) throws Exception {
Wallet wallet;
try (FileInputStream walletStream = new FileInputStream(vWalletFile)) {
List<WalletExtension> extensions = provideWalletExtensions();
WalletExtension[] extArray = extensions.toArray(new WalletExtension[extensions.size()]);
Protos.Wallet proto = WalletProtobufSerializer.parseToProto(walletStream);
final WalletProtobufSerializer serializer = new WalletProtobufSerializer(walletFactory);
wallet = serializer.readWallet(params, extArray, proto);
if (shouldReplayWallet)
wallet.reset();
}
return wallet;
WalletExtension[] extensions = provideWalletExtensions().toArray(new WalletExtension[0]);
return Wallet.loadFromFile(vWalletFile, walletFactory, shouldReplayWallet, false, extensions );
}
protected Wallet createWallet() {