Merge branch 'update-nodejs' into graphql-armor

Joystream · Sep 20, 2023 · b9f61e3 · b9f61e3
2 parents 0196bf8 + 9c45687
commit b9f61e3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/examples/indexers/node-template/docker-compose.yml b/examples/indexers/node-template/docker-compose.yml
@@ -42,11 +42,11 @@ services:
 
   ## node-template image
   substrate:
-    image: joystream/node:latest
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["./joystream/node", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

diff --git a/packages/hydra-e2e-tests/docker-compose.yml b/packages/hydra-e2e-tests/docker-compose.yml
@@ -97,11 +97,11 @@ services:
 
 
   node-template:
-    image: joystream/node:latest
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["/joystream/node", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

diff --git a/packages/hydra-e2e-tests/fixtures/mappings/mappings.ts b/packages/hydra-e2e-tests/fixtures/mappings/mappings.ts
@@ -9,7 +9,7 @@ import {
 
 // run 'NODE_URL=<RPC_ENDPOINT> EVENTS=<comma separated list of events> yarn codegen:mappings-types'
 // to genenerate typescript classes for events, such as Balances.TransferEvent
-import { Balances_TransferEvent_V100, SetCall } from './generated/types'
+import { Balances_TransferEvent_V2001, SetCall } from './generated/types'
 import BN from 'bn.js'
 import {
   ExtrinsicContext,
@@ -43,7 +43,7 @@ export async function balancesTransfer({
   extrinsic,
 }: EventContext & StoreContext) {
   const transfer = new Transfer()
-  const [from, to, value] = new Balances_TransferEvent_V100(event).params
+  const [from, to, value] = new Balances_TransferEvent_V2001(event).params
   transfer.from = Buffer.from(from.toHex())
   transfer.to = Buffer.from(to.toHex())
   transfer.value = value.toBn()

diff --git a/packages/hydra-e2e-tests/run-tests.sh b/packages/hydra-e2e-tests/run-tests.sh
@@ -2,10 +2,10 @@
 
 cleanup()
 {
-  (echo "## Processor Logs ##" && docker logs hydra-e2e-tests_hydra-processor_1 --tail 50) || :
-  (echo "## Query Node Logs ##" && docker logs hydra-e2e-tests_query-node_1 --tail 50) || :  
-  (echo "## Indexer Logs ##" && docker logs hydra-e2e-tests_hydra-indexer_1 --tail 50) || :  
-  (echo "## Indexer API Server ##" && docker logs hydra-e2e-tests_hydra-indexer-gateway_1 --tail 50) || :  
+  (echo "## Processor Logs ##" && docker logs hydra-e2e-tests_hydra-processor_1 --tail 200) || :
+  (echo "## Query Node Logs ##" && docker logs hydra-e2e-tests_query-node_1 --tail 200) || :
+  (echo "## Indexer Logs ##" && docker logs hydra-e2e-tests_hydra-indexer_1 --tail 50) || :
+  (echo "## Indexer API Server ##" && docker logs hydra-e2e-tests_hydra-indexer-gateway_1 --tail 50) || :
   (yarn post-e2e-test) || :
   rm -rf ./hydra-test
 }
@@ -37,7 +37,7 @@ until $(curl -s --head  --request GET http://localhost:3000/metrics/hydra_proces
 
     printf '.'
     attempt_counter=$(($attempt_counter+1))
-    sleep 5
+    sleep 10
 done
 
 # start rest of services (query-node most importantly)

diff --git a/packages/hydra-indexer/docker-compose-test.yml b/packages/hydra-indexer/docker-compose-test.yml
@@ -2,10 +2,10 @@ version: "3"
 
 services:
   substrate:
-    image: joystream/node:latest
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     ports:
       - "9944:9944"
-    command: ["/joystream/node", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine

diff --git a/packages/hydra-processor/docker-compose-test.yml b/packages/hydra-processor/docker-compose-test.yml
@@ -2,11 +2,11 @@ version: "3"
 
 services:
   node-template:
-    image: joystream/node:latest
+    image: joystream/node:2f8fe07f801618c1371ecc5d5ee944fe4e2c0d1f
     restart: unless-stopped
     ports:
       - "9944:9944"
-    command: ["/joystream/node", "--dev", "--tmp", "--ws-external"]
+    command: ["--dev", "--tmp", "--ws-external"]
 
   redis:
     image: redis:6.0-alpine