drop spark- prefix from directory names

Signed-off-by: Miroslav Bajtoš <[email protected]>

Author: bajtos

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     env:
       DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
       GLIF_TOKEN: ${{ secrets.GLIF_TOKEN }}
-      NPM_CONFIG_WORKSPACE: spark-api
+      NPM_CONFIG_WORKSPACE: api
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -51,7 +51,7 @@ jobs:
           --health-retries 5
     env:
       DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
-      NPM_CONFIG_WORKSPACE: spark-publish
+      NPM_CONFIG_WORKSPACE: publish
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -110,7 +110,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: cd spark-api && flyctl deploy --remote-only
+      - run: cd api && flyctl deploy --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
       - if: failure()
@@ -139,7 +139,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: cd spark-publish && flyctl deploy --remote-only
+      - run: cd publish && flyctl deploy --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN_PUBLISH }}
       - if: failure()

Dockerfile

@@ -29,8 +29,8 @@ COPY --link package-lock.json package.json ./
 
 # We cannot use a wildcard until `COPY --parents` is stabilised
 # See https://docs.docker.com/reference/dockerfile/#copy---parents
-COPY --link spark-api/package.json ./spark-api/
-COPY --link spark-publish/package.json ./spark-publish/
+COPY --link api/package.json ./api/
+COPY --link publish/package.json ./publish/
 
 RUN npm ci --workspaces
 
@@ -50,6 +50,6 @@ ARG SERVICE
 
 # ARGs are not preserved at runtime, we need to store the value
 # as a default value of an ENV var
-ENV WORKSPACE="spark-${SERVICE}"
+ENV WORKSPACE="${SERVICE}"
 
 CMD npm start --workspace ${WORKSPACE}

README.md

@@ -84,19 +84,19 @@ docker run -d --name spark-db \
   postgres
 ```
 
-### `spark-api`
+### `api`
 
 Start the API service:
 
 ```bash
-npm start --workspace spark-api
+npm start --workspace api
 ```
 
 Run tests and linters:
 
 ```bash
-npm test --workspace spark-api
-npm run lint --workspace spark-api
+npm test --workspace api
+npm run lint --workspace api
 ```
 
 ## Deployment
@@ -106,5 +106,5 @@ Pushes to `main` will be deployed automatically.
 Perform manual devops using [Fly.io](https://fly.io):
 
 ```bash
-$ fly deploy spark-api
+$ fly deploy api
 ```

spark-api/bin/spark.js renamed to api/bin/spark.js

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { RPC_URL, GLIF_TOKEN } from '../../spark-publish/ie-contract-config.js'
+import { RPC_URL, GLIF_TOKEN } from '../../publish/ie-contract-config.js'
 import * as SparkImpactEvaluator from '@filecoin-station/spark-impact-evaluator'
 
 const fetchRequest = new ethers.FetchRequest(RPC_URL)