kylefang/stacks-blockchain-api
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-blockchain-api.git synced 2026-04-29 05:15:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove sidecar usage from database env vars

Browse Source
This commit is contained in:
Matthew Little
2020-07-27 12:05:48 +02:00
parent dc672d3bd0
commit 8bb9e1d43d
7 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -2,7 +2,7 @@ PG_HOST=127.0.0.1
PG_PORT=5490
PG_USER=postgres
PG_PASSWORD=postgres
PG_DATABASE=stacks_core_sidecar
PG_DATABASE=stacks_blockchain_api
STACKS_CORE_EVENT_PORT=3700
STACKS_CORE_EVENT_HOST=127.0.0.1

2
.gitpod.Dockerfile vendored
View File

@@ -15,7 +15,7 @@ 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_SIDECAR_DB pg
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

4
.vscode/launch.json vendored
View File

@@ -41,7 +41,7 @@
"preLaunchTask": "stacks-node:deploy-dev",
"postDebugTask": "stacks-node:stop-dev",
"env": {
"STACKS_SIDECAR_DB": "memory",
"STACKS_BLOCKCHAIN_API_DB": "memory",
"NODE_ENV": "development",
"TS_NODE_SKIP_IGNORE": "true",
}
@@ -57,7 +57,7 @@
"preLaunchTask": "stacks-node:deploy-dev",
"postDebugTask": "stacks-node:stop-dev",
"env": {
"STACKS_SIDECAR_DB": "pg",
"STACKS_BLOCKCHAIN_API_DB": "pg",
"NODE_ENV": "development",
"TS_NODE_SKIP_IGNORE": "true",
}

2
docker-compose.dev.postgres.yml
View File

@@ -7,7 +7,7 @@ services:
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: stacks_core_sidecar
POSTGRES_DB: stacks_blockchain_api
POSTGRES_PORT: 5432
volumes:
- database-data:/var/lib/postgresql/data/ # persist data even if container shuts down

6
docker-compose.yml
View File

@@ -7,7 +7,7 @@ services:
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: stacks_core_sidecar
POSTGRES_DB: stacks_blockchain_api
POSTGRES_PORT: 5432
volumes:
- database-data:/var/lib/postgresql/data/ # persist data even if container shuts down
@@ -39,12 +39,12 @@ services:
PG_PORT: 5432
PG_USER: postgres
PG_PASSWORD: postgres
PG_DATABASE: stacks_core_sidecar
PG_DATABASE: stacks_blockchain_api
STACKS_CORE_EVENT_PORT: 3700
STACKS_CORE_EVENT_HOST: http://0.0.0.0
STACKS_BLOCKCHAIN_API_PORT: 3999
STACKS_BLOCKCHAIN_API_HOST: 0.0.0.0
STACKS_SIDECAR_DB: pg
STACKS_BLOCKCHAIN_API_DB: pg
STACKS_CORE_RPC_HOST: stacks-blockchain
STACKS_CORE_RPC_PORT: 20443
NODE_ENV: development

4
package.json
View File

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

6
src/index.ts
View File

@@ -31,7 +31,7 @@ async function monitorCoreRpcConnection(): Promise<void> {
async function init(): Promise<void> {
let db: DataStore;
const txWsSubs: Map<string, Set<WebSocket>> = new Map();
switch (process.env['STACKS_SIDECAR_DB']) {
switch (process.env['STACKS_BLOCKCHAIN_API_DB']) {
case 'memory': {
logger.info('using in-memory db');
db = new MemoryDataStore();
@@ -43,7 +43,9 @@ async function init(): Promise<void> {
break;
}
default: {
throw new Error(`invalid STACKS_SIDECAR_DB option: "${process.env['STACKS_SIDECAR_DB']}"`);
throw new Error(
`Invalid STACKS_BLOCKCHAIN_API_DB option: "${process.env['STACKS_BLOCKCHAIN_API_DB']}"`
);
}
}
await startEventServer(db, txWsSubs);