mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-20 02:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Payment channels: split CLOSE message processing on the server side into a separate method.

Browse Source
This commit is contained in:
Mike Hearn 2013-10-16 16:14:12 +02:00
parent 31a4c08615
commit 5b28091c9a
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
core/src/main/java/com/google/bitcoin/protocols/channels/PaymentChannelServer.java
View File

@ -305,35 +305,7 @@ public class PaymentChannelServer {
receiveUpdatePaymentMessage(msg);
return;
case CLOSE:
log.info("Got CLOSE message, closing channel");
connectionClosing = true;
if (state != null) {
Futures.addCallback(state.close(), new FutureCallback<Transaction>() {
@Override
public void onSuccess(Transaction result) {
// Send the successfully accepted transaction back to the client.
final Protos.TwoWayChannelMessage.Builder msg = Protos.TwoWayChannelMessage.newBuilder();
msg.setType(Protos.TwoWayChannelMessage.MessageType.CLOSE);
if (result != null) {
// Result can be null on various error paths, like if we never actually opened
// properly and so on.
msg.getCloseBuilder().setTx(ByteString.copyFrom(result.bitcoinSerialize()));
}
log.info("Sending CLOSE back with finalized broadcast contract.");
conn.sendToClient(msg.build());
// The client is expected to hang up the TCP connection after we send back the
// CLOSE message.
}
@Override
public void onFailure(Throwable t) {
log.error("Failed to broadcast close TX", t);
conn.destroyConnection(CloseReason.CLIENT_REQUESTED_CLOSE);
}
});
} else {
conn.destroyConnection(CloseReason.CLIENT_REQUESTED_CLOSE);
}
receiveCloseMessage();
return;
case ERROR:
checkState(msg.hasError());
@ -376,6 +348,39 @@ public class PaymentChannelServer {
}
}
@GuardedBy("lock")
private void receiveCloseMessage() throws ValueOutOfRangeException {
log.info("Got CLOSE message, closing channel");
connectionClosing = true;
if (state != null) {
Futures.addCallback(state.close(), new FutureCallback<Transaction>() {
@Override
public void onSuccess(Transaction result) {
// Send the successfully accepted transaction back to the client.
final Protos.TwoWayChannelMessage.Builder msg = Protos.TwoWayChannelMessage.newBuilder();
msg.setType(Protos.TwoWayChannelMessage.MessageType.CLOSE);
if (result != null) {
// Result can be null on various error paths, like if we never actually opened
// properly and so on.
msg.getCloseBuilder().setTx(ByteString.copyFrom(result.bitcoinSerialize()));
}
log.info("Sending CLOSE back with finalized broadcast contract.");
conn.sendToClient(msg.build());
// The client is expected to hang up the TCP connection after we send back the
// CLOSE message.
}
@Override
public void onFailure(Throwable t) {
log.error("Failed to broadcast close TX", t);
conn.destroyConnection(CloseReason.CLIENT_REQUESTED_CLOSE);
}
});
} else {
conn.destroyConnection(CloseReason.CLIENT_REQUESTED_CLOSE);
}
}
/**
* <p>Called when the connection terminates. Notifies the {@link StoredServerChannel} object that we can attempt to
* resume this channel in the future and stops generating messages for the client.</p>