Small fixes (Joystream#124)

* fix: always add marshal.ts to generated code
* fix: typo in db:create-migration script
* fix: relax indexer version check

Author: eldargab

.github/workflows/debug.yml

@@ -0,0 +1,11 @@
+name: debug
+on: [workflow_dispatch]
+
+jobs:
+  debug:
+    name: Debug actions environment
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3

.github/workflows/hydra-e2e-tests.yml

@@ -8,8 +8,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      #- uses: satackey/action-docker-layer-caching@v0.0.11
-      # Ignore the failure of a step and avoid terminating the job.
-      #  continue-on-error: true
       - name: run e2e tests
         run: ./scripts/e2e-test.sh

packages/hydra-cli/src/codegen.ts

@@ -37,7 +37,6 @@ export function codegen(options: CodegenOptions): void {
 function generateOrmModels(model: Model, dir: OutDir): void {
   const variants = collectVariants(model)
   const index = dir.file('model.ts')
-  let usesMarshaling = false
 
   for (const name in model) {
     const item = model[name]
@@ -47,7 +46,6 @@ function generateOrmModels(model: Model, dir: OutDir): void {
         break
       case 'object':
         generateObject(name, item)
-        usesMarshaling = true
         break
       case 'union':
         generateUnion(name, item)
@@ -59,9 +57,7 @@ function generateOrmModels(model: Model, dir: OutDir): void {
   }
 
   index.write()
-  if (usesMarshaling) {
-    dir.addResource('codegen/marshal.ts', 'marshal.ts')
-  }
+  dir.addResource('codegen/marshal.ts', 'marshal.ts')
 
   function generateEntity(name: string, entity: Entity): void {
     index.line(`export * from "./model/${lowerCaseFirst(name)}.model"`)

packages/hydra-cli/src/scaffold.ts

@@ -30,7 +30,7 @@ export function scaffold(options: ScaffoldOptions): void {
       build: 'tsc',
       'db:create': 'hydra-cli db:create',
       'db:drop': 'hydra-cli db:drop',
-      'db:create-migration': 'hydra-clo db:create-migration',
+      'db:create-migration': 'hydra-cli db:create-migration',
       'db:migrate': 'hydra-cli db:migrate',
       'db:revert': 'hydra-cli db:revert',
       'db:reset':

packages/hydra-e2e-tests/docker-compose.yml

@@ -27,7 +27,7 @@ services:
       - DB_PASS=postgres
       - DB_HOST=db
       - DB_PORT=5432
-      - INDEXER_ENDPOINT_URL=http://hydra-indexer-gateway:8080/v1/graphql
+      - INDEXER_ENDPOINT_URL=http://hydra-indexer-gateway:8087/v1/graphql
       - CHAIN_NODE=ws://node-template:9944
       - POLL_INTERVAL_MS=500 # refresh every second
       - DEBUG=hydra*
@@ -70,6 +70,7 @@ services:
     build:
       context: ../..
       target: indexer-gateway
+    restart: always
     depends_on:
       - redis
       - db
@@ -83,6 +84,7 @@ services:
       DB_HOST: db
       DB_PORT: 5432
       HYDRA_INDEXER_STATUS_SERVICE: http://hydra-indexer-status-service:8081/status
+      HASURA_GRAPHQL_SERVER_PORT: 8087
 
   hydra-indexer-status-service:
     build:

packages/hydra-e2e-tests/test/api/indexer.ts

@@ -1,7 +1,7 @@
 import { GqlClient } from './gql-client'
 
 export const indexer = new GqlClient(
-  'http://hydra-indexer-gateway:8080/v1/graphql'
+  'http://hydra-indexer-gateway:8087/v1/graphql'
 )
 
 export async function indexerHead(): Promise<number> {

packages/hydra-indexer-gateway/metadata/actions.graphql

@@ -3,7 +3,7 @@ type Query {
 }
 
 type IndexerStatus {
-  hydraVersion : String
+  hydraVersion : String!
   head : Int!
   lastComplete : Int!
   maxComplete : Int!

packages/hydra-processor/src/state/StateKeeper.ts

@@ -111,7 +111,7 @@ export class StateKeeper implements IStateKeeper {
         manifest.indexerVersionRange
       )
     }
-    validateIndexerVersion(this.indexerStatus.hydraVersion, '>=4 <5')
+    validateIndexerVersion(this.indexerStatus.hydraVersion, '>=4')
 
     const range = manifest.mappings.range