fix: block parsing with encrypted transaction (#176)

RequestNetwork · Mar 19, 2020 · de86f43 · de86f43
1 parent 48bb362
commit de86f43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/data-access/src/block.ts b/packages/data-access/src/block.ts
@@ -59,10 +59,9 @@ function parseBlock(data: string): DataAccessTypes.IBlock {
   }
 
   // check the transactions format
-  if (maybeBlock.transactions.some((tx: any) => !tx.data)) {
+  if (!maybeBlock.transactions.every((tx: any) => tx.data || (tx.encryptedData && tx.hash))) {
     throw new Error(`Transactions do not follow the block standard`);
   }
-
   // check if channelIds are well formatted
   // check that all the channel ids are hashes
   if (

diff --git a/packages/data-access/src/data-access.ts b/packages/data-access/src/data-access.ts
@@ -491,7 +491,7 @@ export default class DataAccess implements DataAccessTypes.IDataAccess {
         const resultRead = await this.storage.read(location);
 
         return {
-          block: JSON.parse(resultRead.content),
+          block: Block.parseBlock(resultRead.content),
           location,
           meta: resultRead.meta,
         };

diff --git a/packages/request-node/test/getTransactionsByChannelId.test.ts b/packages/request-node/test/getTransactionsByChannelId.test.ts
@@ -5,9 +5,9 @@ import * as httpStatus from 'http-status-codes';
 import * as request from 'supertest';
 import requestNode from '../src/requestNode';
 
-const channelId = '0xchannelId1';
-const anotherChannelId = '0xanotherChannelId1';
-const nonExistentChannelId = 'NonExistentTopic';
+const channelId = '01aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab';
+const anotherChannelId = '01bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc';
+const nonExistentChannelId = '01cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccd';
 const transactionData = {
   data: 'this is sample data for a transaction to test getTransactionsByChannelId',
 };