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: Don't swallow ValueOutOfRangeException during initiate.

Browse Source 
It indicates an empty wallet and should be propagated to the channel open future or the client user, so they know they have insufficient money.
This commit is contained in:
Mike Hearn 2013-09-17 16:31:56 +02:00
parent d4786acb14
commit 9bc91ec2e5
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/google/bitcoin/protocols/channels/PaymentChannelClient.java
View File

@ -201,7 +201,7 @@ public class PaymentChannelClient {
* Called when a message is received from the server. Processes the given message and generates events based on its * Called when a message is received from the server. Processes the given message and generates events based on its
* content. * content.
*/ */
public void receiveMessage(Protos.TwoWayChannelMessage msg) { public void receiveMessage(Protos.TwoWayChannelMessage msg) throws ValueOutOfRangeException {
lock.lock(); lock.lock();
try { try {
checkState(connectionOpen); checkState(connectionOpen);
@ -274,12 +274,6 @@ public class PaymentChannelClient {
.setCode(Protos.Error.ErrorCode.BAD_TRANSACTION) .setCode(Protos.Error.ErrorCode.BAD_TRANSACTION)
.setExplanation(e.getMessage()); .setExplanation(e.getMessage());
closeReason = CloseReason.REMOTE_SENT_INVALID_MESSAGE; closeReason = CloseReason.REMOTE_SENT_INVALID_MESSAGE;
} catch (ValueOutOfRangeException e) {
log.error("Caught value out of range exception handling message from server", e);
errorBuilder = Protos.Error.newBuilder()
.setCode(Protos.Error.ErrorCode.BAD_TRANSACTION)
.setExplanation(e.getMessage());
closeReason = CloseReason.REMOTE_SENT_INVALID_MESSAGE;
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
log.error("Caught illegal state exception handling message from server", e); log.error("Caught illegal state exception handling message from server", e);
errorBuilder = Protos.Error.newBuilder() errorBuilder = Protos.Error.newBuilder()

9
core/src/main/java/com/google/bitcoin/protocols/channels/PaymentChannelClientConnection.java
View File

@ -88,8 +88,13 @@ public class PaymentChannelClientConnection {
wireParser = new ProtobufParser<Protos.TwoWayChannelMessage>(new ProtobufParser.Listener<Protos.TwoWayChannelMessage>() { wireParser = new ProtobufParser<Protos.TwoWayChannelMessage>(new ProtobufParser.Listener<Protos.TwoWayChannelMessage>() {
@Override @Override
public void messageReceived(ProtobufParser handler, Protos.TwoWayChannelMessage msg) { public void messageReceived(ProtobufParser handler, Protos.TwoWayChannelMessage msg) {
channelClient.receiveMessage(msg); try {
} channelClient.receiveMessage(msg);
} catch (ValueOutOfRangeException e) {
// We should only get this exception during INITIATE, so channelOpen wasn't called yet.
channelOpenFuture.setException(e);
}
}
@Override @Override
public void connectionOpen(ProtobufParser handler) { public void connectionOpen(ProtobufParser handler) {

23
core/src/test/java/com/google/bitcoin/protocols/channels/ChannelConnectionTest.java
View File

@ -504,6 +504,29 @@ public class ChannelConnectionTest extends TestWithWallet {
assertEquals(myValue, refund.getOutput(0).getValue()); assertEquals(myValue, refund.getOutput(0).getValue());
} }
@Test
public void testEmptyWallet() throws Exception {
Wallet emptyWallet = new Wallet(params);
emptyWallet.addKey(new ECKey());
ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
PaymentChannelServer server = pair.server;
PaymentChannelClient client = new PaymentChannelClient(emptyWallet, myKey, Utils.COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder);
client.connectionOpen();
server.connectionOpen();
server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
client.receiveMessage(pair.serverRecorder.checkNextMsg(MessageType.SERVER_VERSION));
try {
client.receiveMessage(Protos.TwoWayChannelMessage.newBuilder()
.setInitiate(Protos.Initiate.newBuilder().setExpireTimeSecs(Utils.now().getTime() / 1000)
.setMinAcceptedChannelSize(Utils.CENT.longValue())
.setMultisigKey(ByteString.copyFrom(new ECKey().getPubKey())))
.setType(MessageType.INITIATE).build());
fail();
} catch (ValueOutOfRangeException expected) {
// This should be thrown.
}
}
@Test @Test
public void testClientResumeNothing() throws Exception { public void testClientResumeNothing() throws Exception {
ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster); ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);