update types

topology-foundation · Dec 17, 2024 · b6cba37 · b6cba37
1 parent ae2e1a8
commit b6cba37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/packages/blueprints/src/AccessControl/index.ts b/packages/blueprints/src/AccessControl/index.ts
@@ -1,6 +1,7 @@
 import {
 	type ACL,
 	ActionType,
+	type DRP,
 	type ResolveConflictsType,
 	SemanticsType,
 	type Vertex,
@@ -11,7 +12,7 @@ export enum AccessControlConflictResolution {
 	RevokeWins = 1,
 }
 
-export class AccessControl implements ACL {
+export class AccessControl implements ACL, DRP {
 	operations: string[] = ["grant", "revoke"];
 	semanticsType = SemanticsType.pair;
 	peerKeyStore = new Map<string, string>();

diff --git a/packages/blueprints/src/AddWinsSetWithACL/index.ts b/packages/blueprints/src/AddWinsSetWithACL/index.ts
@@ -11,7 +11,7 @@ import { AccessControl } from "../AccessControl/index.js";
 export class AddWinsSetWithACL<T> implements DRP {
 	operations: string[] = ["add", "remove"];
 	state: Map<T, boolean>;
-	acl?: ACL;
+	acl?: ACL & DRP;
 	semanticsType = SemanticsType.pair;
 
 	constructor(admins: Map<string, string>) {

diff --git a/packages/object/src/index.ts b/packages/object/src/index.ts
@@ -15,10 +15,6 @@ export * as ObjectPb from "./proto/drp/object/v1/object_pb.js";
 export * from "./hashgraph/index.js";
 
 export interface ACL {
-	operations: string[];
-	semanticsType: SemanticsType;
-	peerKeyStore: Map<string, string>;
-	resolveConflicts: (vertices: Vertex[]) => ResolveConflictsType;
 	isWriter: (peerId: string) => boolean;
 	isAdmin: (peerId: string) => boolean;
 	grant: (peerId: string, publicKey: string) => void;
@@ -30,7 +26,7 @@ export interface DRP {
 	operations: string[];
 	semanticsType: SemanticsType;
 	resolveConflicts: (vertices: Vertex[]) => ResolveConflictsType;
-	acl?: ACL;
+	acl?: ACL & DRP;
 	// biome-ignore lint: attributes can be anything
 	[key: string]: any;
 }