fix: compare & merge bug GCounter & PNCounter

packages/crdt/src/builtins/GCounter/index.ts

@@ -27,15 +27,20 @@ export class GCounter {
     }
     return true;
   }
-
+  
   merge(peerCounter: GCounter): void {
     let temp: { [nodeKey: string]: number } = Object.assign(
       {},
       this.counts,
       peerCounter.counts,
     );
+
     Object.keys(temp).forEach((key) => {
       this.counts[key] = Math.max(this.counts[key], peerCounter.counts[key]);
+
     });
+
+    this.globalCounter = Object.values(this.counts).reduce((a, b) => a + b, 0);
+
   }
-}
+}

packages/crdt/tests/GCounter.test.ts

@@ -0,0 +1,69 @@
+import { describe, test, expect, beforeEach } from "vitest";
+import { GCounter } from "../src/builtins/GCounter";
+
+describe("G-Counter Tests", () => {
+
+    let set1: GCounter;
+    let set2: GCounter; 
+
+    beforeEach(() => {
+        set1 = new GCounter({ "node1": 5, "node2": 10});
+        set2 = new GCounter({ "node1": 5, "node2": 10});
+    });
+
+    test("Test Initial Values", () => {
+        expect(set1.value()).toBe(15);
+        expect(set2.value()).toBe(15);
+    });
+
+    test("Test Increment", () => {
+
+        set1.increment("node1", 10);
+        set1.increment("node2", 5);
+
+        expect(set1.value()).toBe(30);
+    });
+
+    test("Test Compare", () => {
+
+        expect(set1.compare(set2)).toBe(true);
+
+        set2.increment("node1", 5);
+
+        expect(set1.compare(set2)).toBe(false);
+
+        let set3 = new GCounter({ "node1": 5, "node2": 10, "node3": 15 });
+
+        expect(set1.compare(set3)).toBe(false);
+    });
+
+    test("Test Merge", () => {
+
+        const counter1 = new GCounter({ "node1": 5 });
+        const counter2 = new GCounter({ "node2": 10 });
+
+        counter1.merge(counter2);
+
+        expect(counter1.counts).toEqual({ "node1": 5, "node2": 10 });
+        expect(counter1.value()).toBe(15);
+
+        set1.increment("node1", 5);
+        set2.increment("node2", 10);
+        expect(set1.value()).toBe(35);
+        expect(set2.value()).toBe(40);
+        set1.merge(set2);
+        expect(set1.value()).toBe(45);
+        expect(set1.counts[0]).toBe(10);
+        expect(set1.counts[1]).toBe(20);
+        expect(set1.counts[2]).toBe(15);
+
+        set2.merge(set1);
+        expect(set2.value()).toBe(45);
+        expect(set2.counts[0]).toBe(10);
+        expect(set2.counts[1]).toBe(20);
+        expect(set2.counts[2]).toBe(15);
+
+        expect(set2.compare(set1)).toBe(true);
+    });
+
+});

packages/crdt/tests/PNCounter.test.ts

@@ -0,0 +1,60 @@
+import { describe, test, expect, beforeEach, afterEach } from "vitest";
+import { PNCounter } from "../src/builtins/PNCounter";
+import { GCounter } from "../src/builtins/GCounter";
+
+describe("PN-Counter Tests", () => {
+
+    let set1: PNCounter;
+    let set2: PNCounter;
+
+    beforeEach(() => {
+        set1 = new PNCounter(new GCounter({ "node1": 5, "node2": 10, "node3": 15 }), new GCounter({ "node1": 3, "node2": 4, "node3": 3 }));
+        set2 = new PNCounter(new GCounter({ "node1": 5, "node2": 10, "node3": 15 }), new GCounter({ "node1": 3, "node2": 4, "node3": 3 }));
+    });
+
+    test("Test Initial Value", () => {
+        expect(set1.value()).toBe(20);
+        expect(set2.value()).toBe(20);
+    });
+
+    test("Test Increment", () => {
+        set1.increment("node1",10);
+        set2.increment("node1",20);
+        expect(set1.value()).toBe(30);
+        expect(set2.value()).toBe(40);
+    });
+
+    test("Test Decrement", () => {
+        set1.decrement("node1",10);
+        set2.decrement("node1",20);
+        expect(set1.value()).toBe(10);
+        expect(set2.value()).toBe(0);
+    });
+
+    test("Test Compare", () => {
+        expect(set1.compare(set2)).toBe(true);
+
+        set1.decrement("node1",10);
+
+        expect(set1.compare(set2)).toBe(false);
+
+        set2.decrement("node1",10);
+
+        expect(set1.compare(set2)).toBe(true);
+    });
+
+    test("Test Merge", () => {
+        set1.increment("node1",10);
+        set2.decrement("node2",5);
+
+        expect(set1.compare(set2)).toBe(false);
+        expect(set2.compare(set1)).toBe(false); 
+
+        set1.merge(set2);
+        set2.merge(set1);
+
+        expect(set1.compare(set2)).toBe(true);
+        expect(set2.compare(set1)).toBe(true);        
+    });
+
+});