diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java
index 40c175f54d295..5ec943ce3b27b 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstaller.java
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.stream.Collectors;
-import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.ReplicatedContentChunkEncoder;
+import org.neo4j.causalclustering.messaging.marshalling.ReplicatedContentChunkEncoder;
import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer;
import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.ContentTypeEncoder;
import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermEncoder;
diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/ReplicatedContentChunkEncoder.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ReplicatedContentChunkEncoder.java
similarity index 88%
rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/ReplicatedContentChunkEncoder.java
rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ReplicatedContentChunkEncoder.java
index 1442ad24fd404..0f1d3eabfba56 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/ReplicatedContentChunkEncoder.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ReplicatedContentChunkEncoder.java
@@ -17,14 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*/
-package org.neo4j.causalclustering.messaging.marshalling.v2.encoding;
+package org.neo4j.causalclustering.messaging.marshalling;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
-import org.neo4j.causalclustering.messaging.marshalling.ReplicatedContentChunk;
-
public class ReplicatedContentChunkEncoder extends MessageToByteEncoder
{
@Override
diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java
index a28602e666756..a228b48ca3f0a 100644
--- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java
+++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/SenderServiceIT.java
@@ -30,14 +30,17 @@
import org.junit.runners.Parameterized;
import java.time.Duration;
+import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
import java.util.concurrent.Semaphore;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.neo4j.causalclustering.core.consensus.RaftMessages;
+import org.neo4j.causalclustering.core.consensus.membership.MemberIdSet;
import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller;
import org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller;
-import org.neo4j.causalclustering.core.consensus.membership.MemberIdSet;
import org.neo4j.causalclustering.identity.ClusterId;
import org.neo4j.causalclustering.identity.MemberId;
import org.neo4j.causalclustering.net.Server;
@@ -61,7 +64,6 @@
import org.neo4j.ports.allocation.PortAuthority;
import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.junit.Assert.assertTrue;
import static org.neo4j.causalclustering.handlers.VoidPipelineWrapperFactory.VOID_WRAPPER;
@@ -72,8 +74,8 @@ public class SenderServiceIT
{
private final LogProvider logProvider = NullLogProvider.getInstance();
- private final ApplicationSupportedProtocols supportedApplicationProtocol =
- new ApplicationSupportedProtocols( Protocol.ApplicationProtocolCategory.RAFT, emptyList() );
+ private final ApplicationSupportedProtocols supportedApplicationProtocol = new ApplicationSupportedProtocols( Protocol.ApplicationProtocolCategory.RAFT,
+ Arrays.asList( ApplicationProtocols.RAFT_1.implementation(), ApplicationProtocols.RAFT_2.implementation() ) );
private final Collection supportedModifierProtocols = emptyList();
private final ApplicationProtocolRepository applicationProtocolRepository =
@@ -84,10 +86,18 @@ public class SenderServiceIT
@Parameterized.Parameter
public boolean blocking;
- @Parameterized.Parameters( name = "blocking={0}" )
- public static Iterable params()
+ @Parameterized.Parameter( 1 )
+ public ApplicationProtocols clientProtocol;
+
+ @Parameterized.Parameters( name = "blocking={0} protocol={1}" )
+ public static Iterable