Type cleanup

Author: rpanic

packages/sequencer/src/state/masking/MaskGraph.ts

@@ -13,27 +13,20 @@ type Node<T, Child, Parent> = {
   parent: Parent;
 };
 
-// export type Mask = {
-//   createMask(name: string): Promise<Mask>;
-//   name: string;
-//   mergeIntoParent(): Promise<void>;
-//   updateParent(parent: Mask): void;
-// };
-//
-// export type MaskBase = {
-//   createMask(name: string): Promise<Mask>;
-//   name: string;
-// };
+type BaseMaskType<Interface, Mask> = Interface & {
+  createMask(name: string): Promise<Mask>;
+  name: string;
+};
+
+type MaskType<Interface, Mask> = BaseMaskType<Interface, Mask> & {
+  mergeIntoParent(): Promise<void>;
+  updateParent(parent: Interface): void;
+};
 
 export class MaskGraph<
-  Base extends {
-    createMask(name: string): Promise<Mask>;
-    name: string;
-  },
-  Mask extends Base & {
-    mergeIntoParent(): Promise<void>;
-    updateParent(parent: Mask | Base): void;
-  },
+  Interface,
+  Base extends BaseMaskType<Interface, Mask>,
+  Mask extends MaskType<Interface, Mask>,
 > {
   public constructor(base: Base) {
     this.root = {
@@ -64,7 +57,7 @@ export class MaskGraph<
     return this.findNode(name)?.mask;
   }
 
-  public async getMask(name: string) {
+  public getMask(name: string) {
     const candidate = this.findService(name);
 
     assertMaskFound(candidate, name);
@@ -76,7 +69,7 @@ export class MaskGraph<
     name: string,
     parentName: string,
     fallback?: string
-  ): Promise<Base> {
+  ): Promise<Interface> {
     const candidate = this.findService(name);
     if (candidate !== undefined) {
       return candidate;

packages/sequencer/src/state/masking/StateServiceCreator.ts

@@ -2,7 +2,7 @@ import { AsyncStateService } from "../async/AsyncStateService";
 
 export interface StateServiceCreator {
   createMask(name: string, parent: string): Promise<AsyncStateService>;
-  getMask(name: string): Promise<AsyncStateService>;
+  getMask(name: string): AsyncStateService;
   mergeIntoParent(name: string): Promise<void>;
   drop(name: string): Promise<void>;
 }

packages/sequencer/src/state/masking/TreeStoreCreator.ts

@@ -6,7 +6,7 @@ export interface TreeStoreCreator {
     parent: string,
     fallback?: string
   ): Promise<AsyncMerkleTreeStore>;
-  getMask(name: string): Promise<AsyncMerkleTreeStore>;
+  getMask(name: string): AsyncMerkleTreeStore;
   mergeIntoParent(name: string): Promise<void>;
   drop(name: string): Promise<void>;
 }

packages/sequencer/src/storage/inmemory/masking/InMemoryStateServiceCreator.ts

@@ -2,9 +2,14 @@ import { StateServiceCreator } from "../../../state/masking/StateServiceCreator"
 import { MaskGraph } from "../../../state/masking/MaskGraph";
 
 import { InMemoryStateServiceMask } from "./InMemoryStateServiceMask";
+import { AsyncStateService } from "../../../state/async/AsyncStateService";
 
 export class InMemoryStateServiceCreator
-  extends MaskGraph<InMemoryStateServiceMask, InMemoryStateServiceMask>
+  extends MaskGraph<
+    AsyncStateService,
+    InMemoryStateServiceMask,
+    InMemoryStateServiceMask
+  >
   implements StateServiceCreator
 {
   public constructor() {

packages/sequencer/src/storage/inmemory/masking/InMemoryTreeStoreCreator.ts

@@ -9,10 +9,8 @@ import {
 
 export class InMemoryTreeStoreCreator
   extends MaskGraph<
-    AsyncMerkleTreeStore & {
-      createMask: (name: string) => Promise<InMemoryMerkleTreeStoreMask>;
-      name: string;
-    },
+    AsyncMerkleTreeStore,
+    InMemoryBaseMerkleTreeStore,
     InMemoryMerkleTreeStoreMask
   >
   implements TreeStoreCreator