diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java index 8dddd186..edfee7b3 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -23,7 +23,6 @@ import com.google.bitcoin.crypto.KeyCrypterException; import com.google.bitcoin.crypto.KeyCrypterScrypt; import com.google.bitcoin.store.WalletProtobufSerializer; import com.google.bitcoin.utils.Locks; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.*; @@ -1732,7 +1731,7 @@ public class Wallet implements Serializable, BlockChainListener { public KeyParameter aesKey = null; // Tracks if this has been passed to wallet.completeTx already: just a safety check. - @VisibleForTesting boolean completed; + private boolean completed; private SendRequest() {} diff --git a/core/src/test/java/com/google/bitcoin/core/WalletTest.java b/core/src/test/java/com/google/bitcoin/core/WalletTest.java index 3832f348..1c93dea3 100644 --- a/core/src/test/java/com/google/bitcoin/core/WalletTest.java +++ b/core/src/test/java/com/google/bitcoin/core/WalletTest.java @@ -1457,8 +1457,8 @@ public class WalletTest extends TestWithWallet { assertEquals(1, request19.tx.getInputs().size()); assertEquals(100, request19.tx.getOutputs().size()); // Now reset request19 and give it a fee per kb - request19.completed = false; request19.tx.clearInputs(); + request19 = SendRequest.forTx(request19.tx); request19.feePerKb = BigInteger.ONE; assertTrue(wallet.completeTx(request19)); 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(100, request20.tx.getOutputs().size()); // 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; assertTrue(wallet.completeTx(request20)); // 4kb tx.