Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-19 13:45:48 +00:00
Code Issues Projects Releases Wiki Activity

Wallet: more @Nullable annotations and generalise the sendCoins argument to take any broadcaster.

Browse Source
This commit is contained in:
Mike Hearn 2013-07-29 18:35:49 +02:00
parent 435d4e85b0
commit bbac0abf9e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1749,11 +1749,12 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi
* successfully broadcast. This means that even if the network hasn't heard about your transaction you won't be * successfully broadcast. This means that even if the network hasn't heard about your transaction you won't be
* able to spend those same coins again.</p> * able to spend those same coins again.</p>
* *
* @param peerGroup a PeerGroup to use for broadcast or null. * @param broadcaster the target to use for broadcast.
* @param request the SendRequest that describes what to do, get one using static methods on SendRequest itself. * @param request the SendRequest that describes what to do, get one using static methods on SendRequest itself.
* @return An object containing the transaction that was created, and a future for the broadcast of it. * @return An object containing the transaction that was created, and a future for the broadcast of it.
*/ */
public SendResult sendCoins(PeerGroup peerGroup, SendRequest request) { @Nullable
public SendResult sendCoins(TransactionBroadcaster broadcaster, SendRequest request) {
// Does not need to be synchronized as sendCoinsOffline is and the rest is all thread-local. // Does not need to be synchronized as sendCoinsOffline is and the rest is all thread-local.
// Commit the TX to the wallet immediately so the spent coins won't be reused. // Commit the TX to the wallet immediately so the spent coins won't be reused.
@ -1768,7 +1769,7 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi
// count of seen peers, the memory pool will update the transaction confidence object, that will invoke the // count of seen peers, the memory pool will update the transaction confidence object, that will invoke the
// txConfidenceListener which will in turn invoke the wallets event listener onTransactionConfidenceChanged // txConfidenceListener which will in turn invoke the wallets event listener onTransactionConfidenceChanged
// method. // method.
result.broadcastComplete = peerGroup.broadcastTransaction(tx); result.broadcastComplete = broadcaster.broadcastTransaction(tx);
return result; return result;
} }
@ -1781,6 +1782,7 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi
* @return The {@link Transaction} that was created or null if there was insufficient balance to send the coins. * @return The {@link Transaction} that was created or null if there was insufficient balance to send the coins.
* @throws IOException if there was a problem broadcasting the transaction * @throws IOException if there was a problem broadcasting the transaction
*/ */
@Nullable
public Transaction sendCoins(Peer peer, SendRequest request) throws IOException { public Transaction sendCoins(Peer peer, SendRequest request) throws IOException {
Transaction tx = sendCoinsOffline(request); Transaction tx = sendCoinsOffline(request);
if (tx == null) if (tx == null)