feat: adapt tests, bypass query_* and calls from within the drp

topology-foundation · Jan 3, 2025 · c8d698e · c8d698e
1 parent baa1572
commit c8d698e
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 102 deletions.
diff --git a/examples/canvas/src/index.ts b/examples/canvas/src/index.ts
@@ -46,7 +46,7 @@ function paint_pixel(pixel: HTMLDivElement) {
 		random_int(256),
 	];
 	canvasDRP.paint([x, y], painting);
-	const [r, g, b] = canvasDRP.getPixel(x, y).color();
+	const [r, g, b] = canvasDRP.query_pixel(x, y).color();
 	pixel.style.backgroundColor = `rgb(${r}, ${g}, ${b})`;
 }
 

diff --git a/examples/canvas/src/objects/canvas.ts b/examples/canvas/src/objects/canvas.ts
@@ -58,7 +58,7 @@ export class Canvas implements DRP {
 		this.canvas[offset[0]][offset[1]].paint(rgb);
 	}
 
-	getPixel(x: number, y: number): Pixel {
+	query_pixel(x: number, y: number): Pixel {
 		return this.canvas[x][y];
 	}
 

diff --git a/examples/chat/src/index.ts b/examples/chat/src/index.ts
@@ -30,7 +30,7 @@ const render = () => {
 	element_objectPeers.innerHTML = `[${objectPeers.join(", ")}]`;
 
 	if (!chatDRP) return;
-	const chat = chatDRP.getMessages();
+	const chat = chatDRP.query_messages();
 	const element_chat = <HTMLDivElement>document.getElementById("chat");
 	element_chat.innerHTML = "";
 

diff --git a/examples/chat/src/objects/chat.ts b/examples/chat/src/objects/chat.ts
@@ -26,7 +26,7 @@ export class Chat implements DRP {
 		this.messages.add(`(${timestamp}, ${message}, ${peerId})`);
 	}
 
-	getMessages(): Set<string> {
+	query_messages(): Set<string> {
 		return this.messages;
 	}
 

diff --git a/examples/grid/src/index.ts b/examples/grid/src/index.ts
@@ -82,7 +82,7 @@ const render = () => {
 		: `Your frens in GRID: [${objectPeers.map((peer) => `<strong style="color: ${getColorForPeerId(peer)};">${formatPeerId(peer)}</strong>`).join(", ")}]`;
 
 	if (!gridDRP) return;
-	const users = gridDRP.getUsers();
+	const users = gridDRP.query_users();
 	const element_grid = <HTMLDivElement>document.getElementById("grid");
 	element_grid.innerHTML = "";
 
@@ -119,7 +119,7 @@ const render = () => {
 
 	for (const userColorString of users) {
 		const [id, color] = userColorString.split(":");
-		const position = gridDRP.getUserPosition(userColorString);
+		const position = gridDRP.query_userPosition(userColorString);
 
 		if (position) {
 			const div = document.createElement("div");

diff --git a/examples/grid/src/objects/grid.ts b/examples/grid/src/objects/grid.ts
@@ -52,11 +52,11 @@ export class Grid implements DRP {
 		}
 	}
 
-	getUsers(): string[] {
+	query_users(): string[] {
 		return [...this.positions.keys()];
 	}
 
-	getUserPosition(
+	query_userPosition(
 		userColorString: string,
 	): { x: number; y: number } | undefined {
 		const position = this.positions.get(userColorString);

diff --git a/packages/blueprints/src/ACL/index.ts b/packages/blueprints/src/ACL/index.ts
@@ -34,7 +34,7 @@ export class ACL implements IACL, DRP {
 	}
 
 	grant(senderId: string, peerId: string, publicKey: string): void {
-		if (!this.isAdmin(senderId)) {
+		if (!this.query_isAdmin(senderId)) {
 			throw new Error("Only admin nodes can grant permissions.");
 		}
 		this._grant(peerId, publicKey);
@@ -45,26 +45,26 @@ export class ACL implements IACL, DRP {
 	}
 
 	revoke(senderId: string, peerId: string): void {
-		if (!this.isAdmin(senderId)) {
+		if (!this.query_isAdmin(senderId)) {
 			throw new Error("Only admin nodes can revoke permissions.");
 		}
-		if (this.isAdmin(peerId)) {
+		if (this.query_isAdmin(peerId)) {
 			throw new Error(
 				"Cannot revoke permissions from a node with admin privileges.",
 			);
 		}
 		this._revoke(peerId);
 	}
 
-	isAdmin(peerId: string): boolean {
+	query_isAdmin(peerId: string): boolean {
 		return this._admins.has(peerId);
 	}
 
-	isWriter(peerId: string): boolean {
+	query_isWriter(peerId: string): boolean {
 		return this._writers.has(peerId);
 	}
 
-	getPeerKey(peerId: string): string | undefined {
+	query_getPeerKey(peerId: string): string | undefined {
 		return this._writers.get(peerId);
 	}
 

diff --git a/packages/blueprints/src/AddWinsSet/index.ts b/packages/blueprints/src/AddWinsSet/index.ts
@@ -30,11 +30,11 @@ export class AddWinsSet<T> implements DRP {
 		this._remove(value);
 	}
 
-	queryContains(value: T): boolean {
+	query_contains(value: T): boolean {
 		return this.state.get(value) === true;
 	}
 
-	getValues(): T[] {
+	query_getValues(): T[] {
 		return Array.from(this.state.entries())
 			.filter(([_, exists]) => exists)
 			.map(([value, _]) => value);

diff --git a/packages/blueprints/src/AddWinsSetWithACL/index.ts b/packages/blueprints/src/AddWinsSetWithACL/index.ts
@@ -24,7 +24,7 @@ export class AddWinsSetWithACL<T> implements DRP {
 	}
 
 	add(sender: string, value: T): void {
-		if (this.acl && !this.acl.isWriter(sender)) {
+		if (this.acl && !this.acl.query_isWriter(sender)) {
 			throw new Error("Only writers can add values.");
 		}
 		this._add(value);
@@ -35,17 +35,17 @@ export class AddWinsSetWithACL<T> implements DRP {
 	}
 
 	remove(sender: string, value: T): void {
-		if (this.acl && !this.acl.isWriter(sender)) {
+		if (this.acl && !this.acl.query_isWriter(sender)) {
 			throw new Error("Only writers can remove values.");
 		}
 		this._remove(value);
 	}
 
-	queryContains(value: T): boolean {
+	query_contains(value: T): boolean {
 		return this.state.get(value) === true;
 	}
 
-	getValues(): T[] {
+	query_getValues(): T[] {
 		return Array.from(this.state.entries())
 			.filter(([_, exists]) => exists)
 			.map(([value, _]) => value);

diff --git a/packages/blueprints/src/PseudoRandomWinsSet/index.ts b/packages/blueprints/src/PseudoRandomWinsSet/index.ts
@@ -49,11 +49,11 @@ export class PseudoRandomWinsSet<T> implements DRP {
 		this._remove(value);
 	}
 
-	queryContains(value: T): boolean {
+	query_contains(value: T): boolean {
 		return this.state.get(value) === true;
 	}
 
-	getValues(): T[] {
+	query_getValues(): T[] {
 		return Array.from(this.state.entries())
 			.filter(([_, exists]) => exists)
 			.map(([value, _]) => value);

diff --git a/packages/blueprints/tests/AddWinsSet.test.ts b/packages/blueprints/tests/AddWinsSet.test.ts
@@ -10,26 +10,26 @@ describe("HashGraph for AddWinSet tests", () => {
 
 	test("Test: Add", () => {
 		drp.add(1);
-		let set = drp.getValues();
+		let set = drp.query_getValues();
 		expect(set).toEqual([1]);
 
 		drp.add(2);
-		set = drp.getValues();
+		set = drp.query_getValues();
 		expect(set).toEqual([1, 2]);
 	});
 
 	test("Test: Add and Remove", () => {
 		drp.add(1);
-		let set = drp.getValues();
+		let set = drp.query_getValues();
 		expect(set).toEqual([1]);
 
 		drp.add(2);
-		set = drp.getValues();
+		set = drp.query_getValues();
 		expect(set).toEqual([1, 2]);
 
 		drp.remove(1);
-		set = drp.getValues();
-		expect(drp.queryContains(1)).toBe(false);
+		set = drp.query_getValues();
+		expect(drp.query_contains(1)).toBe(false);
 		expect(set).toEqual([2]);
 	});
 });
diff --git a/packages/blueprints/tests/AddWinsSetWithACL.test.ts b/packages/blueprints/tests/AddWinsSetWithACL.test.ts
@@ -10,32 +10,32 @@ describe("AccessControl tests with RevokeWins resolution", () => {
 	});
 
 	test("Admin nodes should have admin privileges", () => {
-		expect(drp.acl.isAdmin("peer1")).toBe(true);
+		expect(drp.acl.query_isAdmin("peer1")).toBe(true);
 	});
 
 	test("Admin nodes should have write permissions", () => {
-		expect(drp.acl.isWriter("peer1")).toBe(true);
+		expect(drp.acl.query_isWriter("peer1")).toBe(true);
 	});
 
 	test("Grant write permissions to a new writer", () => {
 		drp.acl.grant("peer1", "peer3", "publicKey3");
 
-		expect(drp.acl.isWriter("peer3")).toBe(true);
+		expect(drp.acl.query_isWriter("peer3")).toBe(true);
 	});
 
 	test("Revoke write permissions from a writer", () => {
 		drp.acl.grant("peer1", "peer3", "publicKey3");
 		drp.acl.revoke("peer1", "peer3");
 
-		expect(drp.acl.isWriter("peer3")).toBe(false);
+		expect(drp.acl.query_isWriter("peer3")).toBe(false);
 	});
 
 	test("Cannot revoke admin permissions", () => {
 		expect(() => {
 			drp.acl.revoke("peer1", "peer1");
 		}).toThrow("Cannot revoke permissions from a node with admin privileges.");
 
-		expect(drp.acl.isWriter("peer1")).toBe(true);
+		expect(drp.acl.query_isWriter("peer1")).toBe(true);
 	});
 
 	test("Resolve conflicts with RevokeWins", () => {

diff --git a/packages/blueprints/tests/PseudoRandomWinsSet.test.ts b/packages/blueprints/tests/PseudoRandomWinsSet.test.ts
@@ -10,26 +10,26 @@ describe("HashGraph for PseudoRandomWinsSet tests", () => {
 
 	test("Test: Add", () => {
 		drp.add(1);
-		let set = drp.getValues();
+		let set = drp.query_getValues();
 		expect(set).toEqual([1]);
 
 		drp.add(2);
-		set = drp.getValues();
+		set = drp.query_getValues();
 		expect(set).toEqual([1, 2]);
 	});
 
 	test("Test: Add and Remove", () => {
 		drp.add(1);
-		let set = drp.getValues();
+		let set = drp.query_getValues();
 		expect(set).toEqual([1]);
 
 		drp.add(2);
-		set = drp.getValues();
+		set = drp.query_getValues();
 		expect(set).toEqual([1, 2]);
 
 		drp.remove(1);
-		set = drp.getValues();
-		expect(drp.queryContains(1)).toBe(false);
+		set = drp.query_getValues();
+		expect(drp.query_contains(1)).toBe(false);
 		expect(set).toEqual([2]);
 	});
 });
diff --git a/packages/node/src/handlers.ts b/packages/node/src/handlers.ts
@@ -255,7 +255,7 @@ export async function verifyIncomingVertices(
 
 		const signature = uint8ArrayFromString(vertex.signature, "base64");
 
-		const publicKey = acl.getPeerKey(vertex.peerId);
+		const publicKey = acl.query_getPeerKey(vertex.peerId);
 		if (!publicKey) {
 			return null;
 		}