refactor: removed unecessary global server

Author: MHassanTariq

.gitpod.Dockerfile

@@ -15,7 +15,6 @@ ENV STACKS_CORE_EVENT_PORT 3700
 ENV STACKS_CORE_EVENT_HOST http://0.0.0.0
 ENV STACKS_BLOCKCHAIN_API_PORT 3999
 ENV STACKS_BLOCKCHAIN_API_HOST 0.0.0.0
-ENV STACKS_BLOCKCHAIN_API_DB pg
 ENV STACKS_CORE_RPC_HOST 127.0.0.1
 ENV STACKS_CORE_RPC_PORT 20443
 ENV NODE_ENV development

.vscode/launch.json

@@ -42,7 +42,6 @@
       "preLaunchTask": "stacks-node:deploy-dev",
       "postDebugTask": "stacks-node:stop-dev",
       "env": {
-        "STACKS_BLOCKCHAIN_API_DB": "pg",
         "STACKS_CHAIN_ID": "0x80000000",
         "NODE_ENV": "development",
         "TS_NODE_SKIP_IGNORE": "true"
@@ -64,7 +63,6 @@
       "postDebugTask": "stacks-node:stop-dev",
       "env": {
         "STACKS_API_MODE": "writeonly",
-        "STACKS_BLOCKCHAIN_API_DB": "pg",
         "STACKS_CHAIN_ID": "0x80000000",
         "NODE_ENV": "development",
         "TS_NODE_SKIP_IGNORE": "true"
@@ -92,7 +90,6 @@
       "env": {
         "STACKS_BLOCKCHAIN_API_PORT": "3998",
         "STACKS_API_MODE": "readonly",
-        "STACKS_BLOCKCHAIN_API_DB": "pg",
         "STACKS_CHAIN_ID": "0x80000000",
         "NODE_ENV": "development",
         "TS_NODE_SKIP_IGNORE": "true"
@@ -110,7 +107,6 @@
       "preLaunchTask": "stacks-node:deploy-follower",
       "postDebugTask": "stacks-node:stop-dev",
       "env": {
-        "STACKS_BLOCKCHAIN_API_DB": "pg",
         "STACKS_CHAIN_ID": "0x00000001",
         "NODE_ENV": "development",
         "TS_NODE_SKIP_IGNORE": "true"

docker/docker-compose.yml

@@ -42,7 +42,6 @@ services:
       STACKS_CORE_EVENT_HOST: http://0.0.0.0
       STACKS_BLOCKCHAIN_API_PORT: 3999
       STACKS_BLOCKCHAIN_API_HOST: 0.0.0.0
-      STACKS_BLOCKCHAIN_API_DB: pg
       STACKS_CORE_RPC_HOST: stacks-blockchain
       STACKS_CORE_RPC_PORT: 20443
       NODE_ENV: development

package.json

@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "dev": "cross-env NODE_ENV=development STACKS_BLOCKCHAIN_API_DB=pg STACKS_CHAIN_ID=0x80000000 ts-node-transpile-only src/index.ts",
-    "dev:watch": "cross-env NODE_ENV=development STACKS_BLOCKCHAIN_API_DB=pg nodemon -e ts -x 'ts-node-transpile-only src/index.ts'",
+    "dev": "cross-env NODE_ENV=development STACKS_CHAIN_ID=0x80000000 ts-node-transpile-only src/index.ts",
+    "dev:watch": "cross-env NODE_ENV=development nodemon -e ts -x 'ts-node-transpile-only src/index.ts'",
     "dev:integrated": "npm run devenv:build && concurrently npm:dev npm:devenv:deploy",
     "dev:follower": "npm run devenv:build && concurrently npm:dev npm:devenv:follower",
     "test": "cross-env NODE_ENV=development jest --config ./jest.config.js --coverage --runInBand",

running_an_api.md

@@ -159,7 +159,6 @@ STACKS_CORE_EVENT_PORT=3700
 STACKS_CORE_EVENT_HOST=0.0.0.0
 STACKS_BLOCKCHAIN_API_PORT=3999
 STACKS_BLOCKCHAIN_API_HOST=0.0.0.0
-STACKS_BLOCKCHAIN_API_DB=pg
 STACKS_CORE_RPC_HOST=stacks-blockchain
 STACKS_CORE_RPC_PORT=20443
 BNS_IMPORT_DIR=/bns-data

running_api_from_source.md

@@ -146,7 +146,6 @@ STACKS_CORE_EVENT_PORT=3700
 STACKS_CORE_EVENT_HOST=0.0.0.0
 STACKS_BLOCKCHAIN_API_PORT=3999
 STACKS_BLOCKCHAIN_API_HOST=0.0.0.0
-STACKS_BLOCKCHAIN_API_DB=pg
 STACKS_CORE_RPC_HOST=localhost
 STACKS_CORE_RPC_PORT=20443
 #BNS_IMPORT_DIR=/stacks-node/bns

src/datastore/postgres-store.ts

@@ -2986,7 +2986,6 @@ export class PgDataStore
         `,
         [limit, offset]
       );
-      console.log('printing results here: ', results);
       const parsed = results.rows.map(r => this.parseBlockQueryResult(r));
       return { results: parsed, total: total.rows[0].count } as const;
     });

src/index.ts

@@ -139,22 +139,11 @@ async function init(): Promise<void> {
   if (apiMode === StacksApiMode.offline) {
     db = OfflineDummyStore;
   } else {
-    switch (process.env['STACKS_BLOCKCHAIN_API_DB']) {
-      case 'pg':
-      case undefined: {
-        const skipMigrations = apiMode === StacksApiMode.readOnly;
-        db = await PgDataStore.connect({
-          usageName: `datastore-${apiMode}`,
-          skipMigrations: skipMigrations,
-        });
-        break;
-      }
-      default: {
-        throw new Error(
-          `Invalid STACKS_BLOCKCHAIN_API_DB option: "${process.env['STACKS_BLOCKCHAIN_API_DB']}"`
-        );
-      }
-    }
+    const skipMigrations = apiMode === StacksApiMode.readOnly;
+    db = await PgDataStore.connect({
+      usageName: `datastore-${apiMode}`,
+      skipMigrations: skipMigrations,
+    });
 
     if (apiMode !== StacksApiMode.readOnly) {
       if (db instanceof PgDataStore) {

src/tests-bns/setup.ts

@@ -1,24 +1,11 @@
 import { loadDotEnv } from '../helpers';
 import { StacksCoreRpcClient } from '../core-rpc/client';
-import { PgDataStore } from '../datastore/postgres-store';
-
-export interface GlobalServices {
-  db: PgDataStore;
-}
 
 // ts-unused-exports:disable-next-line
 export default async (): Promise<void> => {
   console.log('Jest - setup..');
-  if (!process.env.NODE_ENV) {
-    process.env.NODE_ENV = 'test';
-  }
   loadDotEnv();
-  const db = await PgDataStore.connect({ skipMigrations: true, usageName: 'tests' });
   console.log('Waiting for RPC connection to core node..');
   await new StacksCoreRpcClient().waitForConnection(60000);
-  const globalServices: GlobalServices = {
-    db: db,
-  };
-  Object.assign(global, globalServices);
   console.log('Jest - setup done');
 };

src/tests-bns/teardown.ts

@@ -1,9 +1,5 @@
-import type { GlobalServices } from './setup';
-
 // ts-unused-exports:disable-next-line
 export default async (): Promise<void> => {
   console.log('Jest - teardown..');
-  const globalServices = (global as unknown) as GlobalServices;
-  await globalServices.db.close();
   console.log('Jest - teardown done');
 };