@fluidframework/merge-tree 2.31.0 → 2.32.0

package/lib/test/obliterate.concurrent.spec.js

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 import { strict as assert } from "node:assert";
+import { generatePairwiseOptions } from "@fluid-private/test-pairwise-generator";
 import { LoggingError } from "@fluidframework/telemetry-utils/internal";
 import { MergeTree } from "../mergeTree.js";
 import { Side } from "../sequencePlace.js";
-import { PartialSyncTestHelper } from "./partialSyncHelper.js";
-import { ReconnectTestHelper } from "./reconnectHelper.js";
+import { ClientTestHelper } from "./clientTestHelper.js";
 import { useStrictPartialLengthChecks } from "./testUtils.js";
 /**
  * Some tests contain ASCII diagrams of the trees to make it easier to reason about
@@ -38,8 +38,11 @@ import { useStrictPartialLengthChecks } from "./testUtils.js";
  * This diagram describes a single segment, `ABC`, that has been concurrently
  * removed by two clients.
  */
-for (const incremental of [true, false]) {
-    describe(`obliterate partial lengths incremental = ${incremental}`, () => {
+for (const { incremental, mergeTreeEnableSidedObliterate } of generatePairwiseOptions({
+    incremental: [true, false],
+    mergeTreeEnableSidedObliterate: [true, false],
+})) {
+    describe(`obliterate partial lengths incremental = ${incremental} enableSidedObliterate = ${mergeTreeEnableSidedObliterate}`, () => {
         useStrictPartialLengthChecks();
         beforeEach(() => {
             MergeTree.options.incrementalUpdate = incremental;
@@ -48,7 +51,7 @@ for (const incremental of [true, false]) {
             MergeTree.options.incrementalUpdate = true;
         });
         it("obliterate, then insert at the end of the string", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "01234567");
             helper.processAllOps();
             helper.obliterateRange("A", 0, 8);
@@ -57,7 +60,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate({ baseText: "BBB" });
         });
         it("insert, then obliterate at the end of the string", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "01234567");
             helper.processAllOps();
             helper.insertText("B", 8, "BBB");
@@ -66,7 +69,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate({ baseText: "BBB" });
         });
         it("length of children does not differ from parent when overlapping remove+obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // ABCDEFGH
             // I-[J]-(KLM-[ABC]-D-123456-E-[FG]-H)
             helper.insertText("A", 0, "ABCDEFGH");
@@ -82,7 +85,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes concurrent insert that occurs after obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "ABCD");
             helper.processAllOps();
             helper.obliterateRange("B", 0, 4);
@@ -93,7 +96,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes concurrent insert that occurs before obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "ABCD");
             helper.processAllOps();
             helper.insertText("C", 2, "X");
@@ -104,7 +107,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not delete unacked segment at start of string", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "ABC");
             helper.obliterateRange("C", 2, 3);
             helper.insertText("B", 0, "X");
@@ -115,7 +118,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("throws when local obliterate has range end outside length of local string", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "A");
             helper.insertText("C", 0, "B");
             try {
@@ -124,11 +127,11 @@ for (const incremental of [true, false]) {
             }
             catch (error) {
                 assert(error instanceof LoggingError);
-                assert.equal(error.message, "RangeOutOfBounds");
+                assert.equal(error.message, mergeTreeEnableSidedObliterate ? "InvalidRange" : "RangeOutOfBounds");
             }
         });
         it("does not delete when obliterate immediately after insert", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "A");
             helper.obliterateRange("C", 0, 1);
             helper.insertText("B", 0, "W");
@@ -141,7 +144,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not delete remote insert when between local insert+obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "A");
             helper.insertText("B", 0, "X");
             helper.obliterateRange("C", 0, 1);
@@ -154,7 +157,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not delete remote insert when between local insert+obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "A");
             helper.obliterateRange("C", 0, 1);
             helper.insertText("B", 0, "B");
@@ -167,7 +170,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not delete remote insert when in middle of segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "ABC");
             helper.obliterateRange("C", 2, 3);
             helper.obliterateRange("C", 0, 1);
@@ -179,7 +182,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes segment inserted into locally obliterated segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "A");
             helper.insertText("B", 0, "X");
             helper.insertText("C", 0, "B");
@@ -191,7 +194,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("updates lengths after obliterated insertion", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "A");
             helper.insertText("B", 0, "X");
             helper.insertText("C", 0, "N");
@@ -207,7 +210,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("updates lengths when insertion causes tree to split", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "0");
             helper.insertText("C", 0, "123");
             helper.insertText("B", 0, "BB");
@@ -222,7 +225,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("length of node split by insertion does not count remotely obliterated segments", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "1");
             helper.insertText("A", 0, "2");
             helper.insertText("C", 0, "XXXX");
@@ -236,7 +239,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("length of node split by obliterate does not count remotely obliterated segments", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "1");
             helper.insertText("A", 0, "2");
             helper.insertText("C", 0, "XXXX");
@@ -251,7 +254,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("counts remotely but not concurrently inserted segments for length when tree is split", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // a-b-c-d-e-123
             // (a-b)-c-d-e-1-[2]-3
             helper.insertText("B", 0, "123");
@@ -269,7 +272,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does obliterate X for all clients", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "DE");
             helper.obliterateRange("B", 0, 1);
             helper.insertText("A", 0, "X");
@@ -281,7 +284,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not include remote but unacked segments in partial len calculation", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // 89-4567-123-X
             // 8-(9-4-w-567-1)-23-Y-X
             helper.insertText("A", 0, "X");
@@ -298,7 +301,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("correctly accounts for overlapping obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "AB");
             helper.processAllOps();
             helper.obliterateRange("C", 0, 1);
@@ -310,7 +313,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("correctly accounts for overlapping obliterate and remove", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "AB");
             helper.processAllOps();
             helper.removeRange("C", 0, 1);
@@ -322,7 +325,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("clones removes array during insert", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // the bug found here:
             // the X was skipped over by client `A` because it had already been
             // deleted, so its length at refSeq was 0
@@ -341,7 +344,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("client partial lens consider overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "123");
             helper.insertText("A", 0, "ABCDEF");
             helper.processAllOps();
@@ -355,7 +358,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("client partial lens consider overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("C", 0, "X");
             helper.insertText("C", 0, "ABCDEFG");
             helper.processAllOps();
@@ -368,7 +371,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("tracks obliterate refSeq when acking op for partial len calculation", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             //   v-----------------------v
             //           v--v
             //                  v--v
@@ -386,7 +389,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not have negative len when segment obliterated before insert", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // 1234567-D-C-AB
             // 12-([3-X-45]-67)-D-C-AB
             helper.insertText("A", 0, "AB");
@@ -405,7 +408,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not have negative len when segment obliterated before insert", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // ABCDE-1-[2]-3
             // (A-XX-B)-(CD)-E-1-3
             helper.insertText("B", 0, "123");
@@ -423,7 +426,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes segments between two obliterates with different seq", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // 90-8-1234-(5)-67-D-C-B-A
             // 9-(EFG-[0-8-1234-(5)-67)]-D-C-B-A
             helper.insertText("A", 0, "A");
@@ -443,7 +446,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes inserted segment when obliterate of different seq in-between", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "AB");
             helper.insertText("B", 0, "E");
             helper.obliterateRange("A", 0, 1);
@@ -457,7 +460,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes inserted segment when obliterate of different seq in-between", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "ABC");
             helper.obliterateRange("A", 1, 2);
             helper.processAllOps();
@@ -470,7 +473,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("deletes inserted segment when obliterate of different seq in-between", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "ABC");
             helper.obliterateRange("A", 1, 2);
             helper.processAllOps();
@@ -483,7 +486,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("considers obliterated local segments as remotely obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // G-(H-F-I-C)-J-DE-A-(B)
             // G-J-(H-F-I-CD)-E
             helper.insertText("A", 0, "AB");
@@ -500,7 +503,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("traverses hier block in obliterated when len at ref seq is >0 and len at len seq == 0", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "AB");
             helper.insertText("A", 2, "CD");
             helper.removeRange("A", 1, 3);
@@ -518,7 +521,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("traverses hier block in obliterate when len at ref seq is >0 and len at len seq == 0", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // [E]-FGH-12-[A]-[B]-CD
             // 3-4-F-[G-(H-1)-2]-CD
             helper.insertText("B", 0, "ABCD");
@@ -539,7 +542,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("ignores segments obliterated at insertion time for partial len calculations", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "ABC");
             helper.insertText("A", 0, "DEF");
             helper.removeRange("A", 1, 2);
@@ -556,7 +559,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("accounts for overlapping obliterates from same client", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "AB");
             helper.processAllOps();
             helper.logger.validate();
@@ -570,7 +573,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("accounts for concurrently obliterated segments from the perspective of the inserting client for partial lengths", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("B", 0, "A");
             helper.insertText("C", 0, "B");
             helper.insertText("C", 0, "C");
@@ -585,7 +588,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("traverses segments when there is a local obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             helper.insertText("A", 0, "AB");
             helper.obliterateRange("A", 0, 1);
             helper.insertText("C", 0, "12");
@@ -598,7 +601,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("keeps track of all obliterates on a segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // B-A
             // (B-C-(A))
             helper.insertText("C", 0, "A");
@@ -618,7 +621,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("many overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // EF-ABCD
             // (1)-2-((E)-F-A)-B-(C)-D
             helper.insertText("C", 0, "ABCD");
@@ -635,7 +638,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterates at start", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // 12345-B-A
             // ((1-C-2)-3)-4-D-5-B-A
             helper.insertText("C", 0, "A");
@@ -651,7 +654,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("partial lengths updated when local insert is acked", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // A-BCDEF
             // (A-B-G-C)-D-I-E-H-F
             helper.insertText("A", 0, "A");
@@ -670,7 +673,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("two local obliterates get different seq numbers after ack", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // C-AB
             // (C-A)-D-(B)
             helper.insertText("C", 0, "AB");
@@ -688,7 +691,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("acks remote segment obliterated by local op", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // (D-C-A)-B
             // (D-C-A)-B-E
             helper.insertText("B", 0, "AB");
@@ -706,7 +709,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("skips segments obliterated before refSeq when traversing for insertion", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CDE-(A)-B
             // C-(DE-F-(A)-B)
             helper.insertText("A", 0, "AB");
@@ -726,7 +729,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("applies correct obliterate when right segment has multiple obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // AB
             // (A-C-D-(B))
             helper.insertText("B", 0, "AB");
@@ -745,7 +748,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("takes the correct remove clientId/stamp when multiple obliterates apply", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // AB
             // (A-C-D-(B))
             helper.insertText("A", 0, "AB");
@@ -764,7 +767,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("selects clientId if 0", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // AB
             // (A-D-E-(C)-B)
             helper.insertText("B", 0, "AB");
@@ -784,7 +787,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("obliterates unacked segment inside non-leaf-segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // FGHIJ-E-12345678-D-C-A-K-B
             // FGHIJ-E-12345-(6-[7-L-8-D]-C)-A-K-B
             helper.insertText("A", 0, "AB");
@@ -811,7 +814,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("tracks length at seq of lower remove seq when overlapping", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // H-FG-A-CDE-B
             // (H-F-[G-A)-C-I-D]-E-B
             helper.insertText("C", 0, "AB");
@@ -834,7 +837,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("segment obliterated on insert overlaps with local obliterate", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // AB
             // ((A-C)-B)
             helper.insertText("B", 0, "AB");
@@ -848,7 +851,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("obliterates entire string when concurrent inserts inside range", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // GT
             // (G-O-S-Y-T)
             helper.insertText("B", 0, "GT");
@@ -862,7 +865,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("obliterate ack traverses over non-obliterated remove", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // ABCDEFGH-1
             // ABCDE-(F-[G]-2-H)-1
             // ABCDE-(F-[G]-2-H)-1-3
@@ -883,7 +886,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping remove and obliterate when remove happens last", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // FGH-E-D-BC-A
             // ([F]-G)-H-E-D-B-I-C-A
             helper.insertText("A", 0, "A");
@@ -904,7 +907,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping remove and obliterate when remove happens last _and_ partial length already exists", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // FGH-CDE-B-A
             // [F-(GH)-C]-D-Z-E-B-A
             helper.insertText("B", 0, "A");
@@ -921,7 +924,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterate and remove when obliterate is larger than remove and happened last", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // H-CDEFG-B-A
             // (H-C-[D]-E)-F-Z-G-B-A
             helper.insertText("B", 0, "A");
@@ -938,7 +941,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("wasRemovedOnInsert computation remains accurate after leaf node is split", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CD-B-A
             // I-(C-(G)H-E)-F-D-B-A
             helper.insertText("C", 0, "A");
@@ -956,7 +959,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterates, segment is obliterated on insert and by local client", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // DEFG-BC-A
             // v-----------v
             //    v-----v
@@ -975,7 +978,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterates and remove", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // FGHIJKL-BCDE-A
             // (FGHI-[JK-(L-B)-C]-D)-E-M-A
             helper.insertText("C", 0, "A");
@@ -992,7 +995,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("does not mark obliterated on insert for non-acked obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CDE-B-A
             // I-((C-F)-G-D)-H-E-B-A
             helper.insertText("B", 0, "A");
@@ -1010,7 +1013,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("partial len isLocal when seq is local but a non-local obliterate affects the segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CDEFG-AB
             // C-((D-I-E)-F)-G-A-H-B
             helper.insertText("A", 0, "AB");
@@ -1026,7 +1029,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("obliterated on insert by overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // B-DEFG-C-A
             // ((B-D-H-E)-F-I-G-C)-A
             helper.insertText("C", 0, "A");
@@ -1043,7 +1046,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // ABCDEF
             //   v-------------v
             //        v-----------v
@@ -1062,7 +1065,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping obliterates", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CDEF-AB
             // v-------------------v
             //  v---------v
@@ -1082,7 +1085,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("overlapping remove and obliterate, local obliterate does not have a remote obliterated len", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             //      v-v------v-v
             // G-(H-[F]-E)-D-[A]-B-I-C
             helper.insertText("A", 0, "ABC");
@@ -1098,7 +1101,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("triple overlapping obliterate and overlapping remove", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // I-H-BCDEFG-A
             //            v------------v
             //               v-------v
@@ -1123,7 +1126,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("triple overlapping obliterate with one being local", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // CDEFG-B-A
             //   v--------v
             //       v--------v
@@ -1145,7 +1148,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("obliterate ack traversal is not stopped by obliterated segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // ABCD
             // (A-(B)-E-C)-D-F
             helper.insertText("B", 0, "ABCD");
@@ -1163,7 +1166,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("updates partial lengths for segments when doing obliterate ack traversal", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // O-JKLMN-FGHI-E-CD-AB
             //               v-v---v-----v
             // (P-O-JKLMN-FG-[H]-Q-[I-E-C]-D-A)-B
@@ -1189,7 +1192,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("combines remote obliterated length ", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // R-XYZ12-STUVW-LMNOP-DEFGHIJK-A-34567890-Q-BC
             // v---------------v------------v------v--------v------------v
             // [R-XYZ12-STUVW-L]-abcdefghij-[MNOP-D]-klmnop-[EFGHIJK-A-34]-5-(6-x-7)-890-Q-BC
@@ -1232,7 +1235,7 @@ for (const incremental of [true, false]) {
             helper.logger.validate();
         });
         it("three obliterates on same segment", () => {
-            const helper = new ReconnectTestHelper();
+            const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
             // A
             // (C-B-D-((A)))
             helper.insertText("B", 0, "A");
@@ -1249,7 +1252,7 @@ for (const incremental of [true, false]) {
         });
         describe("incremental partial length updates", () => {
             it("obliterates concurrently inserted segment", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // (C-B-A)
                 helper.insertText("A", 0, "A");
                 helper.insertText("B", 0, "B");
@@ -1260,7 +1263,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("obliterates 2 concurrently inserted segments", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // (C-B-D-A)
                 helper.insertText("B", 0, "A");
                 helper.insertText("A", 0, "B");
@@ -1272,7 +1275,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("obliterates 4 concurrently inserted segments", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // I-F-(G-D-H-E-C-A)-B
                 helper.insertText("B", 0, "AB");
                 helper.insertText("B", 0, "C");
@@ -1286,7 +1289,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("obliterates 3 concurrently inserted segments", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // I-G-(H-D-F-E-B)-C-A
                 helper.insertText("B", 0, "A");
                 helper.insertText("B", 0, "BC");
@@ -1300,7 +1303,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("overlapping remove + obliterate, remove happened first", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // D-EFG-B-H-C-A
                 // I-D-([E]-F)-G-B-H-C-A
                 helper.insertText("A", 0, "A");
@@ -1317,7 +1320,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("overlapping remove + obliterate, remove happened last", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // DEFGH-C-B-A
                 // [D]-[E-(F)-G]-H-C-B-A
                 helper.insertText("C", 0, "A");
@@ -1334,7 +1337,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("segment inside locally obliterated segment group is split", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // CDEF-AB
                 // [C]-DE-(F-(G)-H-A)-B
                 // [C]-DE-(F-(G)-H-A)-(B)
@@ -1354,7 +1357,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("continues traversal past locally removed segment inserted before first obliterate", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // ABC
                 // (E-D-(A)-[B]-C)
                 helper.insertText("A", 0, "ABC");
@@ -1370,7 +1373,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("keeps track of remote obliterated length when hier node contains hier nodes", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // LMNO-HIJ-E-K-FG-D-C-AB
                 // lmnopq-L-[M]-NO-H-ghijk-I-(J-E-K-FG-D-C-A-a)-bc-ef-d-B
                 //                                  v--------------------------------------v
@@ -1407,7 +1410,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate();
             });
             it("combines remote obliterated length for parent node of tree with depth >=3", () => {
-                const helper = new ReconnectTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate });
                 // VWXYZ0-(K)-[L]-M-[N]-O-EFGHIJ-[A]-B-P-TU-QRS-CD
                 //                                      v-v------v------------v
                 //                                            v--------------------v
@@ -1454,7 +1457,7 @@ for (const incremental of [true, false]) {
                 // Strict partial lengths checks reported an inconsistency when B applies A's
                 // obliterateRange op for the length of the string at refSeq 4.
                 // With strict partial lengths disabled, this manifested in 0x4bc on the subsequent op application.
-                const helper = new PartialSyncTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate: true });
                 helper.insertText("D", 0, "ABCDEFGH");
                 helper.processAllOps();
                 helper.insertText("B", 0, "123456xxxxx7890");
@@ -1471,7 +1474,7 @@ for (const incremental of [true, false]) {
                 helper.logger.validate({ baseText: "cx7890FGH" });
             });
             it("Avoids adding entries for insert with subsequent removal", () => {
-                const helper = new PartialSyncTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate: true });
                 helper.insertText("D", 0, "bZL4aQd");
                 helper.processAllOps();
                 helper.insertText("A", 0, "8mvaLcEa4nwhELu");
@@ -1498,7 +1501,7 @@ for (const incremental of [true, false]) {
             // Once fuzz testing more meaninfully leverages ops being sent to different clients at different types (partial
             // synchronization), it's probably fine to remove this.
             it("fuzz regression: Local obliterate wins post-insertion of segment previously thought to have won", () => {
-                const helper = new PartialSyncTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate: true });
                 helper.insertText("A", 0, "Hx15J");
                 helper.processAllOps();
                 helper.insertText("A", 0, "9T");
@@ -1520,7 +1523,7 @@ for (const incremental of [true, false]) {
             });
             // Simpler version of the above test which has the same root cause but reproduces a slightly different failure mode.
             it("Local obliterate wins post-insertion of segment previously thought to have won", () => {
-                const helper = new PartialSyncTestHelper();
+                const helper = new ClientTestHelper({ mergeTreeEnableSidedObliterate: true });
                 helper.insertText("A", 0, "1xx2");
                 helper.processAllOps();
                 // A and B both obliterate the 'xx' segment with an expanding obliterate, then try to insert