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

Make SendRequest.completed back to being private.

Browse Source
This commit is contained in:
Mike Hearn 2013-06-12 17:26:12 +02:00
parent 87ab410a2f
commit c91e811fc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -23,7 +23,6 @@ import com.google.bitcoin.crypto.KeyCrypterException;
import com.google.bitcoin.crypto.KeyCrypterScrypt; import com.google.bitcoin.crypto.KeyCrypterScrypt;
import com.google.bitcoin.store.WalletProtobufSerializer; import com.google.bitcoin.store.WalletProtobufSerializer;
import com.google.bitcoin.utils.Locks; import com.google.bitcoin.utils.Locks;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.*; import com.google.common.collect.*;
@ -1732,7 +1731,7 @@ public class Wallet implements Serializable, BlockChainListener {
public KeyParameter aesKey = null; public KeyParameter aesKey = null;
// Tracks if this has been passed to wallet.completeTx already: just a safety check. // Tracks if this has been passed to wallet.completeTx already: just a safety check.
@VisibleForTesting boolean completed; private boolean completed;
private SendRequest() {} private SendRequest() {}

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

@ -1457,8 +1457,8 @@ public class WalletTest extends TestWithWallet {
assertEquals(1, request19.tx.getInputs().size()); assertEquals(1, request19.tx.getInputs().size());
assertEquals(100, request19.tx.getOutputs().size()); assertEquals(100, request19.tx.getOutputs().size());
// Now reset request19 and give it a fee per kb // Now reset request19 and give it a fee per kb
request19.completed = false;
request19.tx.clearInputs(); request19.tx.clearInputs();
request19 = SendRequest.forTx(request19.tx);
request19.feePerKb = BigInteger.ONE; request19.feePerKb = BigInteger.ONE;
assertTrue(wallet.completeTx(request19)); assertTrue(wallet.completeTx(request19));
assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request19.fee); assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request19.fee);
@ -1482,7 +1482,8 @@ public class WalletTest extends TestWithWallet {
assertEquals(1, request20.tx.getInputs().size()); assertEquals(1, request20.tx.getInputs().size());
assertEquals(100, request20.tx.getOutputs().size()); assertEquals(100, request20.tx.getOutputs().size());
// Now reset request19 and give it a fee per kb // Now reset request19 and give it a fee per kb
request20.completed = false; request20.tx.clearInputs(); request20.tx.clearInputs();
request20 = SendRequest.forTx(request20.tx);
request20.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE; request20.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
assertTrue(wallet.completeTx(request20)); assertTrue(wallet.completeTx(request20));
// 4kb tx. // 4kb tx.