fix: add check for nested empty JSON objects

.github/workflows/deploy-subgraph.yml

@@ -5,10 +5,12 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Azure_runners
+      labels: [ self-hosted, Linux, X64 ]
     strategy:
       matrix:
-        include:
+        subgraph:
           - target: staging
             subgraph_name: 'bellecour/staging-dataprotector-v2'
             env_name: staging

packages/sdk/tests/e2e/constructor.test.ts

@@ -1,11 +1,12 @@
 import { describe, it, expect } from '@jest/globals';
 import { IExecDataProtector } from '../../src/index.js';
+import { getTestConfig } from '../test-utils.js';
 
 describe('When instantiating SDK without a signer', () => {
   describe('When calling a read method', () => {
     it('should work as expected', async () => {
       // --- GIVEN
-      const dataProtector = new IExecDataProtector();
+      const dataProtector = new IExecDataProtector(...getTestConfig());
 
       // --- WHEN/THEN
       await expect(

packages/sdk/tests/e2e/dataProtectorCore/getProtectedData.test.ts

@@ -106,6 +106,35 @@ describe('dataProtectorCore.getProtectedData()', () => {
     );
   });
 
+  describe('When calling getProtectedData for a ProtectedData that contains nested empty JSON objects', () => {
+    it('should return the protectedData without the field corresponding to the nested empty JSON objects', async () => {
+      // --- GIVEN
+      const createdProtectedData = await dataProtectorCore.protectData({
+        data: {
+          email: 'example@example.com',
+          tag: { size: 10, emptyObject: {} },
+        },
+        name: 'test getProtectedData',
+      });
+      await waitForSubgraphIndexing();
+
+      // --- WHEN
+      const result = await dataProtectorCore.getProtectedData({
+        protectedDataAddress: createdProtectedData.address,
+      });
+
+      // --- THEN
+      expect(result.length).toEqual(1);
+      expect(result[0].name).toEqual('test getProtectedData');
+      expect(result[0].schema).toEqual({
+        email: 'string',
+        tag: {
+          size: 'f64',
+        },
+      });
+    });
+  });
+
   describe('When calling getProtectedData with a specific owner', () => {
     it(
       "should return only this owner's protectedData",

packages/sdk/tests/test-utils.ts

@@ -39,9 +39,11 @@ export const getTestIExecOption = () => ({
 });
 
 export const getTestConfig = (
-  privateKey: string
+  privateKey?: string
 ): [Web3SignerProvider, DataProtectorConfigOptions] => {
-  const ethProvider = getTestWeb3SignerProvider(privateKey);
+  const ethProvider = privateKey
+    ? getTestWeb3SignerProvider(privateKey)
+    : undefined;
   const options = {
     iexecOptions: getTestIExecOption(),
     ipfsGateway: process.env.DRONE

packages/subgraph/src/dataProtector.ts

@@ -111,7 +111,8 @@ function recursiveParse(
 
     if (entry.value.kind == JSONValueKind.OBJECT) {
       const object = entry.value.toObject();
-      for (let i = 0; i < object.entries.length; i++) {
+      // Check that the object is not empty before recursion
+      if (object.entries.length > 0) {
         accumulator = accumulator.concat(recursiveParse(object, path));
       }
     } else if (entry.value.kind == JSONValueKind.STRING) {