Add comments to explain initial messages exchanged with contacts.

This commit is contained in:
akwizgran
2022-05-13 13:40:32 +01:00
parent 418ab99a3c
commit 00b7518e49
2 changed files with 29 additions and 5 deletions

View File

@@ -345,11 +345,16 @@ public class TransportKeyAgreementIntegrationTest
.canSendOutgoingStreams(aliceId, DUPLEX_TRANSPORT_ID)); .canSendOutgoingStreams(aliceId, DUPLEX_TRANSPORT_ID));
} }
// Sync initial client versioning updates and mailbox updates // Sync client versioning update from Alice to Bob
syncMessage(alice, bob, bobId, 1, true); syncMessage(alice, bob, bobId, 1, true);
// Sync client versioning update and ack from Bob to Alice
syncMessage(bob, alice, aliceId, 1, true); syncMessage(bob, alice, aliceId, 1, true);
// Sync second client versioning update, mailbox properties and ack
// from Alice to Bob
syncMessage(alice, bob, bobId, 2, true); syncMessage(alice, bob, bobId, 2, true);
// Sync mailbox properties and ack from Bob to Alice
syncMessage(bob, alice, aliceId, 1, true); syncMessage(bob, alice, aliceId, 1, true);
// Sync final ack from Alice to Bob
sendAcks(alice, bob, bobId, 1); sendAcks(alice, bob, bobId, 1);
return new Pair<>(aliceId, bobId); return new Pair<>(aliceId, bobId);

View File

@@ -172,17 +172,28 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
true); true);
contact0From2 = contactManager2.getContact(contactId0From2); contact0From2 = contactManager2.getContact(contactId0From2);
// Sync initial client versioning updates and mailbox updates // Sync client versioning update from 0 to 1
sync0To1(1, true); sync0To1(1, true);
// Sync client versioning update and ack from 1 to 0
sync1To0(1, true); sync1To0(1, true);
// Sync second client versioning update, mailbox properties and ack
// from 0 to 1
sync0To1(2, true); sync0To1(2, true);
// Sync mailbox properties and ack from 1 to 0
sync1To0(1, true); sync1To0(1, true);
// Sync final ack from 0 to 1
ack0To1(1); ack0To1(1);
// Sync client versioning update from 0 to 2
sync0To2(1, true); sync0To2(1, true);
// Sync client versioning update and ack from 2 to 0
sync2To0(1, true); sync2To0(1, true);
// Sync second client versioning update, mailbox properties and ack
// from 0 to 2
sync0To2(2, true); sync0To2(2, true);
// Sync mailbox properties and ack from 2 to 0
sync2To0(1, true); sync2To0(1, true);
// Sync final ack from 0 to 2
ack0To2(1); ack0To2(1);
} }
@@ -199,18 +210,26 @@ public abstract class BriarIntegrationTest<C extends BriarIntegrationTestCompone
rootKey1_2, c2.getClock().currentTimeMillis(), false, true, rootKey1_2, c2.getClock().currentTimeMillis(), false, true,
true); true);
// Sync initial client versioning updates // Sync initial client versioning update from 1 to 2
sync1To2(1, true); sync1To2(1, true);
// Sync initial client versioning update and ack from 2 to 1
sync2To1(1, true); sync2To1(1, true);
// Sync 2nd client versioning msg from 1to2, mailbox updates, and
// transport properties if we should
if (haveTransportProperties) { if (haveTransportProperties) {
// Sync second client versioning update, mailbox properties,
// transport properties and ack from 1 to 2
sync1To2(3, true); sync1To2(3, true);
// Sync mailbox properties, transport properties and acks
// from 2 to 1
sync2To1(2, true); sync2To1(2, true);
// Sync final acks from 1 to 2
ack1To2(2); ack1To2(2);
} else { } else {
// Sync second client versioning update, mailbox properties
// and ack from 1 to 2
sync1To2(2, true); sync1To2(2, true);
// Sync mailbox properties and acks from 2 to 1
sync2To1(1, true); sync2To1(1, true);
// Sync final ack from 1 to 2
ack1To2(1); ack1To2(1);
} }
} }