Remove length field in ReplicatedTransation codec

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ChunkedTransaction.java

@@ -83,11 +83,6 @@ public ByteBuf readChunk( ByteBufAllocator allocator ) throws Exception
         {
             // Ensure that the written buffers does not overflow the allocators chunk size.
             channel = new ChunkingNetworkChannel( allocator, CHUNK_SIZE, chunks );
-            /*
-            Unknown length. The reason for sending this int is to avoid conflicts with Raft V1.
-            This way, the serialized result of this object is identical to a serialized byte array. Which is the only type in Raft V1.
-            */
-            channel.putInt( -1 );
         }
 
         // write to chunks if empty and there is more to write

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionSerializer.java

@@ -43,13 +43,9 @@ private ReplicatedTransactionSerializer()
     {
     }
 
-    public static ReplicatedTransaction unmarshal( ByteBuf byteBuf )
+    public static ReplicatedTransaction decode( ByteBuf byteBuf )
     {
-        int length = byteBuf.readInt();
-        if ( length == -1 )
-        {
-            length = byteBuf.readableBytes();
-        }
+        int length = byteBuf.readableBytes();
         byte[] bytes = new byte[length];
         byteBuf.readBytes( bytes );
         return ReplicatedTransaction.from( bytes );

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayChunkedEncoder.java

@@ -62,11 +62,6 @@ private int available()
         return content.length - pos;
     }
 
-    private boolean isFirst()
-    {
-        return pos == 0;
-    }
-
     @Override
     public boolean isEndOfInput()
     {
@@ -92,16 +87,10 @@ public ByteBuf readChunk( ByteBufAllocator allocator )
         {
             return null;
         }
-        int extraBytes = isFirst() ? Integer.BYTES : 0;
-        int toWrite = Math.min( available() + extraBytes, chunkSize );
+        int toWrite = Math.min( available(), chunkSize );
         ByteBuf buffer = allocator.buffer( toWrite );
         try
         {
-            if ( isFirst() )
-            {
-                buffer.writeInt( content.length );
-                toWrite -= extraBytes;
-            }
             buffer.writeBytes( content, pos, toWrite );
             pos += toWrite;
             return buffer;

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentMarshal.java

@@ -78,7 +78,7 @@ private ContentBuilder<ReplicatedContent> unmarshal( byte contentType, ByteBuf b
         {
         case TX_CONTENT_TYPE:
         {
-            return ContentBuilder.finished( ReplicatedTransactionSerializer.unmarshal( buffer ) );
+            return ContentBuilder.finished( ReplicatedTransactionSerializer.decode( buffer ) );
         }
         default:
             return unmarshal( contentType, new NetworkReadableClosableChannelNetty4( buffer ) );

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/TransactionRepresentationReplicatedTransactionTest.java

@@ -60,7 +60,7 @@ public void shouldDecodeAndUnmarshalSameBytes() throws IOException
         TransactionRepresentationReplicatedTransaction replicatedTransaction = ReplicatedTransaction.from( expectedTx );
         replicatedTransaction.marshal( new BoundedNetworkWritableChannel( buffer ) );
 
-        ReplicatedTransaction decoded = ReplicatedTransactionSerializer.unmarshal( buffer );
+        ReplicatedTransaction decoded = ReplicatedTransactionSerializer.decode( buffer );
         buffer.readerIndex( 0 );
         ReplicatedTransaction unmarshaled = ReplicatedTransactionSerializer.unmarshal( new NetworkReadableClosableChannelNetty4( buffer ) );