fix rollme

fix api version full regression test
rundax · Oct 25, 2020 · 184ee53 · 184ee53
1 parent 6868034
commit 184ee53
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.helm/stake-defender-app/templates/deployment.yaml b/.helm/stake-defender-app/templates/deployment.yaml
@@ -20,7 +20,7 @@ spec:
         app.kubernetes.io/name: {{ .Chart.Name }}
         app.kubernetes.io/instance: {{ .Release.Name }}
       annotations:
-        rollme: { { randAlphaNum 5 | quote } }
+        rollme: {{ randAlphaNum 5 | quote }}
     spec:
       imagePullSecrets:
         - name: {{ .Values.image.secret }}

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -10,7 +10,6 @@ services:
       - ~/.cache/yarn:/home/node/.cache/yarn:rw
 
   redis:
-    container_name: ${PROJECT_NAME}_redis
     image: redis:4
     volumes:
       - redis_data:/data/:rw

diff --git a/src/Modules/Monitoring/Modules/SplashChecker/index.ts b/src/Modules/Monitoring/Modules/SplashChecker/index.ts
@@ -38,11 +38,11 @@ export class SplashChecker {
                         let block: BlockInfoInterface;
                         [validators, block] = data;
                         let isValidator = validators.find( (item) => {
-                            return item.pub_key === this.config.publicKeyValidator;
+                            return item.public_key === this.config.publicKeyValidator;
                         });
                         if (isValidator !== undefined) {
                             let isSign = block.validators.find((item) => {
-                                return item.pub_key === this.config.publicKeyValidator && item.signed === true;
+                                return item.public_key === this.config.publicKeyValidator && item.signed === true;
                             });
                             if (isSign === undefined) {
                                 BlockStorage.addBlock(parseInt(block.height), block.hash, true);

diff --git a/src/Modules/NodeApi/Interfaces/InfoInterface.ts b/src/Modules/NodeApi/Interfaces/InfoInterface.ts
@@ -104,7 +104,7 @@ interface StakeItem {
 }
 
 export interface ValidatorItemInterface {
-    pub_key: string;
+    public_key: string;
     voting_power: string;
 }
 
@@ -119,7 +119,7 @@ export interface BlockInfoInterface {
     size: string;
     proposer: string;
     transactions: TransactionItem[];
-    validators: {pub_key: string, signed:boolean}[];
+    validators: {public_key: string, signed:boolean}[];
 }
 
 interface TransactionItem {

diff --git a/src/Modules/NodeApi/index.ts b/src/Modules/NodeApi/index.ts
@@ -153,7 +153,7 @@ export class NodeApi {
                     if (response === false) {
                         reject('Response is false');
                     }
-                    resolve(response.data);
+                    resolve(response.data.validators);
                 })
                 .catch((err) => {
                     Core.error('Can not get validators list from node', err.message, 'NodeApi');
@@ -164,7 +164,7 @@ export class NodeApi {
 
     public async getBlock(height: number): Promise<BlockInfoInterface> {
         return new Promise<BlockInfoInterface>((resolve, reject) => {
-            this.request('/block?height=' + height)
+            this.request('/block/' + height)
                 .then((response) => {
                 if (response === false) {
                     reject('Response is false');