fix!: rename chainhook env vars to ordhook (#314)

* fix: rename ordhook env vars * fix: test setup * fix: debug server
hirosystems · Feb 21, 2024 · ae4ec01 · ae4ec01
1 parent f6d441d
commit ae4ec01
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/src/env.ts b/src/env.ts
@@ -28,19 +28,19 @@ const schema = Type.Object({
   EXTERNAL_HOSTNAME: Type.String({ default: '127.0.0.1' }),
 
   /** Hostname of the ordhook node we'll use to register predicates */
-  CHAINHOOK_NODE_RPC_HOST: Type.String({ default: '127.0.0.1' }),
+  ORDHOOK_NODE_RPC_HOST: Type.String({ default: '127.0.0.1' }),
   /** Control port of the ordhook node */
-  CHAINHOOK_NODE_RPC_PORT: Type.Number({ default: 20456, minimum: 0, maximum: 65535 }),
+  ORDHOOK_NODE_RPC_PORT: Type.Number({ default: 20456, minimum: 0, maximum: 65535 }),
   /**
    * Authorization token that the ordhook node must send with every event to make sure it's
    * coming from the valid instance
    */
-  CHAINHOOK_NODE_AUTH_TOKEN: Type.String(),
+  ORDHOOK_NODE_AUTH_TOKEN: Type.String(),
   /**
    * Register ordhook predicates automatically when the API is first launched. Set this to `false`
    * if you're configuring your predicates manually for any reason.
    */
-  CHAINHOOK_AUTO_PREDICATE_REGISTRATION: Type.Boolean({ default: true }),
+  ORDHOOK_AUTO_PREDICATE_REGISTRATION: Type.Boolean({ default: true }),
 
   PGHOST: Type.String(),
   PGPORT: Type.Number({ default: 5432, minimum: 0, maximum: 65535 }),

diff --git a/src/ordhook/server.ts b/src/ordhook/server.ts
@@ -10,7 +10,7 @@ import {
 } from '@hirosystems/chainhook-client';
 import { logger } from '@hirosystems/api-toolkit';
 
-export const ORDHOOK_BASE_PATH = `http://${ENV.CHAINHOOK_NODE_RPC_HOST}:${ENV.CHAINHOOK_NODE_RPC_PORT}`;
+export const ORDHOOK_BASE_PATH = `http://${ENV.ORDHOOK_NODE_RPC_HOST}:${ENV.ORDHOOK_NODE_RPC_PORT}`;
 export const PREDICATE_UUID = randomUUID();
 
 /**
@@ -20,7 +20,7 @@ export const PREDICATE_UUID = randomUUID();
  */
 export async function startOrdhookServer(args: { db: PgStore }): Promise<ChainhookEventObserver> {
   const predicates: ServerPredicate[] = [];
-  if (ENV.CHAINHOOK_AUTO_PREDICATE_REGISTRATION) {
+  if (ENV.ORDHOOK_AUTO_PREDICATE_REGISTRATION) {
     const blockHeight = await args.db.getChainTipBlockHeight();
     logger.info(`Ordinals predicate starting from block ${blockHeight}...`);
     predicates.push({
@@ -43,9 +43,9 @@ export async function startOrdhookServer(args: { db: PgStore }): Promise<Chainho
   const serverOpts: ServerOptions = {
     hostname: ENV.API_HOST,
     port: ENV.EVENT_PORT,
-    auth_token: ENV.CHAINHOOK_NODE_AUTH_TOKEN,
+    auth_token: ENV.ORDHOOK_NODE_AUTH_TOKEN,
     external_base_url: `http://${ENV.EXTERNAL_HOSTNAME}`,
-    wait_for_chainhook_node: ENV.CHAINHOOK_AUTO_PREDICATE_REGISTRATION,
+    wait_for_chainhook_node: ENV.ORDHOOK_AUTO_PREDICATE_REGISTRATION,
     validate_chainhook_payloads: true,
     body_limit: ENV.EVENT_SERVER_BODY_LIMIT,
     node_type: 'ordhook',

diff --git a/tests/ordhook/server.test.ts b/tests/ordhook/server.test.ts
@@ -18,7 +18,7 @@ describe('EventServer', () => {
 
   beforeEach(async () => {
     await runMigrations(MIGRATIONS_DIR, 'up');
-    ENV.CHAINHOOK_AUTO_PREDICATE_REGISTRATION = false;
+    ENV.ORDHOOK_AUTO_PREDICATE_REGISTRATION = false;
     db = await PgStore.connect({ skipMigrations: true });
     server = await startOrdhookServer({ db });
     fastify = await buildApiServer({ db });
@@ -74,7 +74,7 @@ describe('EventServer', () => {
       const response = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: payload1,
       });
       expect(response.statusCode).toBe(200);
@@ -134,7 +134,7 @@ describe('EventServer', () => {
       const response2 = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: payload2,
       });
       expect(response2.statusCode).toBe(200);
@@ -214,7 +214,7 @@ describe('EventServer', () => {
       const response = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: payload1,
       });
       expect(response.statusCode).toBe(200);
@@ -274,7 +274,7 @@ describe('EventServer', () => {
       const response2 = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: payload2,
       });
       expect(response2.statusCode).toBe(200);
@@ -425,7 +425,7 @@ describe('EventServer', () => {
       const response = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: errorPayload,
       });
       expect(response.statusCode).toBe(400);
@@ -535,7 +535,7 @@ describe('EventServer', () => {
       const response = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: errorPayload,
       });
       expect(response.statusCode).toBe(400);
@@ -687,7 +687,7 @@ describe('EventServer', () => {
       const response = await server['fastify'].inject({
         method: 'POST',
         url: `/payload`,
-        headers: { authorization: `Bearer ${ENV.CHAINHOOK_NODE_AUTH_TOKEN}` },
+        headers: { authorization: `Bearer ${ENV.ORDHOOK_NODE_AUTH_TOKEN}` },
         payload: payload,
       });
       expect(response.statusCode).toBe(200);

diff --git a/tests/setup.ts b/tests/setup.ts
@@ -1,6 +1,7 @@
 // ts-unused-exports:disable-next-line
 export default (): void => {
-  process.env.CHAINHOOK_NODE_AUTH_TOKEN = 'test';
-  process.env.CHAINHOOK_NODE_RPC_HOST = 'test.chainhooks.com';
+  process.env.ORDHOOK_NODE_AUTH_TOKEN = 'test';
+  process.env.ORDHOOK_NODE_RPC_HOST = 'test.chainhooks.com';
+  process.env.ORDHOOK_NODE_RPC_PORT = '13370';
   process.env.PGDATABASE = 'postgres';
 };
diff --git a/util/debug-server.ts b/util/debug-server.ts
@@ -23,7 +23,7 @@ import * as path from 'path';
 const serverOpts: ServerOptions = {
   hostname: ENV.API_HOST,
   port: ENV.EVENT_PORT,
-  auth_token: ENV.CHAINHOOK_NODE_AUTH_TOKEN,
+  auth_token: ENV.ORDHOOK_NODE_AUTH_TOKEN,
   external_base_url: `http://${ENV.EXTERNAL_HOSTNAME}`,
   wait_for_chainhook_node: false,
   validate_chainhook_payloads: false,