Don't expose batch start and end

CHANGELOG

@@ -1,5 +1,7 @@
 vNEXT (in development)
 
+ * Batch start and end events are no longer included in BatchReceived events
+
 v0.9.0
 
  * Improve DSL for creating an IrcClient to allow parameters to be passed to server and profile

src/main/kotlin/com/dmdirc/ktirc/events/mutators/BatchMutator.kt

@@ -22,12 +22,11 @@ internal class BatchMutator : EventMutator {
 
     private fun startBatch(client: IrcClient, event: BatchStarted) {
         client.serverState.batches[event.referenceId] =
-                Batch(event.batchType, event.params.asList(), event.metadata.batchId, mutableListOf(event))
+                Batch(event.batchType, event.params.asList(), event.metadata.batchId, mutableListOf())
     }
 
     private fun finishBatch(client: IrcClient, event: BatchFinished): List<IrcEvent> {
         client.serverState.batches.remove(event.referenceId)?.let {
-            it.events += event
             val batch = BatchReceived(it.events[0].metadata, it.type, it.arguments.toTypedArray(), it.events)
             if (it.parent == null) {
                 return listOf(batch)

src/test/kotlin/com/dmdirc/ktirc/events/mutators/BatchMutatorTest.kt

@@ -40,7 +40,7 @@ internal class BatchMutatorTest {
         serverState.batches["abcdef"]?.let {
             assertEquals(listOf("foo", "bar"), it.arguments)
             assertEquals("netsplit", it.type)
-            assertEquals(listOf(event), it.events)
+            assertTrue(it.events.isEmpty())
             assertNull(it.parent)
         }
     }
@@ -86,9 +86,8 @@ internal class BatchMutatorTest {
         val event = events[0] as BatchReceived
         assertEquals("netsplit", event.type)
         assertArrayEquals(arrayOf("p1", "p2"), event.params)
-        assertEquals(2, event.events.size)
+        assertEquals(1, event.events.size)
         assertTrue(event.events[0] is ServerConnected)
-        assertTrue(event.events[1] is BatchFinished)
     }
 
     @Test
@@ -104,9 +103,8 @@ internal class BatchMutatorTest {
         assertEquals(1, parent?.size)
 
         val event = parent?.get(0) as BatchReceived
-        assertEquals(2, event.events.size)
+        assertEquals(1, event.events.size)
         assertTrue(event.events[0] is ServerConnected)
-        assertTrue(event.events[1] is BatchFinished)
     }
 
     @Test