Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-15 03:35:52 +00:00
Code Issues Projects Releases Wiki Activity

Wallet: Remove superfluous assignments.

Browse Source
This commit is contained in:
Andreas Schildbach 2016-02-29 19:22:20 +01:00
parent 98bee183b6
commit 843db1dda3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@ -4164,8 +4164,7 @@ public class Wallet extends BaseTaggableObject
TransactionOutput bestChangeOutput = null;
if (!req.emptyWallet) {
// This can throw InsufficientMoneyException.
FeeCalculation feeCalculation;
feeCalculation = calculateFee(req, value, originalInputs, needAtLeastReferenceFee, candidates);
FeeCalculation feeCalculation = calculateFee(req, value, originalInputs, needAtLeastReferenceFee, candidates);
bestCoinSelection = feeCalculation.bestCoinSelection;
bestChangeOutput = feeCalculation.bestChangeOutput;
} else {
@ -5021,7 +5020,6 @@ public class Wallet extends BaseTaggableObject
public FeeCalculation calculateFee(SendRequest req, Coin value, List<TransactionInput> originalInputs,
boolean needAtLeastReferenceFee, List<TransactionOutput> candidates) throws InsufficientMoneyException {
checkState(lock.isHeldByCurrentThread());
FeeCalculation result = new FeeCalculation();
// There are 3 possibilities for what adding change might do:
// 1) No effect
// 2) Causes increase in fee (change < 0.01 COINS)
@ -5174,8 +5172,7 @@ public class Wallet extends BaseTaggableObject
}
Coin lowestFee = null;
result.bestCoinSelection = null;
result.bestChangeOutput = null;
FeeCalculation result = new FeeCalculation();
if (selection1 != null) {
if (selection1Change != null)
lowestFee = selection1.valueGathered.subtract(selection1Change.getValue());