From 33c5e14f909f22ca3772c8111ef26c928ec55dde Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 7 Feb 2011 19:07:40 +0000
Subject: [PATCH] fix SessionEncryptionTest
---
.../net/i2p/crypto/SessionEncryptionTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java b/core/java/test/net/i2p/crypto/SessionEncryptionTest.java
index c6ec05326c..0641db6ab1 100644
--- a/core/java/test/net/i2p/crypto/SessionEncryptionTest.java
+++ b/core/java/test/net/i2p/crypto/SessionEncryptionTest.java
@@ -102,7 +102,8 @@ public class SessionEncryptionTest extends TestCase{
- _context.sessionKeyManager().tagsDelivered(pubKey, curKey, firstTags);
+ TagSetHandle tsh = _context.sessionKeyManager().tagsDelivered(pubKey, curKey, firstTags);
+ _context.sessionKeyManager().tagsAcked(pubKey, curKey, tsh);
curKey = _context.sessionKeyManager().getCurrentKey(pubKey);
SessionTag curTag = _context.sessionKeyManager().consumeNextAvailableTag(pubKey, curKey);
@@ -130,7 +131,8 @@ public class SessionEncryptionTest extends TestCase{
- _context.sessionKeyManager().tagsDelivered(pubKey, curKey, secondTags);
+ tsh = _context.sessionKeyManager().tagsDelivered(pubKey, curKey, secondTags);
+ _context.sessionKeyManager().tagsAcked(pubKey, curKey, tsh);
curKey = _context.sessionKeyManager().getCurrentKey(pubKey);
curTag = _context.sessionKeyManager().consumeNextAvailableTag(pubKey, curKey);
@@ -199,7 +201,8 @@ public class SessionEncryptionTest extends TestCase{
- _context.sessionKeyManager().tagsDelivered(pubKey, curKey, firstTags);
+ TagSetHandle tsh = _context.sessionKeyManager().tagsDelivered(pubKey, curKey, firstTags);
+ _context.sessionKeyManager().tagsAcked(pubKey, curKey, tsh);
curKey = _context.sessionKeyManager().getCurrentKey(pubKey);
SessionTag curTag = _context.sessionKeyManager().consumeNextAvailableTag(pubKey, curKey);
@@ -226,7 +229,8 @@ public class SessionEncryptionTest extends TestCase{
- _context.sessionKeyManager().tagsDelivered(pubKey, nextKey, secondTags); // note nextKey not curKey
+ tsh = _context.sessionKeyManager().tagsDelivered(pubKey, nextKey, secondTags); // note nextKey not curKey
+ _context.sessionKeyManager().tagsAcked(pubKey, nextKey, tsh);
curKey = _context.sessionKeyManager().getCurrentKey(pubKey);
curTag = _context.sessionKeyManager().consumeNextAvailableTag(pubKey, curKey);
@@ -288,9 +292,11 @@ public class SessionEncryptionTest extends TestCase{
if ( (tags != null) && (tags.size() > 0) ) {
if (nextKey == null) {
- _context.sessionKeyManager().tagsDelivered(pubKey, curKey, tags);
+ TagSetHandle tsh = _context.sessionKeyManager().tagsDelivered(pubKey, curKey, tags);
+ _context.sessionKeyManager().tagsAcked(pubKey, curKey, tsh);
} else {
- _context.sessionKeyManager().tagsDelivered(pubKey, nextKey, tags);
+ TagSetHandle tsh = _context.sessionKeyManager().tagsDelivered(pubKey, nextKey, tags);
+ _context.sessionKeyManager().tagsAcked(pubKey, nextKey, tsh);
}
}
}
--
GitLab