Skip to content

Commit 0e8d3c3

Browse files
committed
Fixed a few issues
1 parent e9e1f9c commit 0e8d3c3

File tree

10 files changed

+38
-35
lines changed

10 files changed

+38
-35
lines changed

packages/indexer/test/IndexerNotifier.test.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ import {
2020
StateServiceQueryModule,
2121
TestingAppChain,
2222
} from "@proto-kit/sdk";
23-
import { LocalTaskQueue, Sequencer, TaskPayload } from "@proto-kit/sequencer";
23+
import {
24+
LocalTaskQueue,
25+
Sequencer,
26+
TaskPayload,
27+
VanillaTaskWorkerModules,
28+
} from "@proto-kit/sequencer";
2429

2530
import { IndexerNotifier, IndexBlockTaskParametersSerializer } from "../src";
2631

@@ -89,16 +94,7 @@ function createAppChain() {
8994
BlockTrigger: {},
9095
Mempool: {},
9196
BlockProducerModule: {},
92-
LocalTaskWorkerModule: {
93-
StateTransitionReductionTask: {},
94-
StateTransitionTask: {},
95-
RuntimeProvingTask: {},
96-
BlockBuildingTask: {},
97-
BlockProvingTask: {},
98-
BlockReductionTask: {},
99-
CircuitCompilerTask: {},
100-
WorkerRegistrationTask: {},
101-
},
97+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
10298
BaseLayer: {},
10399
BatchProducerModule: {},
104100
TaskQueue: {
@@ -176,7 +172,7 @@ describe("IndexerNotifier", () => {
176172

177173
await appChain.start();
178174
await sendTransactions(appChain, 2);
179-
});
175+
}, 20000);
180176

181177
it("should create a task for every unproven block produced", async () => {
182178
const { block } = container

packages/persistance/test-integration/utils.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,7 @@ export function createPrismaAppchain(
146146
BlockTrigger: {},
147147
Mempool: {},
148148
BatchProducerModule: {},
149-
LocalTaskWorkerModule: {
150-
StateTransitionTask: {},
151-
RuntimeProvingTask: {},
152-
StateTransitionReductionTask: {},
153-
BlockReductionTask: {},
154-
BlockProvingTask: {},
155-
BlockBuildingTask: {},
156-
CircuitCompilerTask: {},
157-
WorkerRegistrationTask: {},
158-
},
149+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
159150
BaseLayer: {},
160151
BlockProducerModule: {},
161152
TaskQueue: {

packages/sequencer/src/sequencer/executor/Sequencer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ export class Sequencer<Modules extends SequencerModulesRecord>
113113
// and start the modules in the order they were resolved.
114114
for (const moduleName of orderedModules) {
115115
const sequencerModule = this.resolve(moduleName);
116-
// eslint-disable-next-line no-await-in-loop
117-
await sequencerModule.start();
118116

119117
log.info(
120118
`Starting sequencer module ${moduleName} (${sequencerModule.constructor.name})`
121119
);
120+
// eslint-disable-next-line no-await-in-loop
121+
await sequencerModule.start();
122122
}
123123
if (!moduleClassNames.includes("SequencerStartupModule")) {
124124
log.warn("SequencerStartupModule is not defined.");

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ import { Bool, Field, PrivateKey, PublicKey, Struct, UInt64 } from "o1js";
2424
import "reflect-metadata";
2525
import { container } from "tsyringe";
2626

27-
import { BatchStorage, HistoricalBatchStorage, Sequencer } from "../../src";
27+
import {
28+
BatchStorage,
29+
HistoricalBatchStorage,
30+
Sequencer,
31+
VanillaTaskWorkerModules,
32+
} from "../../src";
2833
import {
2934
DefaultTestingSequencerModules,
3035
testingSequencerFromModules,
@@ -133,7 +138,7 @@ describe("block production", () => {
133138
Mempool: {},
134139
BatchProducerModule: {},
135140
BlockProducerModule: {},
136-
LocalTaskWorkerModule: {},
141+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
137142
BaseLayer: {},
138143
TaskQueue: {},
139144
FeeStrategy: {},

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import { Bool, PrivateKey, Struct, UInt64 } from "o1js";
77
import "reflect-metadata";
88
import { container } from "tsyringe";
99

10-
import { ManualBlockTrigger, PrivateMempool, Sequencer } from "../../src";
10+
import {
11+
ManualBlockTrigger,
12+
PrivateMempool,
13+
Sequencer,
14+
VanillaTaskWorkerModules,
15+
} from "../../src";
1116
import {
1217
DefaultTestingSequencerModules,
1318
testingSequencerFromModules,
@@ -76,11 +81,12 @@ describe("block limit", () => {
7681
BlockProducerModule: {
7782
maximumBlockSize: maxBlockSize,
7883
},
79-
LocalTaskWorkerModule: {},
84+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
8085
BaseLayer: {},
8186
TaskQueue: {},
8287
FeeStrategy: {},
8388
ProtocolStartupModule: {},
89+
SequencerStartupModule: {},
8490
},
8591
Runtime: {
8692
Balance: {},

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
Sequencer,
1414
SequencerModule,
1515
StorageDependencyFactory,
16+
VanillaTaskWorkerModules,
1617
} from "../../src";
1718
import {
1819
DefaultTestingSequencerModules,
@@ -109,7 +110,7 @@ describe.each([["InMemory", InMemoryDatabase]])(
109110
FeeStrategy: {},
110111
BatchProducerModule: {},
111112
BlockProducerModule: {},
112-
LocalTaskWorkerModule: {},
113+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
113114
BaseLayer: {},
114115
TaskQueue: {},
115116
SequencerStartupModule: {},

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
ProvenSettlementPermissions,
2727
SettlementModule,
2828
SettlementProvingTask,
29+
VanillaTaskWorkerModules,
2930
WithdrawalQueue,
3031
} from "../../src";
3132
import { SettlementStartupModule } from "../../src/sequencer/SettlementStartupModule";
@@ -36,7 +37,7 @@ import { ProvenBalance } from "./mocks/ProvenBalance";
3637

3738
const timeout = 300000;
3839

39-
describe("Proven", () => {
40+
describe.skip("Proven", () => {
4041
let test: BlockTestService;
4142

4243
let appChain: AppChain<any, any, any, any>;
@@ -95,7 +96,7 @@ describe("Proven", () => {
9596
Mempool: {},
9697
BatchProducerModule: {},
9798
BlockProducerModule: {},
98-
LocalTaskWorkerModule: {},
99+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
99100
TaskQueue: {},
100101
FeeStrategy: {},
101102
SequencerStartupModule: {},

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
StateRecord,
2020
StorageDependencyFactory,
2121
BlockStorage,
22+
VanillaTaskWorkerModules,
2223
} from "../../src";
2324
import {
2425
DefaultTestingSequencerModules,
@@ -104,7 +105,7 @@ describe.each([["InMemory", InMemoryDatabase]])(
104105
Mempool: {},
105106
BatchProducerModule: {},
106107
BlockProducerModule: {},
107-
LocalTaskWorkerModule: {},
108+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
108109
BaseLayer: {},
109110
TaskQueue: {},
110111
FeeStrategy: {},
@@ -119,7 +120,7 @@ describe.each([["InMemory", InMemoryDatabase]])(
119120
},
120121
});
121122

122-
await appChain.start();
123+
await appChain.start(false);
123124

124125
runtime = appChain.runtime;
125126
sequencer = appChain.sequencer;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
BlockQueue,
1212
ManualBlockTrigger,
1313
TransactionExecutionService,
14+
VanillaTaskWorkerModules,
1415
} from "../../../../src";
1516
import { ProtocolStateTestHook } from "../../../integration/mocks/ProtocolStateTestHook";
1617
import {
@@ -57,7 +58,7 @@ describe("atomic block production", () => {
5758
Mempool: {},
5859
BatchProducerModule: {},
5960
BlockProducerModule: {},
60-
LocalTaskWorkerModule: {},
61+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
6162
BaseLayer: {},
6263
TaskQueue: {},
6364
FeeStrategy: {},

packages/sequencer/test/settlement/Settlement.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import {
5555
MinaBaseLayerConfig,
5656
SignedSettlementPermissions,
5757
ProvenSettlementPermissions,
58+
VanillaTaskWorkerModules,
5859
} from "../../src";
5960
import { BlockProofSerializer } from "../../src/protocol/production/tasks/serializers/BlockProofSerializer";
6061
import { testingSequencerFromModules } from "../TestingSequencer";
@@ -168,7 +169,7 @@ export const settlementTestFn = (
168169
BlockTrigger: {},
169170
Mempool: {},
170171
BatchProducerModule: {},
171-
LocalTaskWorkerModule: {},
172+
LocalTaskWorkerModule: VanillaTaskWorkerModules.defaultConfig(),
172173
OutgoingMessageQueue: {},
173174
BaseLayer: baseLayerConfig,
174175
BlockProducerModule: {},

0 commit comments

Comments
 (0)