Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Payment channels: add a method to obtain the seconds remaining until next channel expiry for a given server ID.

Browse Source 
This is useful for UIs that need to tell the user what's going on when there's a connect-back failure.
This commit is contained in:
Mike Hearn 2013-10-24 11:12:18 +02:00
parent 5a3aa5d6e1
commit 6ec7880079
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/main/java/com/google/bitcoin/protocols/channels/StoredPaymentChannelClientStates.java
View File

@ -86,11 +86,33 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
}
}
/**
* Returns the number of seconds from now until this servers next channel will expire, or zero if no unexpired
* channels found.
*/
public long getSecondsUntilExpiry(Sha256Hash id) {
lock.lock();
try {
final Set<StoredClientChannel> setChannels = mapChannels.get(id);
final long nowSeconds = Utils.now().getTime() / 1000;
int earliestTime = Integer.MAX_VALUE;
for (StoredClientChannel channel : setChannels) {
synchronized (channel) {
if (channel.expiryTimeSeconds() > nowSeconds)
earliestTime = Math.min(earliestTime, (int) channel.expiryTimeSeconds());
}
}
return earliestTime == Integer.MAX_VALUE ? 0 : earliestTime - nowSeconds;
} finally {
lock.unlock();
}
}
/**
* Finds an inactive channel with the given id and returns it, or returns null.
*/
@Nullable
public StoredClientChannel getUsableChannelForServerID(Sha256Hash id) {
StoredClientChannel getUsableChannelForServerID(Sha256Hash id) {
lock.lock();
try {
Set<StoredClientChannel> setChannels = mapChannels.get(id);
@ -119,7 +141,7 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
/**
* Finds a channel with the given id and contract hash and returns it, or returns null.
*/
public StoredClientChannel getChannel(Sha256Hash id, Sha256Hash contractHash) {
StoredClientChannel getChannel(Sha256Hash id, Sha256Hash contractHash) {
lock.lock();
try {
Set<StoredClientChannel> setChannels = mapChannels.get(id);
@ -137,7 +159,7 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
* Adds the given channel to this set of stored states, broadcasting the contract and refund transactions when the
* channel expires and notifies the wallet of an update to this wallet extension
*/
public void putChannel(final StoredClientChannel channel) {
void putChannel(final StoredClientChannel channel) {
putChannel(channel, true);
}
@ -154,7 +176,7 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
announcePeerGroup.broadcastTransaction(channel.refund);
}
// Add the difference between real time and Utils.now() so that test-cases can use a mock clock.
}, new Date((channel.refund.getLockTime() + 60 * 5) * 1000 + (System.currentTimeMillis() - Utils.now().getTime())));
}, new Date(channel.expiryTimeSeconds() * 1000 + (System.currentTimeMillis() - Utils.now().getTime())));
} finally {
lock.unlock();
}
@ -170,7 +192,7 @@ public class StoredPaymentChannelClientStates implements WalletExtension {
* {@link TransactionBroadcaster} as long as this {@link StoredPaymentChannelClientStates} continues to
* exist in memory.</p>
*/
public void removeChannel(StoredClientChannel channel) {
void removeChannel(StoredClientChannel channel) {
lock.lock();
try {
mapChannels.remove(channel.id, channel);
@ -285,6 +307,10 @@ class StoredClientChannel {
this.active = active;
}
long expiryTimeSeconds() {
return refund.getLockTime() + 60 * 5;
}
@Override
public String toString() {
final String newline = String.format("%n");

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

@ -376,14 +376,15 @@ public class ChannelConnectionTest extends TestWithWallet {
// Verify the previous one was closed.
openPair.serverRecorder.checkNextMsg(MessageType.CLOSE);
assertTrue(clientStoredChannels.getChannel(Sha256Hash.create(new byte[]{}), contractHash).active);
assertTrue(clientStoredChannels.getChannel(someServerId, contractHash).active);
// And finally close the first channel too.
openClient.connectionClosed();
assertFalse(clientStoredChannels.getChannel(Sha256Hash.create(new byte[]{}), contractHash).active);
assertFalse(clientStoredChannels.getChannel(someServerId, contractHash).active);
// Now roll the mock clock and recreate the client object so that it removes the channels and announces refunds.
Utils.rollMockClock(60 * 60 * 24 + 60*5); // Client announces refund 5 minutes after expire time
assertEquals(86640, clientStoredChannels.getSecondsUntilExpiry(someServerId));
Utils.rollMockClock(60 * 60 * 24 + 60 * 5); // Client announces refund 5 minutes after expire time
StoredPaymentChannelClientStates newClientStates = new StoredPaymentChannelClientStates(wallet, mockBroadcaster);
newClientStates.deserializeWalletExtension(wallet, clientStoredChannels.serializeWalletExtension());
broadcastTxPause.release();