diff --git a/_tasks/generate_artifacts.ts b/_tasks/generate_artifacts.ts index e87f88567..8de9c9c19 100755 --- a/_tasks/generate_artifacts.ts +++ b/_tasks/generate_artifacts.ts @@ -1,8 +1,8 @@ -import { testUser } from "../capn/mod.ts" import { hex } from "../crypto/mod.ts" import * as $ from "../deps/scale.ts" import { emptyDir } from "../deps/std/fs.ts" import * as path from "../deps/std/path.ts" +import { testUser } from "../devnets/mod.ts" import dprintConfig from "../dprint.json" assert { type: "json" } import { compress } from "../util/compression.ts" diff --git a/capn/CapnConnection.ts b/capn/CapnConnection.ts deleted file mode 100644 index 30fef4cef..000000000 --- a/capn/CapnConnection.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { WsConnection } from "../rpc/mod.ts" - -export class CapnConnection extends WsConnection { - constructor(path: string) { - const server = Deno.env.get("CAPN_SERVER") - if (!server) throw new Error("Must be run with a capn server") - const url = new URL(path, server) - url.protocol = "ws" - super(url.toString()) - } -} diff --git a/cli/resolveConfig.ts b/cli/resolveConfig.ts index 8a426e91b..43d668880 100644 --- a/cli/resolveConfig.ts +++ b/cli/resolveConfig.ts @@ -1,6 +1,6 @@ -import { CapiConfig } from "../capn/mod.ts" import * as flags from "../deps/std/flags.ts" import * as path from "../deps/std/path.ts" +import { CapiConfig } from "../devnets/mod.ts" export async function resolveConfig(...args: string[]) { const { config: rawConfigPath } = flags.parse(args, { diff --git a/cli/serve.ts b/cli/serve.ts index 987027bd8..14f2fd588 100644 --- a/cli/serve.ts +++ b/cli/serve.ts @@ -1,7 +1,7 @@ -import { createTempDir } from "../capn/createTempDir.ts" -import { createCapnHandler } from "../capn/mod.ts" import * as flags from "../deps/std/flags.ts" import { serve } from "../deps/std/http.ts" +import { createTempDir } from "../devnets/createTempDir.ts" +import { createDevnetsHandler } from "../devnets/mod.ts" import { createCorsHandler } from "../server/corsHandler.ts" import { createErrorHandler } from "../server/errorHandler.ts" import { createCodegenHandler } from "../server/mod.ts" @@ -37,15 +37,15 @@ export default async function(...args: string[]) { .catch(() => false) if (!running) { - const capnHandler = createCapnHandler(tempDir, config, signal) + const devnetsHandler = createDevnetsHandler(tempDir, config, signal) const codegenHandler = createCodegenHandler(dataCache, tempCache) const handler = createCorsHandler(createErrorHandler(async (request) => { const { pathname } = new URL(request.url) if (pathname === "/capi_cwd") { return new Response(Deno.cwd()) } - if (pathname.startsWith("/capn/")) { - return await capnHandler(request) + if (pathname.startsWith("/devnets/")) { + return await devnetsHandler(request) } return await codegenHandler(request) })) @@ -73,7 +73,7 @@ export default async function(...args: string[]) { args, signal, env: { - CAPN_SERVER: `http://localhost:${port}/capn/`, + DEVNETS_SERVER: `http://localhost:${port}/devnets/`, }, }) const status = await command.spawn().status diff --git a/cli/sync.ts b/cli/sync.ts index 0ff5770a1..b49c53e6a 100644 --- a/cli/sync.ts +++ b/cli/sync.ts @@ -1,7 +1,7 @@ -import { createTempDir } from "../capn/createTempDir.ts" -import { syncConfig } from "../capn/mod.ts" import * as flags from "../deps/std/flags.ts" import { assertEquals } from "../deps/std/testing/asserts.ts" +import { createTempDir } from "../devnets/createTempDir.ts" +import { syncConfig } from "../devnets/mod.ts" import { resolveConfig } from "./resolveConfig.ts" export default async function(...args: string[]) { diff --git a/capn/CapiConfig.ts b/devnets/CapiConfig.ts similarity index 100% rename from capn/CapiConfig.ts rename to devnets/CapiConfig.ts diff --git a/devnets/CapnConnection.ts b/devnets/CapnConnection.ts new file mode 100644 index 000000000..df1cfca84 --- /dev/null +++ b/devnets/CapnConnection.ts @@ -0,0 +1,11 @@ +import { WsConnection } from "../rpc/mod.ts" + +export class DevnetsConnection extends WsConnection { + constructor(path: string) { + const server = Deno.env.get("DEVNETS_SERVER") + if (!server) throw new Error("Must be run with a devnets server") + const url = new URL(path, server) + url.protocol = "ws" + super(url.toString()) + } +} diff --git a/capn/binary.ts b/devnets/binary.ts similarity index 100% rename from capn/binary.ts rename to devnets/binary.ts diff --git a/capn/capnHandler.ts b/devnets/capnHandler.ts similarity index 92% rename from capn/capnHandler.ts rename to devnets/capnHandler.ts index 4a212733d..8d3643c84 100644 --- a/capn/capnHandler.ts +++ b/devnets/capnHandler.ts @@ -7,13 +7,13 @@ import { CapiConfig } from "./CapiConfig.ts" import { Network, startNetwork } from "./startNetwork.ts" import { testUserPublicKeys } from "./testUsers.ts" -const rCapnApi = /^\/capn\/([\w-]+)(?:\/([\w-]+))?$/ +const rDevnetsApi = /^\/devnets\/([\w-]+)(?:\/([\w-]+))?$/ -export function createCapnHandler(tempDir: string, config: CapiConfig, signal: AbortSignal) { +export function createDevnetsHandler(tempDir: string, config: CapiConfig, signal: AbortSignal) { const networkMemo = new PermanentMemo() return async (request: Request) => { const { pathname, searchParams } = new URL(request.url) - const match = rCapnApi.exec(pathname) + const match = rDevnetsApi.exec(pathname) if (!match) return f.notFound() const name = match[1]! const paraName = match[2] diff --git a/capn/chainSpec.ts b/devnets/chainSpec.ts similarity index 100% rename from capn/chainSpec.ts rename to devnets/chainSpec.ts diff --git a/capn/createTempDir.ts b/devnets/createTempDir.ts similarity index 64% rename from capn/createTempDir.ts rename to devnets/createTempDir.ts index 993ca7746..065515924 100644 --- a/capn/createTempDir.ts +++ b/devnets/createTempDir.ts @@ -1,10 +1,10 @@ import * as path from "../deps/std/path.ts" export async function createTempDir() { - const dir = path.resolve("target/capn") + const dir = path.resolve("target/devnets") await Deno.mkdir(dir, { recursive: true }) return await Deno.makeTempDir({ dir, - prefix: `capn-${new Date().toISOString()}-`, + prefix: `devnets-${new Date().toISOString()}-`, }) } diff --git a/capn/mod.ts b/devnets/mod.ts similarity index 75% rename from capn/mod.ts rename to devnets/mod.ts index e5f4f2101..8cfe1c443 100644 --- a/capn/mod.ts +++ b/devnets/mod.ts @@ -2,10 +2,10 @@ export * from "./binary.ts" export * from "./CapiConfig.ts" -export * from "./CapnConnection.ts" -export * from "./capnHandler.ts" export * from "./chainSpec.ts" export * from "./createTempDir.ts" +export * from "./DevnetsConnection.ts" +export * from "./devnetsHandler.ts" export * from "./startNetwork.ts" export * from "./syncConfig.ts" export * from "./testUsers.ts" diff --git a/capn/startNetwork.ts b/devnets/startNetwork.ts similarity index 100% rename from capn/startNetwork.ts rename to devnets/startNetwork.ts diff --git a/capn/syncConfig.ts b/devnets/syncConfig.ts similarity index 98% rename from capn/syncConfig.ts rename to devnets/syncConfig.ts index 77a8a072a..1f98c1519 100644 --- a/capn/syncConfig.ts +++ b/devnets/syncConfig.ts @@ -44,7 +44,7 @@ export async function syncConfig(tempDir: string, config: CapiConfig) { metadata: metadata, chainName: normalizeTypeName(name), connection: { - type: "CapnConnection", + type: "DevnetsConnection", discovery: name + (paraName ? `/${paraName}` : ""), }, }, diff --git a/capn/testUsers.ts b/devnets/testUsers.ts similarity index 94% rename from capn/testUsers.ts rename to devnets/testUsers.ts index 93168bca3..53ebbcc8a 100644 --- a/capn/testUsers.ts +++ b/devnets/testUsers.ts @@ -22,8 +22,8 @@ export function testUserFactory(endpoint: string) { function createUsers(): Promise> function createUsers(count: N): Promise> async function createUsers(count?: number): Promise | Sr25519[]> { - const server = Deno.env.get("CAPN_SERVER") - if (!server) throw new Error("Must be run with a capn server") + const server = Deno.env.get("DEVNETS_SERVER") + if (!server) throw new Error("Must be run with a devnets server") const response = await fetch( new URL(`${endpoint}?users=${count ?? testUserNames.length}`, server), { diff --git a/mod.ts b/mod.ts index b25d18916..7d4377f86 100644 --- a/mod.ts +++ b/mod.ts @@ -4,8 +4,8 @@ export { BitSequence } from "./deps/scale.ts" // moderate --exclude main.ts server util capi.config.ts export * from "./capi.config.ts" -export * from "./capn/mod.ts" export * from "./crypto/mod.ts" +export * from "./devnets/mod.ts" export * from "./fluent/mod.ts" export * from "./frame_metadata/mod.ts" export * from "./rpc/mod.ts" diff --git a/server/codegenHandler.ts b/server/codegenHandler.ts index bcd92f33a..336d0f0b5 100644 --- a/server/codegenHandler.ts +++ b/server/codegenHandler.ts @@ -131,7 +131,7 @@ export const connect = C.${entry.connection.type}.bind(${ }) ${ - entry.connection.type === "CapnConnection" + entry.connection.type === "DevnetsConnection" ? `export const createUsers = C.testUserFactory(${ JSON.stringify(entry.connection.discovery) })` @@ -147,7 +147,7 @@ import * as C from "./capi.js" export const connect: (signal: AbortSignal) => C.Connection ${ - entry.connection.type === "CapnConnection" + entry.connection.type === "DevnetsConnection" ? `export const createUsers: ReturnType` : "" } diff --git a/server/codegenSpec.ts b/server/codegenSpec.ts index 23ffcabba..4c16df6e1 100644 --- a/server/codegenSpec.ts +++ b/server/codegenSpec.ts @@ -10,7 +10,7 @@ const $codegenEntry = $.taggedUnion("type", [ "connection", $.taggedUnion("type", [ $.variant("WsConnection", $.field("discovery", $.str)), - $.variant("CapnConnection", $.field("discovery", $.str)), + $.variant("DevnetsConnection", $.field("discovery", $.str)), ]), ), ), diff --git a/words.txt b/words.txt index 4cc1fe2d4..7ad19ab21 100644 --- a/words.txt +++ b/words.txt @@ -5,7 +5,6 @@ bootnode bootnodes callables capi -capn chainspec chelios chev @@ -13,6 +12,7 @@ childstate codegen concat deno +devnets dispatchable dprint egdoc