Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
d-roak committed Aug 7, 2024
2 parents a150632 + 3aff50c commit 64ecd79
Show file tree
Hide file tree
Showing 6 changed files with 271 additions and 132 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"release-it": "^17.6.0",
"typedoc": "^0.26.4",
"typescript": "^5.4.5",
"vitest": "^2.0.3"
"vitest": "^2.0.5"
},
"workspaces": [
"packages/*",
Expand Down
47 changes: 47 additions & 0 deletions packages/crdt/src/builtins/LWWRegister/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
export class LWWRegister<T> {
private _element: T;
private _timestamp: number;
private _nodeId: string;

constructor(element: T, nodeId: string) {
this._element = element;
this._timestamp = Date.now();
this._nodeId = nodeId;
}

assign(element: T, nodeId: string): void {
this._element = element;
this._timestamp = Date.now();
this._nodeId = nodeId;
}

getElement(): T {
return this._element;
}

getTimestamp(): number {
return this._timestamp;
}

getNodeId(): string {
return this._nodeId;
}

compare(register: LWWRegister<T>): boolean {
return (this._timestamp <= register.getTimestamp());
}

merge(register: LWWRegister<T>): void {
const otherTimestamp = register.getTimestamp();
const otherNodeId = register.getNodeId();
if (otherTimestamp < this._timestamp) {
return;
}
if (otherTimestamp === this._timestamp && otherNodeId <= this._nodeId) {
return;
}
this._element = register.getElement();
this._timestamp = otherTimestamp;
this._nodeId = otherNodeId;
}
}
64 changes: 64 additions & 0 deletions packages/crdt/tests/LWWRegister.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { describe, test, expect, beforeEach, vi } from "vitest";
import { LWWRegister } from "../src/builtins/LWWRegister/index.ts";

describe('LWW-Register Tests', () => {
test('Test Assign', () => {
let register1 = new LWWRegister<string>("alice", "node1");

expect(register1.getElement()).toBe("alice");
expect(register1.getNodeId()).toEqual("node1");
register1.assign("bob", "node2");
expect(register1.getElement()).toBe("bob");
expect(register1.getNodeId()).toEqual("node2");
});

test('Test Compare', () => {
vi.useFakeTimers();
const date = new Date(2000,1,1,13);
vi.setSystemTime(date);

let register1 = new LWWRegister<string>("alice", "node1");

vi.useRealTimers();

let register2 = new LWWRegister<string>("alice", "node2");

expect(register1.compare(register2)).toEqual(true);
expect(register2.compare(register1)).toEqual(false);
});

test('Test Merge', () => {
let register1 = new LWWRegister<string>("alice", "node1");
let register2 = new LWWRegister<string>("bob", "node2");

register1.merge(register2);
expect(register1.getElement()).toEqual("bob");
expect(register2.getNodeId()).toEqual("node2");

register2.merge(register1);
expect(register1.getElement()).toEqual("bob");
expect(register2.getNodeId()).toEqual("node2");
});

test('Test Merge w/same timestamp', () => {
vi.useFakeTimers();
const date = new Date(2000,1,1,13);
vi.setSystemTime(date);

let register1 = new LWWRegister<string>("alice", "node1");
let register2 = new LWWRegister<string>("bob", "node2");

expect(register1.getElement()).toBe("alice");
expect(register1.getNodeId()).toEqual("node1");

register1.merge(register2);
expect(register1.getElement()).toBe("bob");
expect(register1.getNodeId()).toEqual("node2");

register2.merge(register1);
expect(register1.getElement()).toBe("bob");
expect(register1.getNodeId()).toEqual("node2");

vi.useRealTimers();
});
});
6 changes: 3 additions & 3 deletions packages/network/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@chainsafe/libp2p-gossipsub": "^13.1.0",
"@chainsafe/libp2p-noise": "^15.1.0",
"@chainsafe/libp2p-yamux": "^6.0.2",
"@libp2p/autonat": "^1.0.0",
"@libp2p/bootstrap": "^10.1.3",
"@libp2p/circuit-relay-v2": "^1.1.2",
"@libp2p/autonat": "^1.1.4",
"@libp2p/bootstrap": "^10.1.4",
"@libp2p/circuit-relay-v2": "^1.1.4",
"@libp2p/dcutr": "^1.1.0",
"@libp2p/identify": "^2.1.2",
"@libp2p/interface-pubsub": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@types/node": "^20.14.10",
"tsx": "4.15.7",
"typescript": "^5.4.5",
"vitest": "^2.0.3"
"vitest": "^2.0.5"
},
"dependencies": {
"@topology-foundation/crdt": "0.0.23-5",
Expand Down
Loading

0 comments on commit 64ecd79

Please sign in to comment.