Skip to content

Commit

Permalink
Fixed eslint for cli + stack
Browse files Browse the repository at this point in the history
  • Loading branch information
rpanic committed Apr 16, 2024
1 parent 16872c0 commit bc05c97
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 67 deletions.
7 changes: 7 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@
{
"files": ["index.ts"],
"rules": {}
},
{
"files": ["cli.tsx"],
"rules": {
// Disable this because of the comment shell thingy in cli.tsx
"max-len": "off"
}
}
]
}
2 changes: 1 addition & 1 deletion packages/cli/src/LocalhostAppChain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class LocalhostAppChain<
AppChainModules
> {
public static fromRuntime<RuntimeModules extends RuntimeModulesRecord>(
runtimeModules: RuntimeModules,
runtimeModules: RuntimeModules
) {
const appChain = LocalhostAppChain.from({
Runtime: Runtime.from({
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/cli.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import yargs from "yargs";
import { hideBin } from "yargs/helpers";

// eslint-disable-next-line import/extensions
import { start } from "./commands/start.js";

// eslint-disable-next-line max-len
// eslint-disable-next-line @typescript-eslint/no-unused-expressions, @typescript-eslint/no-floating-promises
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
yargs(hideBin(process.argv))
.command(
"start [configFile]",
Expand Down
67 changes: 13 additions & 54 deletions packages/cli/src/commands/start.tsx
Original file line number Diff line number Diff line change
@@ -1,55 +1,12 @@
/* eslint-disable */
// eslint-disable-next-line max-len
/* eslint-disable @typescript-eslint/no-shadow,@typescript-eslint/no-use-before-define,@typescript-eslint/strict-boolean-expressions,@typescript-eslint/no-unsafe-assignment,consistent-return,no-nested-ternary */
import "reflect-metadata";
import { Field, PrivateKey, Provable, PublicKey, UInt64 } from "o1js";
import {
Runtime,
runtimeMethod,
RuntimeModule,
runtimeModule,
RuntimeModulesRecord,
state,
} from "@proto-kit/module";
import {
AccountStateHook,
Option,
Protocol,
State,
StateMap,
} from "@proto-kit/protocol";
import { VanillaProtocolModules } from "@proto-kit/library";
import { Presets, log, TypedClass } from "@proto-kit/common";
import {
AsyncStateService,
BlockProducerModule,
UnprovenBlock,
LocalTaskQueue,
LocalTaskWorkerModule,
ManualBlockTrigger,
NoopBaseLayer,
PrivateMempool,
Sequencer,
TimedBlockTrigger,
UnsignedTransaction,
} from "@proto-kit/sequencer";
import {
BlockStorageResolver,
GraphqlSequencerModule,
GraphqlServer,
MempoolResolver,
NodeStatusResolver,
QueryGraphqlModule,
} from "@proto-kit/api";
import {
AppChain,
InMemorySigner,
InMemoryTransactionSender,
StateServiceQueryModule,
TestingAppChain,
} from "@proto-kit/sdk";

import { log } from "@proto-kit/common";
import { UnprovenBlock, ManualBlockTrigger } from "@proto-kit/sequencer";
import { AppChain } from "@proto-kit/sdk";
import React, { useEffect, useReducer, useMemo } from "react";
// @ts-ignore
import { render, Text, Box, Static } from "ink";
import { render, Text, Box } from "ink";
// @ts-ignore
import { Spinner } from "@inkjs/ui";

Expand Down Expand Up @@ -151,7 +108,7 @@ export function Welcome() {
export function Blocks({ blocks }: { blocks: CliState["blocks"] }) {
return (
<Box flexDirection={"column"} marginTop={1}>
{blocks.map((block: UnprovenBlockExtras, index: number) => (
{blocks.map((block: UnprovenBlockExtras) => (
<Box
flexDirection={"column"}
key={block.time}
Expand Down Expand Up @@ -234,7 +191,7 @@ export function Server({ configFile }: { configFile: string }) {
const timeStart = Date.now();
let blockError;
let block;
let logs: any[] = [];
const logs: any[] = [];

const originalWriteOut = process.stdout.write;
process.stdout.write = (...args: any[]) => {
Expand All @@ -249,8 +206,7 @@ export function Server({ configFile }: { configFile: string }) {
};

try {
const unprovenBlock = await trigger.produceUnproven();
block = unprovenBlock;
block = await trigger.produceUnproven();
} catch (e: any) {
blockError = e.message;
}
Expand Down Expand Up @@ -285,7 +241,7 @@ export function Server({ configFile }: { configFile: string }) {
{!state.isStarted ? (
<Spinner label="Starting chain..." />
) : state.isProducingBlock ? (
<Spinner label={`Producing block...`} />
<Spinner label={"Producing block..."} />
) : (
<Spinner
label={`Producing next block in ${state.countdown / 1000}s`}
Expand All @@ -301,3 +257,6 @@ export function start(argv: { configFile: string }) {
patchConsole: false,
});
}

// eslint-disable-next-line max-len
/* eslint-enable @typescript-eslint/no-shadow,@typescript-eslint/no-use-before-define,@typescript-eslint/strict-boolean-expressions,@typescript-eslint/no-unsafe-assignment,consistent-return,no-nested-ternary */
8 changes: 3 additions & 5 deletions packages/cli/test/chain.config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
/* eslint-disable import/no-unused-modules */
import { ModulesConfig, Presets, TypedClass } from "@proto-kit/common";
import { Presets } from "@proto-kit/common";
import {
Runtime,
runtimeMethod,
RuntimeModule,
runtimeModule,
RuntimeModulesRecord,
state,
} from "@proto-kit/module";
import { Option, State, StateMap } from "@proto-kit/protocol";
import { PublicKey, UInt64 } from "o1js";
import { LocalhostAppChain } from "./../src/LocalhostAppChain";

import { LocalhostAppChain } from "../src";

@runtimeModule()
export class Balances extends RuntimeModule<object> {
Expand Down
2 changes: 1 addition & 1 deletion packages/stack/src/scripts/graphql/run-graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import { sleep } from "@proto-kit/common";

import { startServer } from "./server";

const server = await startServer();
await startServer();
await sleep(100000000);
8 changes: 4 additions & 4 deletions packages/stack/src/scripts/graphql/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
VanillaRuntimeModules,
UInt64,
} from "@proto-kit/library";
import { log, Presets } from "@proto-kit/common";
import { log } from "@proto-kit/common";
import {
BlockProducerModule,
InMemoryDatabase,
Expand Down Expand Up @@ -226,9 +226,9 @@ export async function startServer() {
});

await appChain.start(container.createChildContainer());
const pk = PublicKey.fromBase58(
"B62qmETai5Y8vvrmWSU8F4NX7pTyPqYLMhc1pgX3wD8dGc2wbCWUcqP"
);
// const pk = PublicKey.fromBase58(
// "B62qmETai5Y8vvrmWSU8F4NX7pTyPqYLMhc1pgX3wD8dGc2wbCWUcqP"
// );

const balances = appChain.runtime.resolve("Balances");

Expand Down

0 comments on commit bc05c97

Please sign in to comment.