Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/api/test/unit/client/httpClient.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe("httpClient json client", () => {
await server.close();
});

return {baseUrl: await server.listen(0)};
return {baseUrl: await server.listen({port: 0})};
}

async function getServerWithClient(opts: RouteOptions): Promise<HttpClient> {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/test/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function getTestServer(): {baseUrl: string; server: FastifyInstance} {

before("start server", async () => {
await new Promise((resolve, reject) => {
server.listen(port, function (err, address) {
server.listen({port}, function (err, address) {
if (err !== null && err != undefined) {
reject(err);
} else {
Expand Down
8 changes: 4 additions & 4 deletions packages/beacon-node/src/api/rest/base.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import qs from "qs";
import fastify, {FastifyError, FastifyInstance} from "fastify";
import fastify, {FastifyInstance} from "fastify";
import fastifyCors from "@fastify/cors";
import bearerAuthPlugin from "@fastify/bearer-auth";
import {RouteConfig} from "@lodestar/api/beacon/server";
Expand Down Expand Up @@ -59,8 +59,8 @@ export class RestApiServer {

// To parse our ApiError -> statusCode
server.setErrorHandler((err, req, res) => {
if ((err as FastifyError).validation) {

@nflaig nflaig Apr 21, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kinda unrelated change but might as well clean this up, err is now properly typed

void res.status(400).send((err as FastifyError).validation);
if (err.validation) {
void res.status(400).send(err.validation);
} else {
// Convert our custom ApiError into status code
const statusCode = err instanceof ApiError ? err.statusCode : 500;
Expand Down Expand Up @@ -116,7 +116,7 @@ export class RestApiServer {
async listen(): Promise<void> {
try {
const host = this.opts.address;
const address = await this.server.listen(this.opts.port, host);
const address = await this.server.listen({port: this.opts.port, host});
this.logger.info("Started REST API server", {address});
if (!host || !isLocalhostIP(host)) {
this.logger.warn("REST API server is exposed, ensure untrusted traffic cannot reach this API");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("ExecutionEngine / http", () => {
await server.close();
});

const baseUrl = await server.listen(0);
const baseUrl = await server.listen({port: 0});

executionEngine = initializeExecutionEngine(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("ExecutionEngine / http ", () => {
await server.close();
});

baseUrl = await server.listen(0);
baseUrl = await server.listen({port: 0});

executionEngine = initializeExecutionEngine(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class ExternalSignerServer {

async start(): Promise<void> {
console.log(`Starting external signer server at ${this.url}.`);
await this.server.listen(this.port, this.address);
await this.server.listen({port: this.port, host: this.address});
console.log(`Started external signer server at ${this.url}.`);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/light-client/test/utils/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ export async function startServer(

void server.register(fastifyCors, {origin: "*"});

await server.listen(opts.port, opts.host);
await server.listen({port: opts.port, host: opts.host});
return server;
}