Merge pull request #30 from kleros/fix/metadata-parsing

fix: metadata-parsing

Author: jaybuidl

.yarn/install-state.gz

@@ -1,8 +1,9 @@
 {
   "name": "gtcr-subgraph",
-  "version": "1.0.0",
+  "version": "1.1.4",
   "description": "Subgraph for Generalized TCR contracts",
   "scripts": {
+    "clean": "graph clean",
     "fix-schema.ts": "replace-in-file '/(;\\s*if \\()value === null/mg' '$1value === null || value.kind === ValueKind.NULL' generated/schema.ts --isRegex",
     "codegen:gnosis": "node render-templates.js gnosis && graph codegen && yarn fix-schema.ts",
     "build:gnosis": "yarn codegen:gnosis && graph build",
@@ -30,7 +31,6 @@
   },
   "author": "Kleros",
   "license": "MIT",
-  "private": false,
   "bugs": {
     "url": "https://github.com/kleros/gtcr-subgraph/issues"
   },

package.json

@@ -8,15 +8,16 @@ export function handleGTCREvidenceMetadata(content: Bytes): void {
   const evidenceId = context.getString('evidenceId');
 
   const evidence = new EvidenceMetadata(`${id}-${evidenceId}`);
-  const value = json.fromBytes(content).toObject();
+  const parsedResult = json.try_fromBytes(content);
 
   log.debug(`ipfs hash : {}, content : {}`, [id, content.toString()]);
 
-  if (!value) {
+  if (!parsedResult.isOk || parsedResult.isError) {
     log.warning(`Error converting object for evidence {}`, [id]);
     evidence.save();
     return;
   }
+  const value = parsedResult.value.toObject();
 
   const nameValue = value.get('name');
   if (!nameValue) {

src/fileHandlers/EvidenceMetadataHandler.ts

@@ -7,15 +7,16 @@ export function handleLGTCREvidenceMetadata(content: Bytes): void {
   const evidenceId = context.getString('evidenceId');
 
   const evidence = new EvidenceMetadata(`${id}-${evidenceId}`);
-  const value = json.fromBytes(content).toObject();
+  const parsedResult = json.try_fromBytes(content);
 
   log.debug(`ipfs hash : {}, content : {}`, [id, content.toString()]);
 
-  if (!value) {
+  if (!parsedResult.isOk || parsedResult.isError) {
     log.warning(`Error converting object for evidence {}`, [id]);
     evidence.save();
     return;
   }
+  const value = parsedResult.value.toObject();
 
   const nameValue = value.get('name');
   if (!nameValue) {

src/fileHandlers/LEvidenceMetadataHandler.ts

@@ -5,7 +5,7 @@ import { JSONValueToBool, JSONValueToMaybeString } from '../utils';
 export function handleLItemMetadata(content: Bytes): void {
   const ipfsHash = dataSource.stringParam();
 
-  const value = json.fromBytes(content).toObject();
+  const parsedResult = json.try_fromBytes(content);
 
   const context = dataSource.context();
   const graphItemID = context.getString('graphItemID');
@@ -19,23 +19,26 @@ export function handleLItemMetadata(content: Bytes): void {
 
   log.debug(`ipfs hash : {}, content : {}`, [ipfsHash, content.toString()]);
 
-  if (!value) {
+  if (!parsedResult.isOk || parsedResult.isError) {
     log.warning(`Error converting object for graphItemId {}`, [graphItemID]);
     metadata.save();
     return;
   }
+  const value = parsedResult.value.toObject();
 
   const columnsValue = value.get('columns');
   if (!columnsValue) {
-    log.error(`Error getting column values for graphItemID {}`, [graphItemID]);
+    log.warning(`Error getting column values for graphItemID {}`, [
+      graphItemID,
+    ]);
     metadata.save();
     return;
   }
   const columns = columnsValue.toArray();
 
   const valuesValue = value.get('values');
   if (!valuesValue) {
-    log.error(`Error getting valuesValue for graphItemID {}`, [graphItemID]);
+    log.warning(`Error getting valuesValue for graphItemID {}`, [graphItemID]);
     metadata.save();
     return;
   }

src/fileHandlers/LItemMetadataHandler.ts

@@ -5,7 +5,7 @@ import { JSONValueToBool, JSONValueToMaybeString } from '../utils';
 export function handleLRegistryMetadata(content: Bytes): void {
   const ipfsHash = dataSource.stringParam();
 
-  const value = json.fromBytes(content).toObject();
+  const parsedResult = json.try_fromBytes(content);
 
   const context = dataSource.context();
   const count = context.getBigInt('count');
@@ -17,15 +17,17 @@ export function handleLRegistryMetadata(content: Bytes): void {
 
   log.debug(`ipfs hash : {}, content : {}`, [ipfsHash, content.toString()]);
 
-  if (!value) {
+  if (!parsedResult.isOk || parsedResult.isError) {
     log.warning(`Error converting object for hash {}`, [ipfsHash]);
     metadata.save();
     return;
   }
 
+  const value = parsedResult.value.toObject();
+
   const metadataValue = value.get('metadata');
   if (!metadataValue) {
-    log.error(`Error getting metadata values from ipfs hash {}`, [ipfsHash]);
+    log.warning(`Error getting metadata values from ipfs hash {}`, [ipfsHash]);
     metadata.save();
     return;
   }