Skip to content

Commit

Permalink
update AddWinsSet test
Browse files Browse the repository at this point in the history
  • Loading branch information
@h3lio5
h3lio5 committed Aug 17, 2024
1 parent 5d10f8d commit 359e52e
Showing 1 changed file with 192 additions and 40 deletions.
232 changes: 192 additions & 40 deletions packages/crdt/tests/AddWinsSet.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { describe, test, expect, beforeEach } from "vitest";
import { AddWinsSet } from "../src/builtins/AddWinsSet";
import { HashGraphDAG, HashGraphVertex } from "../../object/src/hashgraph";
import { ActionType, HashGraph } from "../../object/src/hashgraph";
import { TopologyObject } from "../../object/src";
import exp from "constants";

interface IAddWinsCRO<T extends number, O> extends TopologyObject {
addWinsSet: AddWinsSet<T>;
hashGraph: HashGraphDAG<O>;
hashGraph: HashGraph<O>;
add(element: T): void;
remove(element: T): void;
resolveConflicts(ops: O[]): O[];
resolveConflicts(op1: O, op2: O): ActionType;
}

// Define a generic Operation interface
Expand All @@ -20,30 +20,20 @@ interface Operation {

class AddWinsCRO<T extends number, O extends Operation> extends TopologyObject implements IAddWinsCRO<T, O> {
addWinsSet: AddWinsSet<T>;
hashGraph: HashGraphDAG<O>;
hashGraph: HashGraph<O>;

constructor(peerId: string) {
super(peerId);
this.addWinsSet = new AddWinsSet<T>(new Set<T>(), new Set<T>());
this.hashGraph = new HashGraphDAG<O>(this.resolveConflicts);
this.addWinsSet = new AddWinsSet<T>(new Array<T>(), new Array<T>());
this.hashGraph = new HashGraph<O>(this.resolveConflicts);
}

resolveConflicts(ops: O[]): O[] {
const operationMap = new Map<number, O[]>();
// Group operations by their value
for (const op of ops) {
if (!operationMap.has(op.value)) {
operationMap.set(op.value, []);
}
operationMap.get(op.value)!.push(op);
resolveConflicts(op1: Operation, op2: Operation): ActionType {
if (op1.type !== op2.type && op1.value === op2.value) {
return op1.type === "ADD" ? ActionType.DropRight : ActionType.DropLeft;
}
return Array.from(operationMap.values()).flatMap(ops => {
const hasAdd = ops.some(op => op.type === 'ADD');
const hasRemove = ops.some(op => op.type === 'REMOVE');

return hasAdd && hasRemove ? ops.filter(op => op.type === 'ADD') : ops;
});
}
return ActionType.Nop;
}

add(element: T): void {
this.addWinsSet.add(element);
Expand All @@ -58,7 +48,7 @@ class AddWinsCRO<T extends number, O extends Operation> extends TopologyObject i
}

read(): T {
const ops = this.hashGraph.getLinearOps();
const ops = this.hashGraph.linearizeOps();
for (const op of ops) {
switch (op.type) {
case "ADD":
Expand Down Expand Up @@ -94,18 +84,21 @@ describe("HashGraph for AddWinSet tests", () => {
let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);
let linearOps = cro.hashGraph.getLinearOps();
let linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1]);

// Add second vertex
let op2: OP = {type: "REMOVE", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);
linearOps = cro.hashGraph.getLinearOps();
linearOps = cro.hashGraph.linearizeOps();
let orderArray = cro.hashGraph.topologicalSort();
expect(linearOps).toEqual([op1, op2]);


});

test("Test: Add Two Concurrent Vertices With Same Value"), () => {
test("Test: Add Two Concurrent Vertices With Same Value", () => {
/*
_ V2:REMOVE(1)
V1:ADD(1) /
Expand All @@ -116,32 +109,32 @@ describe("HashGraph for AddWinSet tests", () => {
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);

let linearOps = cro.hashGraph.getLinearOps();
let linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1]);

// Add second vertex
let op2: OP = {type: "REMOVE", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);


linearOps = cro.hashGraph.getLinearOps();
linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1, op2]);

// Add the third vertex V3 concurrent with V2
let op3: OP = {type: "ADD", value: 1};
let deps3: string[] = [vertexHash1];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);

linearOps = cro.hashGraph.getLinearOps();
expect(linearOps).toEqual([op1, op2]);
linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1, op3]);

// the read value should be 2 ,i.e., ADD(1) + (ADD(1) + REMOVE(1)) => ADD(1) + ADD(1) => 1 + 1 => 2
let readValue = cro.read();
expect(readValue).toBe(2);
}

test("Test: Add Two Concurrent Vertices With Different Values"), () => {
});

test("Test: Add Two Concurrent Vertices With Different Values", () => {
/*
_ V2:REMOVE(1)
V1:ADD(1) /
Expand All @@ -151,23 +144,182 @@ describe("HashGraph for AddWinSet tests", () => {
let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);
let linearOps = cro.hashGraph.getLinearOps();
let linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1]);

// Add second vertex
let op2: OP = {type: "REMOVE", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);
linearOps = cro.hashGraph.getLinearOps();
linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1, op2]);

// Add the third vertex V3 concurrent with V2
let op3: OP = {type: "ADD", value: 2};
let op3: OP = {type: "ADD", value: 3};
let deps3: string[] = [vertexHash1];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);
linearOps = cro.hashGraph.getLinearOps();
expect([[op1, op2, op3],[op1, op3, op2]]).includes(linearOps);
linearOps = cro.hashGraph.linearizeOps();
expect([[op1, op2, op3],[op1, op3, op2]]).toContainEqual(linearOps);
});

console.log("Hello")
}
});
test("Test: Tricky Case", () => {
/*
___ V2:REMOVE(1) <- V4:ADD(10)
V1:ADD(1) /
\ ___ V3:ADD(1) <- V5:REMOVE(5)
*/

let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);

// Add second vertex
let op2: OP = {type: "REMOVE", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);

// Add the third vertex V3 concurrent with V2
let op3: OP = {type: "ADD", value: 1};
let deps3: string[] = [vertexHash1];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);

// Add the vertex V4 with dependency on V2
let op4: OP = {type: "ADD", value: 10};
let deps4: string[] = [vertexHash2];
let vertexHash4 = cro.hashGraph.addVertex(op4, deps4);

// Add the vertex V5 with dependency on V3
let op5: OP = {type: "REMOVE", value: 5};
let deps5: string[] = [vertexHash3];
let vertexHash5 = cro.hashGraph.addVertex(op5, deps5);
const linearOps = cro.hashGraph.linearizeOps();
expect([[op1, op4, op3, op5], [op1, op3, op5, op4]]).toContainEqual(linearOps);

});

test("Test: Yuta Papa's Case", () => {
/*
___ V2:REMOVE(1) <- V4:ADD(2)
V1:ADD(1) /
\ ___ V3:REMOVE(2) <- V5:ADD(1)
*/

let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);

// Add second vertex
let op2: OP = {type: "REMOVE", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);


// Add the third vertex V3 concurrent with V2
let op3: OP = {type: "REMOVE", value: 2};
let deps3: string[] = [vertexHash1];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);

// Add the vertex V4 with dependency on V2
let op4: OP = {type: "ADD", value: 2};
let deps4: string[] = [vertexHash2];
let vertexHash4 = cro.hashGraph.addVertex(op4, deps4);

// Add the vertex V5 with dependency on V3
let op5: OP = {type: "ADD", value: 1};
let deps5: string[] = [vertexHash3];
let vertexHash5 = cro.hashGraph.addVertex(op5, deps5);
const linearOps = cro.hashGraph.linearizeOps();
expect([[op1, op4, op5], [op1, op5, op4]]).toContainEqual(linearOps);
});

test("Test: Mega Complex Case", () => {
/*
__ V6:ADD(3)
/
___ V2:ADD(1) <-- V3:RM(2) <-- V7:RM(1) <-- V8:RM(3)
/ ______________/
V1:ADD(1)/ /
\ /
\ ___ V4:RM(2) <-- V5:ADD(2) <-- V9:RM(1)
*/

let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);
// Add second vertex
let op2: OP = {type: "ADD", value: 1};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);
// Add the third vertex V3 concurrent with V2
let op3: OP = {type: "REMOVE", value: 2};
let deps3: string[] = [vertexHash2];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);
// Add the vertex V4 with dependency on V2
let op4: OP = {type: "REMOVE", value: 2};
let deps4: string[] = [vertexHash1];
let vertexHash4 = cro.hashGraph.addVertex(op4, deps4);
// Add the vertex V5 -> [V4]
let op5: OP = {type: "ADD", value: 2};
let deps5: string[] = [vertexHash4];
let vertexHash5 = cro.hashGraph.addVertex(op5, deps5);
// Add the vertex V6 ->[V3]
let op6: OP = {type: "ADD", value: 3};
let deps6: string[] = [vertexHash3];
let vertexHash6 = cro.hashGraph.addVertex(op6, deps6);
// Add the vertex V7 -> [V3]
let op7: OP = {type: "REMOVE", value: 1};
let deps7: string[] = [vertexHash3];
let vertexHash7 = cro.hashGraph.addVertex(op7, deps7);
// Add the vertex V8 -> [V7, V5]
let op8: OP = {type: "REMOVE", value: 3};
let deps8: string[] = [vertexHash7, vertexHash5];
let vertexHash8 = cro.hashGraph.addVertex(op8, deps8);
// Add the vertex V9 -> [V5]
let op9: OP = {type: "REMOVE", value: 1};
let deps9: string[] = [vertexHash5];
let vertexHash9 = cro.hashGraph.addVertex(op9, deps9);

let linearOps = cro.hashGraph.linearizeOps();
expect([[op1, op2, op6, op7, op4, op5]]).toContainEqual(linearOps);
});

test("Test: Jaoa's latest brain teaser", () => {
/*
__ V2:Add(2) <------------\
V1:Add(1) / \ - V5:RM(2)
\__ V3:RM(2) <- V4:RM(2) <--/
*/
let op1: OP = {type: "ADD", value: 1};
let deps1: string[] = [];
let vertexHash1 = cro.hashGraph.addVertex(op1, deps1);

// Add the second vertex V2 <- [V1]
let op2: OP = {type: "ADD", value: 2};
let deps2: string[] = [vertexHash1];
let vertexHash2 = cro.hashGraph.addVertex(op2, deps2);

// Add the third vertex V3 <- [V1]
let op3: OP = {type: "REMOVE", value: 2};
let deps3: string[] = [vertexHash1];
let vertexHash3 = cro.hashGraph.addVertex(op3, deps3);

// Add the fourth vertex V4 <- [V3]
let op4: OP = {type: "REMOVE", value: 2};
let deps4: string[] = [vertexHash3];
let vertexHash4 = cro.hashGraph.addVertex(op4, deps4);

// Add the fifth vertex V5 <- [V2, V4]
let op5: OP = {type: "REMOVE", value: 2};
let deps5: string[] = [vertexHash2, vertexHash4];
let vertexHash5 = cro.hashGraph.addVertex(op5, deps5);

const linearOps = cro.hashGraph.linearizeOps();
expect(linearOps).toEqual([op1, op2, op5]);
});
});

// V1, V3, V4, V2, V5
// V1, V2, V3, V4, V5
// V1, V3, V2, V4, V5

0 comments on commit 359e52e

Please sign in to comment.