Merge pull request #12 from chainflip-io/fix/warp

chainflip-io · Aug 23, 2023 · ea04784 · ea04784
2 parents 6dffcf2 + 2b0a415
commit ea04784
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Test charts
         run: |
-          helm unittest ./charts/*
+          helm unittest ./charts/* 
 
   check_version:
     runs-on: ubuntu-latest

diff --git a/charts/node/Chart.yaml b/charts/node/Chart.yaml
@@ -10,6 +10,6 @@ maintainers:
 
 type: application
 
-version: 0.1.10
+version: 0.1.11
 
 appVersion: "0.9.0"
diff --git a/charts/node/templates/_helpers.tpl b/charts/node/templates/_helpers.tpl
@@ -62,10 +62,11 @@ chainflip.io/name: {{ .Release.Name }}
 Chain name
 */}}
 {{- define "chainflip-node.chain" -}}
+{{- $chain := .Values.network.chain.name | required ".Values.network.chain.name is required." -}}
 {{- if .Values.network.chain.chainspecUrl }}
-{{- printf "%s/%s.chainspec.json" .Values.common.basePath .Values.network.chain.name }}
+{{- printf "%s/%s.chainspec.json" .Values.common.basePath $chain }}
 {{- else -}}
-{{- printf "%s" .Values.network.chain.name }}
+{{- printf "%s" $chain }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/node/templates/node-statefulset.yaml b/charts/node/templates/node-statefulset.yaml
@@ -80,7 +80,6 @@ spec:
             {{- if eq .Values.common.role "validator" }}
             - --node-key-file={{ .Values.common.keys.keysPath }}/{{ .Values.common.keys.nodeKeyFileName }}
             - --validator
-            - --sync=warp
             {{- end }}
             {{- if eq .Values.common.role "archive" }}
             - --blocks-pruning=archive

diff --git a/charts/node/tests/engine_test.yaml b/charts/node/tests/engine_test.yaml
@@ -8,7 +8,7 @@ tests:
           of: StatefulSet
       - equal:
           path: spec.template.spec.containers[0].image
-          value: chainfliplabs/chainflip-engine:perseverance
+          value: chainfliplabs/chainflip-engine:test
   - it: should not create a pvc if supplying an existing claim
     set:
       engine.persistence.existingClaim: "test"

diff --git a/charts/node/tests/is_archive_test.yaml b/charts/node/tests/is_archive_test.yaml
@@ -14,7 +14,7 @@ tests:
           of: StatefulSet
       - equal:
           path: spec.template.spec.containers[0].image
-          value: chainfliplabs/chainflip-node:perseverance
+          value: chainfliplabs/chainflip-node:test
       - notExists:
           path: spec.template.spec.containers[0].volumeMounts[1]
   - it: should not create the engine template

diff --git a/charts/node/tests/node_test.yaml b/charts/node/tests/node_test.yaml
@@ -8,7 +8,7 @@ tests:
           of: StatefulSet
       - equal:
           path: spec.template.spec.containers[0].image
-          value: chainfliplabs/chainflip-node:perseverance
+          value: chainfliplabs/chainflip-node:test
   - it: should not create a pvc if supplying an existing claim
     set:
       node.persistence.existingClaim: "test"

diff --git a/charts/node/tests/values/archive.values.yaml b/charts/node/tests/values/archive.values.yaml
@@ -1,2 +1,5 @@
+network:
+  chain:
+    name: test
 common:
   role: "archive"
diff --git a/charts/node/tests/values/happy.values.yaml b/charts/node/tests/values/happy.values.yaml
@@ -1,3 +1,6 @@
+network:
+  chain:
+    name: test
 engine:
   settings:
     node_p2p:

diff --git a/charts/node/values.yaml b/charts/node/values.yaml
@@ -48,10 +48,10 @@ network:
   # -- chain settings
   chain:
     # -- chain name; `perseverance`
-    name: "perseverance"
+    name: "test"
 
     # -- download the chainspec from a URL
-    chainspecUrl: "https://s3.eu-central-1.amazonaws.com/repo.chainflip.io/chainspecs/perseverance.chainspec.json"
+    chainspecUrl: ""
 
   # -- network bootnodes
   bootnodes: