Skip to content

Commit 47d2d60

Browse files
fix: node interface parsing and bump 2.9.0-rc7
1 parent 2e571cf commit 47d2d60

File tree

5 files changed

+16
-25
lines changed

5 files changed

+16
-25
lines changed

indexer/chart/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name: tfchainindexer
22
description: Helm Chart for the tfchain hydra indexer
33
version: 2.7.7
44
apiVersion: v2
5-
appVersion: '2.9.0-rc6'
5+
appVersion: '2.9.0-rc7'

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "graphql_tfgrid",
33
"private": "true",
4-
"version": "2.9.0-rc6",
4+
"version": "2.9.0-rc7",
55
"description": "GraphQL server and Substrate indexer. Generated with ♥ by Hydra-CLI",
66
"author": "",
77
"license": "ISC",

processor-chart/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
name: tfchain-processor
33
description: A chart for the tfchain graphql processor and query node
44
version: 1.0.5
5-
appVersion: '2.9.0-rc6'
5+
appVersion: '2.9.0-rc7'

src/mappings/nodes.ts

+12-21
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { PublicConfig as V105PublicConfig } from '../types/v105'
77

88
import { Ctx } from '../processor'
99
import assert from "assert";
10+
import { allowedNodeEnvironmentFlags } from "process";
1011

1112
export async function nodeStored(
1213
ctx: Ctx,
@@ -139,11 +140,9 @@ export async function nodeStored(
139140
newInterface.mac = intf.mac.toString()
140141
newInterface.ips = intf.ips.map(ip => ip.toString()).join(',')
141142
await ctx.store.save<Interfaces>(newInterface)
142-
newNode.interfaces.push(newInterface)
143143
})
144144

145145
await Promise.all(interfacesPromisses)
146-
await ctx.store.save<Node>(newNode)
147146
}
148147

149148
export async function nodeUpdated(
@@ -319,31 +318,23 @@ export async function nodeUpdated(
319318
}
320319
}
321320

322-
const interfacesPromisses = nodeEvent.interfaces.map(async intf => {
323-
let newInterface
324-
325-
if (savedNode.interfaces) {
326-
// if an interface with same name exists
327-
const found = savedNode.interfaces.findIndex(interf => interf.name === intf.name.toString())
328-
if (found > 0) {
329-
newInterface = savedNode.interfaces[found]
330-
} else {
331-
newInterface = new Interfaces()
332-
newInterface.id = item.event.id
333-
newInterface.node = savedNode
334-
}
335-
}
336-
337-
if (!newInterface) return
321+
// First remove all ifs
322+
const nodeIfs = await ctx.store.find(Interfaces, { where: { node: { nodeID: savedNode.nodeID } } })
323+
await ctx.store.remove(nodeIfs)
338324

325+
// Save ones from update event
326+
await Promise.all(nodeEvent.interfaces.map(async intf => {
327+
const newInterface = new Interfaces()
328+
newInterface.id = item.event.id + intf.name.toString()
339329
newInterface.name = intf.name.toString()
340330
newInterface.mac = intf.mac.toString()
341331
newInterface.ips = intf.ips.map(ip => ip.toString()).join(',')
342-
332+
newInterface.node = savedNode
343333
await ctx.store.save<Interfaces>(newInterface)
334+
344335
savedNode.interfaces.push(newInterface)
345-
})
346-
await Promise.all(interfacesPromisses)
336+
}))
337+
347338
await ctx.store.save<Node>(savedNode)
348339
}
349340

0 commit comments

Comments
 (0)