Fixed linting

Author: rpanic

packages/persistance/src/PrismaRedisDatabase.ts

@@ -9,6 +9,7 @@ import {
 import { ChildContainerProvider } from "@proto-kit/common";
 import { PrismaClient } from "@prisma/client";
 import { RedisClientType } from "redis";
+import { inject } from "tsyringe";
 
 import {
   PrismaConnection,
@@ -21,7 +22,6 @@ import {
   RedisConnectionModule,
   RedisTransaction,
 } from "./RedisConnection";
-import { inject } from "tsyringe";
 
 export interface PrismaRedisCombinedConfig {
   prisma: PrismaDatabaseConfig;

packages/sequencer/test/TestingSequencer.ts

@@ -8,7 +8,6 @@ import {
   ManualBlockTrigger,
   NoopBaseLayer,
   PrivateMempool,
-  Sequencer,
   SequencerModulesRecord,
   TaskWorkerModulesRecord,
   BlockProducerModule,
@@ -61,5 +60,5 @@ export function testingSequencerModules<
     // We need to make sure that the taskworkermodule is initialized last
     LocalTaskWorkerModule: defaultModules.LocalTaskWorkerModule,
     SequencerStartupModule: defaultModules.SequencerStartupModule,
-  };
+  } satisfies SequencerModulesRecord;
 }

packages/sequencer/test/integration/BlockProduction.test.ts

@@ -111,9 +111,8 @@ describe("block production", () => {
       },
     });
 
-    const modules = testingSequencerModules({});
     const sequencerClass = Sequencer.from({
-      modules,
+      modules: testingSequencerModules({}),
     });
 
     // TODO Analyze how we can get rid of the library import for mandatory modules
@@ -133,8 +132,8 @@ describe("block production", () => {
 
     app.configure({
       Sequencer: {
-        // Database: {},
-        // BlockTrigger: {},
+        Database: {},
+        BlockTrigger: {},
         Mempool: {},
         BatchProducerModule: {},
         BlockProducerModule: {},
@@ -143,7 +142,7 @@ describe("block production", () => {
         TaskQueue: {},
         FeeStrategy: {},
         SequencerStartupModule: {},
-      } as any,
+      },
       Runtime: {
         Balance: {},
         NoopRuntime: {},

packages/sequencer/test/integration/BlockProductionSize.test.ts

@@ -15,7 +15,7 @@ import {
 } from "../../src";
 import {
   DefaultTestingSequencerModules,
-  testingSequencerFromModules,
+  testingSequencerModules,
 } from "../TestingSequencer";
 
 import { Balance } from "./mocks/Balance";
@@ -56,7 +56,9 @@ describe("block limit", () => {
   });
 
   async function setUpAppChain(maxBlockSize: number | undefined) {
-    const sequencerClass = testingSequencerFromModules({});
+    const sequencerClass = Sequencer.from({
+      modules: testingSequencerModules({}),
+    });
 
     const protocolClass = Protocol.from({
       modules: VanillaProtocolModules.mandatoryModules({

packages/sequencer/test/integration/Mempool.test.ts

@@ -17,7 +17,7 @@ import {
 } from "../../src";
 import {
   DefaultTestingSequencerModules,
-  testingSequencerFromModules,
+  testingSequencerModules,
 } from "../TestingSequencer";
 
 import { Balance } from "./mocks/Balance";
@@ -86,7 +86,9 @@ describe.each([["InMemory", InMemoryDatabase]])(
         },
       });
 
-      const sequencerClass = testingSequencerFromModules({});
+      const sequencerClass = Sequencer.from({
+        modules: testingSequencerModules({}),
+      });
 
       const protocolClass = Protocol.from({
         modules: VanillaProtocolModules.mandatoryModules({}),

packages/sequencer/test/integration/Proven.test.ts

@@ -20,10 +20,11 @@ import { AppChain, InMemoryAreProofsEnabled } from "@proto-kit/sdk";
 import { container } from "tsyringe";
 import { PrivateKey, UInt64 } from "o1js";
 
-import { testingSequencerFromModules } from "../TestingSequencer";
+import { testingSequencerModules } from "../TestingSequencer";
 import {
   MinaBaseLayer,
   ProvenSettlementPermissions,
+  Sequencer,
   SettlementModule,
   SettlementProvingTask,
   VanillaTaskWorkerModules,
@@ -56,16 +57,18 @@ describe.skip("Proven", () => {
         },
       });
 
-      const sequencerClass = testingSequencerFromModules(
-        {
-          BaseLayer: MinaBaseLayer,
-          SettlementModule,
-          OutgoingMessageQueue: WithdrawalQueue,
-        },
-        {
-          SettlementProvingTask,
-        }
-      );
+      const sequencerClass = Sequencer.from({
+        modules: testingSequencerModules(
+          {
+            BaseLayer: MinaBaseLayer,
+            SettlementModule,
+            OutgoingMessageQueue: WithdrawalQueue,
+          },
+          {
+            SettlementProvingTask,
+          }
+        ),
+      });
 
       // TODO Analyze how we can get rid of the library import for mandatory modules
       const protocolClass = Protocol.from({
@@ -105,7 +108,10 @@ describe.skip("Proven", () => {
               type: "local",
             },
           },
-          SettlementModule: {},
+          SettlementModule: {
+            // TODO
+            feepayer: PrivateKey.random(),
+          },
           OutgoingMessageQueue: {},
         },
         Runtime: {

packages/sequencer/test/integration/StorageIntegration.test.ts

@@ -23,7 +23,7 @@ import {
 } from "../../src";
 import {
   DefaultTestingSequencerModules,
-  testingSequencerFromModules,
+  testingSequencerModules,
 } from "../TestingSequencer";
 
 import { collectStateDiff, createTransaction } from "./utils";
@@ -74,8 +74,10 @@ describe.each([["InMemory", InMemoryDatabase]])(
     let pkNonce = 0;
 
     beforeAll(async () => {
-      const sequencerClass = testingSequencerFromModules({
-        Database,
+      const sequencerClass = Sequencer.from({
+        modules: testingSequencerModules({
+          Database,
+        }),
       });
 
       const runtimeClass = Runtime.from({

packages/sequencer/test/protocol/production/sequencing/atomic-block-production.test.ts

@@ -10,12 +10,13 @@ import { expectDefined } from "@proto-kit/common";
 import {
   BlockQueue,
   ManualBlockTrigger,
+  Sequencer,
   VanillaTaskWorkerModules,
 } from "../../../../src";
 import { ProtocolStateTestHook } from "../../../integration/mocks/ProtocolStateTestHook";
 import {
   DefaultTestingSequencerModules,
-  testingSequencerFromModules,
+  testingSequencerModules,
 } from "../../../TestingSequencer";
 import { Balance } from "../../../integration/mocks/Balance";
 import { BlockResultService } from "../../../../src/protocol/production/sequencing/BlockResultService";
@@ -36,7 +37,9 @@ describe("atomic block production", () => {
       },
     });
 
-    const sequencerClass = testingSequencerFromModules({});
+    const sequencerClass = Sequencer.from({
+      modules: testingSequencerModules({}),
+    });
 
     const protocolClass = Protocol.from({
       modules: VanillaProtocolModules.mandatoryModules({
@@ -62,7 +65,6 @@ describe("atomic block production", () => {
         BaseLayer: {},
         TaskQueue: {},
         FeeStrategy: {},
-        ProtocolStartupModule: {},
         SequencerStartupModule: {},
       },
       Runtime: {

packages/sequencer/test/settlement/Settlement.ts

@@ -54,9 +54,10 @@ import {
   SignedSettlementPermissions,
   ProvenSettlementPermissions,
   VanillaTaskWorkerModules,
+  Sequencer,
 } from "../../src";
 import { BlockProofSerializer } from "../../src/protocol/production/tasks/serializers/BlockProofSerializer";
-import { testingSequencerFromModules } from "../TestingSequencer";
+import { testingSequencerModules } from "../TestingSequencer";
 import { createTransaction } from "../integration/utils";
 import { FeeStrategy } from "../../src/protocol/baselayer/fees/FeeStrategy";
 import { BridgingModule } from "../../src/settlement/BridgingModule";
@@ -119,16 +120,18 @@ export const settlementTestFn = (
     SettlementUtils.prototype["isSignedSettlement"] = () =>
       settlementType === "signed";
 
-    const sequencer = testingSequencerFromModules(
-      {
-        BaseLayer: MinaBaseLayer,
-        SettlementModule: SettlementModule,
-        OutgoingMessageQueue: WithdrawalQueue,
-      },
-      {
-        SettlementProvingTask,
-      }
-    );
+    const sequencer = Sequencer.from({
+      modules: testingSequencerModules(
+        {
+          BaseLayer: MinaBaseLayer,
+          SettlementModule: SettlementModule,
+          OutgoingMessageQueue: WithdrawalQueue,
+        },
+        {
+          SettlementProvingTask,
+        }
+      ),
+    });
 
     const appchain = AppChain.from({
       Runtime: runtime,