information to status

packages/data-access/src/data-access.ts

@@ -456,7 +456,7 @@ export default class DataAccess implements DataAccessTypes.IDataAccess {
    *
    * @param detailed if true get the list of the files hashes
    */
-  public async _getInformation(detailed: boolean = false): Promise<any> {
+  public async _getStatus(detailed: boolean = false): Promise<any> {
     this.checkInitialized();
 
     // last transaction timestamp retrieved

packages/data-access/test/data-access.test.ts

@@ -104,7 +104,7 @@ const defaultTestData: Promise<StorageTypes.IEntriesWithLastTimestamp> = Promise
 );
 
 const defaultFakeStorage: StorageTypes.IStorage = {
-  _getInformation: chai.spy(),
+  _getStatus: chai.spy(),
   _ipfsAdd: chai.spy(),
   append: chai.spy(
     (): any => {
@@ -493,7 +493,7 @@ describe('data-access', () => {
 
     it('cannot persistTransaction() and emit error if confirmation failed', async () => {
       const mockStorageEmittingError: StorageTypes.IStorage = {
-        _getInformation: chai.spy(),
+        _getStatus: chai.spy(),
         _ipfsAdd: chai.spy(),
         append: chai.spy(
           (): any => {
@@ -546,7 +546,7 @@ describe('data-access', () => {
     });
   });
 
-  describe('_getInformation', () => {
+  describe('_getStatus', () => {
     let dataAccess: any;
 
     beforeEach(async () => {
@@ -569,20 +569,15 @@ describe('data-access', () => {
       await dataAccess.initialize();
     });
 
-    it('can _getInformation()', async () => {
-      expect(await dataAccess._getInformation(), 'result with arbitraryTopic1 wrong').to.deep.equal(
-        {
-          filesIgnored: { count: 0, list: undefined },
-          filesRetrieved: { count: 1, lastTimestamp: 10, list: undefined },
-          lastSynchronizationTimestamp: 0,
-        },
-      );
+    it('can _getStatus()', async () => {
+      expect(await dataAccess._getStatus(), 'result with arbitraryTopic1 wrong').to.deep.equal({
+        filesIgnored: { count: 0, list: undefined },
+        filesRetrieved: { count: 1, lastTimestamp: 10, list: undefined },
+        lastSynchronizationTimestamp: 0,
+      });
     });
-    it('can _getInformation() with details', async () => {
-      expect(
-        await dataAccess._getInformation(true),
-        'result with arbitraryTopic1 wrong',
-      ).to.deep.equal({
+    it('can _getStatus() with details', async () => {
+      expect(await dataAccess._getStatus(true), 'result with arbitraryTopic1 wrong').to.deep.equal({
         filesIgnored: { count: 0, list: {} },
         filesRetrieved: { count: 1, lastTimestamp: 10, list: ['dataIdBlock2tx'] },
         lastSynchronizationTimestamp: 0,
@@ -618,7 +613,7 @@ describe('data-access', () => {
       _ipfsAdd: chai.spy(),
       append: chai.spy(),
       getData: (): Promise<StorageTypes.IEntriesWithLastTimestamp> => testDataNotJsonData,
-      _getInformation: chai.spy(),
+      _getStatus: chai.spy(),
       initialize: chai.spy(),
       read: chai.spy(),
       readMany: chai.spy(),
@@ -740,7 +735,7 @@ describe('data-access', () => {
       _ipfsAdd: chai.spy(),
       append: chai.spy.returns(appendResult),
       getData: (): Promise<StorageTypes.IEntriesWithLastTimestamp> => chai.spy(),
-      _getInformation: chai.spy(),
+      _getStatus: chai.spy(),
       initialize: chai.spy(),
       read: chai.spy(),
       readMany: chai.spy(),

packages/data-access/test/ignored-location.test.ts

@@ -39,21 +39,21 @@ describe('IgnoredLocation', () => {
     });
   });
 
-  describe('getIgnoredLocation', () => {
-    it('can getIgnoredLocation()', async () => {
+  describe('getIgnoredLocations', () => {
+    it('can getIgnoredLocations()', async () => {
       const ignoredLocation = new IgnoredLocation();
       await ignoredLocation.pushReasonByLocation(arbitraryDataId1, arbitraryReason);
       await ignoredLocation.pushReasonByLocation(arbitraryDataId2, arbitraryReason2);
 
-      expect(await ignoredLocation.getIgnoredLocation()).to.be.deep.equal({
+      expect(await ignoredLocation.getIgnoredLocations()).to.be.deep.equal({
         [arbitraryDataId1]: arbitraryReason,
         [arbitraryDataId2]: arbitraryReason2,
       });
     });
-    it('can getIgnoredLocation() if empty', async () => {
+    it('can getIgnoredLocations() if empty', async () => {
       const ignoredLocation = new IgnoredLocation();
 
-      expect(await ignoredLocation.getIgnoredLocation()).to.be.deep.equal({});
+      expect(await ignoredLocation.getIgnoredLocations()).to.be.deep.equal({});
     });
   });
 });

packages/ethereum-storage/src/ethereum-storage.ts

@@ -443,7 +443,7 @@ export default class EthereumStorage implements StorageTypes.IStorage {
    * @param detailed if true get the list of the files hash
    * @returns Promise resolving object with dataIds retrieved and ignored
    */
-  public async _getInformation(detailed: boolean = false): Promise<any> {
+  public async _getStatus(detailed: boolean = false): Promise<any> {
     const dataIds = await this.ethereumMetadataCache.getDataIds();
     const dataIdsWithReason = await this.dataIdsIgnored.getDataIdsWithReasons();
     return {

packages/ethereum-storage/test/dataids-ignored.test.ts

@@ -23,29 +23,29 @@ describe('DataIds ignored', () => {
 
       expect(await dataIdsIgnored.getReason(hash)).to.be.equal(reason);
     });
-    describe('getListDataIdWithReason', () => {
-      it('can getListDataIdWithReason()', async () => {
+    describe('getDataIdsWithReasons', () => {
+      it('can getDataIdsWithReasons()', async () => {
         await dataIdsIgnored.saveReason(hash, reason);
         await dataIdsIgnored.saveReason(hash2, reason2);
 
-        expect(await dataIdsIgnored.getListDataIdWithReason()).to.be.deep.equal({
+        expect(await dataIdsIgnored.getDataIdsWithReasons()).to.be.deep.equal({
           [hash]: reason,
           [hash2]: reason2,
         });
       });
-      it('can getListDataIdWithReason() if empty', async () => {
-        expect(await dataIdsIgnored.getListDataIdWithReason()).to.be.deep.equal({});
+      it('can getDataIdsWithReasons() if empty', async () => {
+        expect(await dataIdsIgnored.getDataIdsWithReasons()).to.be.deep.equal({});
       });
     });
-    describe('getListDataId', () => {
-      it('can getListDataId()', async () => {
+    describe('getDataIds', () => {
+      it('can getDataIds()', async () => {
         await dataIdsIgnored.saveReason(hash, reason);
         await dataIdsIgnored.saveReason(hash2, reason2);
 
-        expect(await dataIdsIgnored.getListDataId()).to.be.deep.equal([hash, hash2]);
+        expect(await dataIdsIgnored.getDataIds()).to.be.deep.equal([hash, hash2]);
       });
-      it('can getListDataId() if empty', async () => {
-        expect(await dataIdsIgnored.getListDataId()).to.be.deep.equal([]);
+      it('can getDataIds() if empty', async () => {
+        expect(await dataIdsIgnored.getDataIds()).to.be.deep.equal([]);
       });
     });
   });

packages/prototype-estimator/src/mock-storage.ts

@@ -19,7 +19,7 @@ export default class MockStorage implements StorageTypes.IStorage {
     throw Error('will never be used');
   }
 
-  public async _getInformation(): Promise<never> {
+  public async _getStatus(): Promise<never> {
     throw Error('will never be used');
   }
 

packages/request-client.js/src/http-data-access.ts

@@ -200,7 +200,7 @@ export default class HttpDataAccess implements DataAccessTypes.IDataAccess {
    *
    * @param detailed if true get the list of files hashes
    */
-  public async _getInformation(detailed?: boolean): Promise<any> {
+  public async _getStatus(detailed?: boolean): Promise<any> {
     const { data } = await Utils.retry(
       async () =>
         axios.get(

packages/request-client.js/src/mock-storage.ts

@@ -131,7 +131,7 @@ export default class MockStorage implements StorageTypes.IStorage {
    *
    * @param detailed if true get the list of files hash
    */
-  public async _getInformation(detailed?: boolean): Promise<any> {
+  public async _getStatus(detailed?: boolean): Promise<any> {
     return {
       dataIds: {
         count: Object.entries(this.data).length,

packages/request-client.js/test/api/request-network.test.ts

@@ -18,7 +18,7 @@ import Request from '../../src/api/request';
 import * as TestData from '../data-test';
 
 const mockDataAccess: DataAccessTypes.IDataAccess = {
-  async _getInformation(): Promise<any> {
+  async _getStatus(): Promise<any> {
     return;
   },
   async getChannelsByTopic(): Promise<any> {
@@ -51,7 +51,7 @@ describe('api/request-network', () => {
   describe('createRequest', () => {
     it('cannot createRequest() with extensionsData', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByTopic(): Promise<any> {
@@ -85,7 +85,7 @@ describe('api/request-network', () => {
   describe('fromRequestId', () => {
     it('can get request with payment network fromRequestId', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByTopic(): Promise<any> {
@@ -139,7 +139,7 @@ describe('api/request-network', () => {
       );
 
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByTopic(): Promise<any> {
@@ -173,7 +173,7 @@ describe('api/request-network', () => {
   describe('fromIdentity', () => {
     it('can get requests with payment network fromIdentity', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByTopic(topic: string): Promise<any> {
@@ -247,7 +247,7 @@ describe('api/request-network', () => {
   describe('fromTopic', () => {
     it('can get requests with payment network fromTopic', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByTopic(): Promise<any> {
@@ -303,7 +303,7 @@ describe('api/request-network', () => {
   describe('fromMultipleIdentities', () => {
     it('can get requests with payment network from multiple Identities', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByMultipleTopics(topics: [string]): Promise<any> {
@@ -381,7 +381,7 @@ describe('api/request-network', () => {
   describe('fromMultipleTopics', () => {
     it('can get requests with payment network fromMultipleTopics', async () => {
       const mockDataAccessWithTxs: DataAccessTypes.IDataAccess = {
-        async _getInformation(): Promise<any> {
+        async _getStatus(): Promise<any> {
           return;
         },
         async getChannelsByMultipleTopics(): Promise<any> {

packages/request-node/src/request/getInformation.ts → packages/request-node/src/request/getStatus.ts

@@ -5,13 +5,13 @@ import * as httpStatus from 'http-status-codes';
 const GET_CHANNELS_TIMEOUT: number = 600000;
 
 /**
- * Handles getInformation of data-access layer.
+ * Handles getStatus of data-access layer.
  *
  * @param clientRequest http client request object
  * @param serverResponse http server response object
  * @param dataAccess data access layer
  */
-export default async function getInformation(
+export default async function getStatus(
   clientRequest: any,
   serverResponse: any,
   ethereumStorage: StorageTypes.IStorage,
@@ -26,34 +26,32 @@ export default async function getInformation(
   // PROT-187: Decrease or remove this value
   clientRequest.setTimeout(GET_CHANNELS_TIMEOUT);
 
-  if (!dataAccess._getInformation) {
+  if (!dataAccess._getStatus) {
     return serverResponse
       .status(httpStatus.INTERNAL_SERVER_ERROR)
       .send('The node do not support this feature');
   }
 
   try {
-    const dataAccessInformation = await dataAccess._getInformation(clientRequest.query.detailed);
-    const ethereumStorageInformation = await ethereumStorage._getInformation(
-      clientRequest.query.detailed,
-    );
-
-    const information = {
-      dataAccessInformation,
-      ethereumStorageInformation,
+    const dataAccessStatus = await dataAccess._getStatus(clientRequest.query.detailed);
+    const ethereumStorageStatus = await ethereumStorage._getStatus(clientRequest.query.detailed);
+
+    const status = {
+      dataAccessStatus,
+      ethereumStorageStatus,
       version: process.env.npm_package_version,
     };
 
     // Log the request time
     const requestEndTime = Date.now();
-    logger.debug(`getInformation latency: ${requestEndTime - requestStartTime}ms`, [
+    logger.debug(`getStatus latency: ${requestEndTime - requestStartTime}ms`, [
       'metric',
       'latency',
     ]);
 
-    serverResponse.status(httpStatus.OK).send(information);
+    serverResponse.status(httpStatus.OK).send(status);
   } catch (e) {
-    logger.error(`getInformation error: ${e}`);
+    logger.error(`getStatus error: ${e}`);
 
     serverResponse.status(httpStatus.INTERNAL_SERVER_ERROR).send(e);
   }

packages/request-node/src/requestNode.ts

@@ -10,14 +10,14 @@ import Utils from '@requestnetwork/utils';
 import { getCustomHeaders, getInitializationStorageFilePath, getMnemonic } from './config';
 import ConfirmedTransactionStore from './request/confirmedTransactionStore';
 import getChannelsByTopic from './request/getChannelsByTopic';
-import getInformation from './request/getInformation';
+import getStatus from './request/getStatus';
 import getTransactionsByChannelId from './request/getTransactionsByChannelId';
 import ipfsAdd from './request/ipfsAdd';
 import PersistTransaction from './request/persistTransaction';
 import { getEthereumStorage } from './storageUtils';
 
 const NOT_FOUND_MESSAGE =
-  'Not found\nAvailable endpoints:\n/POST persistTransaction\n/GET getTransactionsByChannelId\n/GET getChannelsByTopic\n/POST /ipfsAdd\nGET getConfirmedTransaction\nGET information';
+  'Not found\nAvailable endpoints:\n/POST persistTransaction\n/GET getTransactionsByChannelId\n/GET getChannelsByTopic\n/POST /ipfsAdd\nGET getConfirmedTransaction\nGET status';
 
 const NOT_INITIALIZED_MESSAGE = 'The node is not initialized';
 
@@ -159,10 +159,10 @@ class RequestNode {
       return serverResponse.status(httpStatus.SERVICE_UNAVAILABLE).send(NOT_INITIALIZED_MESSAGE);
     });
 
-    // Route for information check
-    router.get('/information', (clientRequest: any, serverResponse: any) => {
+    // Route for satus check
+    router.get('/status', (clientRequest: any, serverResponse: any) => {
       if (this.initialized) {
-        return getInformation(
+        return getStatus(
           clientRequest,
           serverResponse,
           this.ethereumStorage,