Separate the sync layer from its clients. #112

2026-02-15 12:19:54 +01:00 · 2015-12-21 14:36:24 +00:00
parent f5f572139a
commit 5355951466
117 changed files with 3160 additions and 3465 deletions
--- a/briar-tests/src/org/briarproject/sync/ConstantsTest.java
+++ b/briar-tests/src/org/briarproject/sync/ConstantsTest.java
@@ -15,13 +15,19 @@ import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.KeyPair;
 import org.briarproject.api.crypto.PrivateKey;
 import org.briarproject.api.crypto.Signature;
+import org.briarproject.api.forum.ForumConstants;
+import org.briarproject.api.forum.ForumPost;
+import org.briarproject.api.forum.ForumPostFactory;
 import org.briarproject.api.identity.Author;
 import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.messaging.MessagingConstants;
+import org.briarproject.api.messaging.PrivateMessage;
+import org.briarproject.api.messaging.PrivateMessageFactory;
 import org.briarproject.api.sync.Ack;
+import org.briarproject.api.sync.ClientId;
 import org.briarproject.api.sync.Group;
 import org.briarproject.api.sync.GroupFactory;
-import org.briarproject.api.sync.Message;
-import org.briarproject.api.sync.MessageFactory;
+import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.api.sync.Offer;
 import org.briarproject.api.sync.PacketWriter;
@@ -33,6 +39,8 @@ import org.briarproject.crypto.CryptoModule;
 import org.briarproject.data.DataModule;
 import org.briarproject.db.DatabaseModule;
 import org.briarproject.event.EventModule;
+import org.briarproject.forum.ForumModule;
+import org.briarproject.messaging.MessagingModule;
 import org.junit.Test;

 import java.io.ByteArrayOutputStream;
@@ -43,14 +51,14 @@ import java.util.Random;
 import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
 import static org.briarproject.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
+import static org.briarproject.api.forum.ForumConstants.MAX_FORUM_POST_BODY_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_BODY_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_GROUP_NAME_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_PAYLOAD_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_SUBSCRIPTIONS;
+import static org.briarproject.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH;
+import static org.briarproject.api.sync.SyncConstants.MAX_GROUP_DESCRIPTOR_LENGTH;
+import static org.briarproject.api.sync.SyncConstants.MAX_PACKET_PAYLOAD_LENGTH;
+import static org.briarproject.api.sync.SyncConstants.MAX_SUBSCRIPTIONS;
 import static org.junit.Assert.assertTrue;

 public class ConstantsTest extends BriarTestCase {
@@ -58,18 +66,21 @@ public class ConstantsTest extends BriarTestCase {
 	private final CryptoComponent crypto;
 	private final GroupFactory groupFactory;
 	private final AuthorFactory authorFactory;
-	private final MessageFactory messageFactory;
+	private final PrivateMessageFactory privateMessageFactory;
+	private final ForumPostFactory forumPostFactory;
 	private final PacketWriterFactory packetWriterFactory;

 	public ConstantsTest() throws Exception {
 		Injector i = Guice.createInjector(new TestDatabaseModule(),
 				new TestLifecycleModule(), new TestSystemModule(),
-				new CryptoModule(), new DatabaseModule(), new EventModule(),
-				new SyncModule(), new DataModule());
+				new CryptoModule(), new DatabaseModule(), new DataModule(),
+				new EventModule(), new ForumModule(), new MessagingModule(),
+				new SyncModule());
 		crypto = i.getInstance(CryptoComponent.class);
 		groupFactory = i.getInstance(GroupFactory.class);
 		authorFactory = i.getInstance(AuthorFactory.class);
-		messageFactory = i.getInstance(MessageFactory.class);
+		privateMessageFactory = i.getInstance(PrivateMessageFactory.class);
+		forumPostFactory = i.getInstance(ForumPostFactory.class);
 		packetWriterFactory = i.getInstance(PacketWriterFactory.class);
 	}

@@ -100,14 +111,13 @@ public class ConstantsTest extends BriarTestCase {
 			sig.initSign(keyPair.getPrivate());
 			sig.update(toBeSigned);
 			byte[] signature = sig.sign();
-			assertTrue("Length " + signature.length,
-					signature.length <= MAX_SIGNATURE_LENGTH);
+			assertTrue(signature.length <= MAX_SIGNATURE_LENGTH);
 		}
 	}

 	@Test
 	public void testMessageIdsFitIntoLargeAck() throws Exception {
-		testMessageIdsFitIntoAck(MAX_PAYLOAD_LENGTH);
+		testMessageIdsFitIntoAck(MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	@Test
@@ -116,36 +126,53 @@ public class ConstantsTest extends BriarTestCase {
 	}

 	@Test
-	public void testMessageFitsIntoPacket() throws Exception {
+	public void testPrivateMessageFitsIntoPacket() throws Exception {
+		// Create a maximum-length private message
+		GroupId groupId = new GroupId(TestUtils.getRandomId());
+		long timestamp = Long.MAX_VALUE;
 		MessageId parent = new MessageId(TestUtils.getRandomId());
-		// Create a maximum-length group
-		String groupName = TestUtils.createRandomString(MAX_GROUP_NAME_LENGTH);
-		Group group = groupFactory.createGroup(groupName);
+		String contentType = TestUtils.createRandomString(
+				MessagingConstants.MAX_CONTENT_TYPE_LENGTH);
+		byte[] body = new byte[MAX_PRIVATE_MESSAGE_BODY_LENGTH];
+		PrivateMessage message = privateMessageFactory.createPrivateMessage(
+				groupId, timestamp, parent, contentType, body);
+		// Check the size of the serialised message
+		int length = message.getMessage().getRaw().length;
+		assertTrue(length > UniqueId.LENGTH + 8 + UniqueId.LENGTH
+				+ MessagingConstants.MAX_CONTENT_TYPE_LENGTH
+				+ MAX_PRIVATE_MESSAGE_BODY_LENGTH);
+		assertTrue(length <= MAX_PACKET_PAYLOAD_LENGTH);
+	}
+
+	@Test
+	public void testForumPostFitsIntoPacket() throws Exception {
 		// Create a maximum-length author
-		String authorName =
-				TestUtils.createRandomString(MAX_AUTHOR_NAME_LENGTH);
+		String authorName = TestUtils.createRandomString(
+				MAX_AUTHOR_NAME_LENGTH);
 		byte[] authorPublic = new byte[MAX_PUBLIC_KEY_LENGTH];
 		Author author = authorFactory.createAuthor(authorName, authorPublic);
-		// Create a maximum-length message
-		PrivateKey privateKey = crypto.generateSignatureKeyPair().getPrivate();
-		String contentType =
-				TestUtils.createRandomString(MAX_CONTENT_TYPE_LENGTH);
+		// Create a maximum-length forum post
+		GroupId groupId = new GroupId(TestUtils.getRandomId());
 		long timestamp = Long.MAX_VALUE;
-		byte[] body = new byte[MAX_BODY_LENGTH];
-		Message message = messageFactory.createPseudonymousMessage(parent,
-				group, author, privateKey, contentType, timestamp, body);
+		MessageId parent = new MessageId(TestUtils.getRandomId());
+		String contentType = TestUtils.createRandomString(
+				ForumConstants.MAX_CONTENT_TYPE_LENGTH);
+		byte[] body = new byte[MAX_FORUM_POST_BODY_LENGTH];
+		PrivateKey privateKey = crypto.generateSignatureKeyPair().getPrivate();
+		ForumPost post = forumPostFactory.createPseudonymousPost(groupId,
+				timestamp, parent, author, contentType, body, privateKey);
 		// Check the size of the serialised message
-		int length = message.getSerialised().length;
-		assertTrue(length > UniqueId.LENGTH + MAX_GROUP_NAME_LENGTH
-				+ MAX_PUBLIC_KEY_LENGTH + MAX_AUTHOR_NAME_LENGTH
-				+ MAX_PUBLIC_KEY_LENGTH + MAX_CONTENT_TYPE_LENGTH
-				+ MAX_BODY_LENGTH);
-		assertTrue(length <= MAX_PAYLOAD_LENGTH);
+		int length = post.getMessage().getRaw().length;
+		assertTrue(length > UniqueId.LENGTH + 8 + UniqueId.LENGTH
+				+ MAX_AUTHOR_NAME_LENGTH + MAX_PUBLIC_KEY_LENGTH
+				+ ForumConstants.MAX_CONTENT_TYPE_LENGTH
+				+ MAX_FORUM_POST_BODY_LENGTH);
+		assertTrue(length <= MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	@Test
 	public void testMessageIdsFitIntoLargeOffer() throws Exception {
-		testMessageIdsFitIntoOffer(MAX_PAYLOAD_LENGTH);
+		testMessageIdsFitIntoOffer(MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	@Test
@@ -155,7 +182,7 @@ public class ConstantsTest extends BriarTestCase {

 	@Test
 	public void testMessageIdsFitIntoLargeRequest() throws Exception {
-		testMessageIdsFitIntoRequest(MAX_PAYLOAD_LENGTH);
+		testMessageIdsFitIntoRequest(MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	@Test
@@ -181,16 +208,19 @@ public class ConstantsTest extends BriarTestCase {
 		PacketWriter writer = packetWriterFactory.createPacketWriter(out);
 		writer.writeTransportUpdate(u);
 		// Check the size of the serialised transport update
-		assertTrue(out.size() <= MAX_PAYLOAD_LENGTH);
+		assertTrue(out.size() <= MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	@Test
 	public void testGroupsFitIntoSubscriptionUpdate() throws Exception {
 		// Create the maximum number of maximum-length groups
+		Random random = new Random();
+		ClientId clientId = new ClientId(TestUtils.getRandomId());
 		Collection<Group> groups = new ArrayList<Group>();
 		for (int i = 0; i < MAX_SUBSCRIPTIONS; i++) {
-			String name = TestUtils.createRandomString(MAX_GROUP_NAME_LENGTH);
-			groups.add(groupFactory.createGroup(name));
+			byte[] descriptor = new byte[MAX_GROUP_DESCRIPTOR_LENGTH];
+			random.nextBytes(descriptor);
+			groups.add(groupFactory.createGroup(clientId, descriptor));
 		}
 		// Create a maximum-length subscription update
 		SubscriptionUpdate u = new SubscriptionUpdate(groups, Long.MAX_VALUE);
@@ -199,7 +229,7 @@ public class ConstantsTest extends BriarTestCase {
 		PacketWriter writer = packetWriterFactory.createPacketWriter(out);
 		writer.writeSubscriptionUpdate(u);
 		// Check the size of the serialised subscription update
-		assertTrue(out.size() <= MAX_PAYLOAD_LENGTH);
+		assertTrue(out.size() <= MAX_PACKET_PAYLOAD_LENGTH);
 	}

 	private void testMessageIdsFitIntoAck(int length) throws Exception {
--- a/briar-tests/src/org/briarproject/sync/ConsumersTest.java
+++ b/briar-tests/src/org/briarproject/sync/ConsumersTest.java
@@ -1,100 +0,0 @@
-package org.briarproject.sync;
-
-import org.briarproject.BriarTestCase;
-import org.briarproject.api.FormatException;
-import org.briarproject.api.crypto.MessageDigest;
-import org.junit.Test;
-
-import java.security.GeneralSecurityException;
-import java.util.Random;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class ConsumersTest extends BriarTestCase {
-
-	@Test
-	public void testDigestingConsumer() throws Exception {
-		byte[] data = new byte[1234];
-		// Generate some random data and digest it
-		new Random().nextBytes(data);
-		MessageDigest messageDigest = new TestMessageDigest();
-		messageDigest.update(data);
-		byte[] dig = messageDigest.digest();
-		// Check that feeding a DigestingConsumer generates the same digest
-		DigestingConsumer dc = new DigestingConsumer(messageDigest);
-		dc.write(data[0]);
-		dc.write(data, 1, data.length - 2);
-		dc.write(data[data.length - 1]);
-		byte[] dig1 = messageDigest.digest();
-		assertArrayEquals(dig, dig1);
-	}
-
-	@Test(expected = FormatException.class)
-	public void testCountingConsumer() throws Exception {
-		byte[] data = new byte[1234];
-		CountingConsumer cc = new CountingConsumer(data.length);
-		cc.write(data[0]);
-		cc.write(data, 1, data.length - 2);
-		cc.write(data[data.length - 1]);
-		assertEquals(data.length, cc.getCount());
-		cc.write((byte) 0);
-	}
-
-	@Test
-	public void testCopyingConsumer() throws Exception {
-		byte[] data = new byte[1234];
-		new Random().nextBytes(data);
-		// Check that a CopyingConsumer creates a faithful copy
-		CopyingConsumer cc = new CopyingConsumer();
-		cc.write(data[0]);
-		cc.write(data, 1, data.length - 2);
-		cc.write(data[data.length - 1]);
-		assertArrayEquals(data, cc.getCopy());
-	}
-
-	private static class TestMessageDigest implements MessageDigest {
-
-		private final java.security.MessageDigest delegate;
-
-		private TestMessageDigest() throws GeneralSecurityException {
-			delegate = java.security.MessageDigest.getInstance("SHA-256");
-		}
-
-		public byte[] digest() {
-			return delegate.digest();
-		}
-
-		public byte[] digest(byte[] input) {
-			return delegate.digest(input);
-		}
-
-		public int digest(byte[] buf, int offset, int len) {
-			byte[] digest = digest();
-			len = Math.min(len, digest.length);
-			System.arraycopy(digest, 0, buf, offset, len);
-			return len;
-		}
-
-		public int getDigestLength() {
-			return delegate.getDigestLength();
-		}
-
-		public void reset() {
-			delegate.reset();
-		}
-
-		public void update(byte input) {
-			delegate.update(input);
-		}
-
-		public void update(byte[] input) {
-			delegate.update(input);
-		}
-
-		public void update(byte[] input, int offset, int len) {
-			delegate.update(input, offset, len);
-		}
-	}
-}
--- a/briar-tests/src/org/briarproject/sync/PacketReaderImplTest.java
+++ b/briar-tests/src/org/briarproject/sync/PacketReaderImplTest.java
@@ -1,50 +1,29 @@
 package org.briarproject.sync;

-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
 import org.briarproject.BriarTestCase;
 import org.briarproject.TestUtils;
 import org.briarproject.api.FormatException;
-import org.briarproject.api.data.BdfReaderFactory;
-import org.briarproject.api.data.BdfWriter;
-import org.briarproject.api.data.BdfWriterFactory;
-import org.briarproject.data.DataModule;
+import org.briarproject.api.UniqueId;
 import org.briarproject.util.ByteUtils;
 import org.junit.Test;

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

-import static org.briarproject.api.data.DataConstants.LIST_END_LENGTH;
-import static org.briarproject.api.data.DataConstants.UNIQUE_ID_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.HEADER_LENGTH;
-import static org.briarproject.api.sync.MessagingConstants.MAX_PAYLOAD_LENGTH;
 import static org.briarproject.api.sync.PacketTypes.ACK;
 import static org.briarproject.api.sync.PacketTypes.OFFER;
 import static org.briarproject.api.sync.PacketTypes.REQUEST;
+import static org.briarproject.api.sync.SyncConstants.MAX_PACKET_PAYLOAD_LENGTH;
+import static org.briarproject.api.sync.SyncConstants.PACKET_HEADER_LENGTH;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;

 public class PacketReaderImplTest extends BriarTestCase {

-	// FIXME: This is an integration test, not a unit test
-
-	private final BdfReaderFactory bdfReaderFactory;
-	private final BdfWriterFactory bdfWriterFactory;
-
-	public PacketReaderImplTest() throws Exception {
-		Injector i = Guice.createInjector(new DataModule());
-		bdfReaderFactory = i.getInstance(BdfReaderFactory.class);
-		bdfWriterFactory = i.getInstance(BdfWriterFactory.class);
-	}
-
 	@Test(expected = FormatException.class)
 	public void testFormatExceptionIfAckIsTooLarge() throws Exception {
 		byte[] b = createAck(true);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readAck();
 	}

@@ -52,8 +31,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testNoFormatExceptionIfAckIsMaximumSize() throws Exception {
 		byte[] b = createAck(false);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readAck();
 	}

@@ -61,8 +39,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testEmptyAck() throws Exception {
 		byte[] b = createEmptyAck();
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readAck();
 	}

@@ -70,8 +47,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testFormatExceptionIfOfferIsTooLarge() throws Exception {
 		byte[] b = createOffer(true);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readOffer();
 	}

@@ -79,10 +55,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testNoFormatExceptionIfOfferIsMaximumSize() throws Exception {
 		byte[] b = createOffer(false);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl
-				reader = new PacketReaderImpl(
-				bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readOffer();
 	}

@@ -90,8 +63,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testEmptyOffer() throws Exception {
 		byte[] b = createEmptyOffer();
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readOffer();
 	}

@@ -99,8 +71,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testFormatExceptionIfRequestIsTooLarge() throws Exception {
 		byte[] b = createRequest(true);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readRequest();
 	}

@@ -108,8 +79,7 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testNoFormatExceptionIfRequestIsMaximumSize() throws Exception {
 		byte[] b = createRequest(false);
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readRequest();
 	}

@@ -117,110 +87,76 @@ public class PacketReaderImplTest extends BriarTestCase {
 	public void testEmptyRequest() throws Exception {
 		byte[] b = createEmptyRequest();
 		ByteArrayInputStream in = new ByteArrayInputStream(b);
-		PacketReaderImpl reader = new PacketReaderImpl(bdfReaderFactory, null,
-				null, in);
+		PacketReaderImpl reader = new PacketReaderImpl(null, null, null, in);
 		reader.readRequest();
 	}

 	private byte[] createAck(boolean tooBig) throws Exception {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		while (out.size() + UNIQUE_ID_LENGTH + LIST_END_LENGTH * 2
-				< HEADER_LENGTH + MAX_PAYLOAD_LENGTH) {
-			w.writeRaw(TestUtils.getRandomId());
+		out.write(new byte[PACKET_HEADER_LENGTH]);
+		while (out.size() + UniqueId.LENGTH <= PACKET_HEADER_LENGTH
+				+ MAX_PACKET_PAYLOAD_LENGTH) {
+			out.write(TestUtils.getRandomId());
 		}
-		if (tooBig) w.writeRaw(TestUtils.getRandomId());
-		w.writeListEnd();
-		w.writeListEnd();
-		assertEquals(tooBig, out.size() > HEADER_LENGTH + MAX_PAYLOAD_LENGTH);
+		if (tooBig) out.write(TestUtils.getRandomId());
+		assertEquals(tooBig, out.size() > PACKET_HEADER_LENGTH +
+				MAX_PACKET_PAYLOAD_LENGTH);
 		byte[] packet = out.toByteArray();
 		packet[1] = ACK;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}

 	private byte[] createEmptyAck() throws Exception {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		w.writeListEnd();
-		w.writeListEnd();
-		byte[] packet = out.toByteArray();
+		byte[] packet = new byte[PACKET_HEADER_LENGTH];
 		packet[1] = ACK;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}

 	private byte[] createOffer(boolean tooBig) throws Exception {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		while (out.size() + UNIQUE_ID_LENGTH + LIST_END_LENGTH * 2
-				< HEADER_LENGTH + MAX_PAYLOAD_LENGTH) {
-			w.writeRaw(TestUtils.getRandomId());
+		out.write(new byte[PACKET_HEADER_LENGTH]);
+		while (out.size() + UniqueId.LENGTH <= PACKET_HEADER_LENGTH
+				+ MAX_PACKET_PAYLOAD_LENGTH) {
+			out.write(TestUtils.getRandomId());
 		}
-		if (tooBig) w.writeRaw(TestUtils.getRandomId());
-		w.writeListEnd();
-		w.writeListEnd();
-		assertEquals(tooBig, out.size() > HEADER_LENGTH + MAX_PAYLOAD_LENGTH);
+		if (tooBig) out.write(TestUtils.getRandomId());
+		assertEquals(tooBig, out.size() > PACKET_HEADER_LENGTH +
+				MAX_PACKET_PAYLOAD_LENGTH);
 		byte[] packet = out.toByteArray();
 		packet[1] = OFFER;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}

 	private byte[] createEmptyOffer() throws Exception {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		w.writeListEnd();
-		w.writeListEnd();
-		byte[] packet = out.toByteArray();
+		byte[] packet = new byte[PACKET_HEADER_LENGTH];
 		packet[1] = OFFER;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}

 	private byte[] createRequest(boolean tooBig) throws Exception {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		while (out.size() + UNIQUE_ID_LENGTH + LIST_END_LENGTH * 2
-				< HEADER_LENGTH + MAX_PAYLOAD_LENGTH) {
-			w.writeRaw(TestUtils.getRandomId());
+		out.write(new byte[PACKET_HEADER_LENGTH]);
+		while (out.size() + UniqueId.LENGTH <= PACKET_HEADER_LENGTH
+				+ MAX_PACKET_PAYLOAD_LENGTH) {
+			out.write(TestUtils.getRandomId());
 		}
-		if (tooBig) w.writeRaw(TestUtils.getRandomId());
-		w.writeListEnd();
-		w.writeListEnd();
-		assertEquals(tooBig, out.size() > HEADER_LENGTH + MAX_PAYLOAD_LENGTH);
+		if (tooBig) out.write(TestUtils.getRandomId());
+		assertEquals(tooBig, out.size() > PACKET_HEADER_LENGTH +
+				MAX_PACKET_PAYLOAD_LENGTH);
 		byte[] packet = out.toByteArray();
 		packet[1] = REQUEST;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}

 	private byte[] createEmptyRequest() throws Exception {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write(new byte[HEADER_LENGTH]);
-		BdfWriter w = bdfWriterFactory.createWriter(out);
-		w.writeListStart();
-		w.writeListStart();
-		w.writeListEnd();
-		w.writeListEnd();
-		byte[] packet = out.toByteArray();
+		byte[] packet = new byte[PACKET_HEADER_LENGTH];
 		packet[1] = REQUEST;
-		ByteUtils.writeUint16(packet.length - HEADER_LENGTH, packet, 2);
+		ByteUtils.writeUint16(packet.length - PACKET_HEADER_LENGTH, packet, 2);
 		return packet;
 	}
 }
--- a/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java
@@ -22,16 +22,14 @@ import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.identity.IdentityManager;
 import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.messaging.MessagingManager;
-import org.briarproject.api.messaging.PrivateConversation;
+import org.briarproject.api.messaging.PrivateMessage;
 import org.briarproject.api.messaging.PrivateMessageFactory;
 import org.briarproject.api.sync.GroupId;
-import org.briarproject.api.sync.Message;
-import org.briarproject.api.sync.MessageVerifier;
-import org.briarproject.api.sync.MessagingSession;
 import org.briarproject.api.sync.PacketReader;
 import org.briarproject.api.sync.PacketReaderFactory;
 import org.briarproject.api.sync.PacketWriter;
 import org.briarproject.api.sync.PacketWriterFactory;
+import org.briarproject.api.sync.SyncSession;
 import org.briarproject.api.transport.KeyManager;
 import org.briarproject.api.transport.StreamContext;
 import org.briarproject.api.transport.StreamReaderFactory;
@@ -73,6 +71,8 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 	private final TransportId transportId = new TransportId("id");
 	private final SecretKey master = TestUtils.createSecretKey();
 	private final long timestamp = System.currentTimeMillis();
+	private final AuthorId aliceId = new AuthorId(TestUtils.getRandomId());
+	private final AuthorId bobId = new AuthorId(TestUtils.getRandomId());

 	private Injector alice, bob;

@@ -106,14 +106,12 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		KeyManager keyManager = alice.getInstance(KeyManager.class);
 		keyManager.start();
 		// Add an identity for Alice
-		AuthorId aliceId = new AuthorId(TestUtils.getRandomId());
 		LocalAuthor aliceAuthor = new LocalAuthor(aliceId, "Alice",
-				new byte[MAX_PUBLIC_KEY_LENGTH], new byte[100], 1234);
+				new byte[MAX_PUBLIC_KEY_LENGTH], new byte[100], timestamp);
 		IdentityManager identityManager =
 				alice.getInstance(IdentityManager.class);
 		identityManager.addLocalAuthor(aliceAuthor);
 		// Add Bob as a contact
-		AuthorId bobId = new AuthorId(TestUtils.getRandomId());
 		Author bobAuthor = new Author(bobId, "Bob",
 				new byte[MAX_PUBLIC_KEY_LENGTH]);
 		ContactManager contactManager = alice.getInstance(ContactManager.class);
@@ -121,19 +119,17 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		// Create the private conversation
 		MessagingManager messagingManager =
 				alice.getInstance(MessagingManager.class);
-		messagingManager.addContact(contactId, master);
+		messagingManager.addContact(contactId);
 		// Derive and store the transport keys
 		keyManager.addContact(contactId, Collections.singletonList(transportId),
 				master, timestamp, true);
 		// Send Bob a message
-		byte[] body = "Hi Bob!".getBytes("UTF-8");
-		PrivateMessageFactory messageFactory =
+		PrivateMessageFactory privateMessageFactory =
 				alice.getInstance(PrivateMessageFactory.class);
 		GroupId groupId = messagingManager.getConversationId(contactId);
-		PrivateConversation conversation =
-				messagingManager.getConversation(groupId);
-		Message message = messageFactory.createPrivateMessage(null,
-				conversation, "text/plain", timestamp, body);
+		byte[] body = "Hi Bob!".getBytes("UTF-8");
+		PrivateMessage message = privateMessageFactory.createPrivateMessage(
+				groupId, timestamp, null, "text/plain", body);
 		messagingManager.addLocalMessage(message);
 		// Get a stream context
 		StreamContext ctx = keyManager.getStreamContext(contactId, transportId);
@@ -150,7 +146,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 				alice.getInstance(PacketWriterFactory.class);
 		PacketWriter packetWriter = packetWriterFactory.createPacketWriter(
 				streamWriter);
-		MessagingSession session = new SimplexOutgoingSession(db,
+		SyncSession session = new SimplexOutgoingSession(db,
 				new ImmediateExecutor(), eventBus, contactId, transportId,
 				MAX_LATENCY, packetWriter);
 		// Write whatever needs to be written
@@ -173,14 +169,12 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		KeyManager keyManager = bob.getInstance(KeyManager.class);
 		keyManager.start();
 		// Add an identity for Bob
-		AuthorId bobId = new AuthorId(TestUtils.getRandomId());
 		LocalAuthor bobAuthor = new LocalAuthor(bobId, "Bob",
-				new byte[MAX_PUBLIC_KEY_LENGTH], new byte[100], 1234);
+				new byte[MAX_PUBLIC_KEY_LENGTH], new byte[100], timestamp);
 		IdentityManager identityManager =
 				bob.getInstance(IdentityManager.class);
 		identityManager.addLocalAuthor(bobAuthor);
 		// Add Alice as a contact
-		AuthorId aliceId = new AuthorId(TestUtils.getRandomId());
 		Author aliceAuthor = new Author(aliceId, "Alice",
 				new byte[MAX_PUBLIC_KEY_LENGTH]);
 		ContactManager contactManager = bob.getInstance(ContactManager.class);
@@ -188,7 +182,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 		// Create the private conversation
 		MessagingManager messagingManager =
 				bob.getInstance(MessagingManager.class);
-		messagingManager.addContact(contactId, master);
+		messagingManager.addContact(contactId);
 		// Derive and store the transport keys
 		keyManager.addContact(contactId, Collections.singletonList(transportId),
 				master, timestamp, false);
@@ -209,15 +203,13 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
 				streamReaderFactory.createStreamReader(in, ctx);
 		// Create an incoming sync session
 		EventBus eventBus = bob.getInstance(EventBus.class);
-		MessageVerifier messageVerifier =
-				bob.getInstance(MessageVerifier.class);
 		PacketReaderFactory packetReaderFactory =
 				bob.getInstance(PacketReaderFactory.class);
 		PacketReader packetReader = packetReaderFactory.createPacketReader(
 				streamReader);
-		MessagingSession session = new IncomingSession(db,
-				new ImmediateExecutor(), new ImmediateExecutor(), eventBus,
-				messageVerifier, contactId, transportId, packetReader);
+		SyncSession session = new IncomingSession(db,
+				new ImmediateExecutor(), eventBus, contactId, transportId,
+				packetReader);
 		// No messages should have been added yet
 		assertFalse(listener.messageAdded);
 		// Read whatever needs to be read