Remove DApi data from the state (#101)

* Remove dapi data from state, general clean up

* Remove unused export

Author: aquarat

jest-e2e.config.js

@@ -9,8 +9,8 @@ module.exports = {
   collectCoverage: false, // It doesn't make sense to collect coverage for e2e tests because they target high level features and interaction with other services.
   maxWorkers: 1, // We don't want to run tests in parallel because they might interfere with each other. This option is the same as --runInBand. See: https://stackoverflow.com/a/46489246.
 
-  mockReset: true,
   preset: 'ts-jest',
+  resetMocks: true,
   restoreMocks: true,
   setupFiles: [join(__dirname, './jest.setup.js')],
   testEnvironment: 'jest-environment-node',

jest-unit.config.js

@@ -11,8 +11,8 @@ module.exports = {
   coveragePathIgnorePatterns: ['node_modules', '<rootDir>/src/typechain-types'], // Coverage is collected for all files imported by the tests. We want to exclude files generated by Typechain.
   coverageProvider: 'v8',
 
-  mockReset: true,
   preset: 'ts-jest',
+  resetMocks: true,
   restoreMocks: true,
   setupFiles: [join(__dirname, './jest.setup.js')],
   testEnvironment: 'jest-environment-node',

src/signed-api-fetch/data-fetcher.test.ts

@@ -11,7 +11,6 @@ jest.mock('axios');
 
 describe('data fetcher', () => {
   beforeEach(() => {
-    jest.resetAllMocks();
     initializeState();
     localDataStore.clear();
     updateState((draft) => {

src/signed-api-fetch/data-fetcher.ts

@@ -39,7 +39,7 @@ export const stopDataFetcher = () => {
 /**
  * Calls a remote signed data URL.
  * @param url
- * @param signedDataFetchInterval
+ * @param signedDataFetchIntervalMs
  */
 export const callSignedDataApi = async (
   url: string,

src/signed-data-store/signed-data-store.ts

@@ -3,7 +3,7 @@ import { BigNumber, ethers } from 'ethers';
 
 import { logger } from '../logger';
 import { getState, updateState } from '../state';
-import type { SignedData, AirnodeAddress, TemplateId, BeaconId } from '../types';
+import type { SignedData, BeaconId } from '../types';
 import { deriveBeaconId } from '../utils';
 
 export const verifySignedData = ({ airnode, templateId, timestamp, signature, encodedValue }: SignedData) => {
@@ -92,9 +92,6 @@ export const setStoreDataPoint = (signedData: SignedData) => {
   });
 };
 
-export const getStoreDataPointByAirnodeAndTemplate = (airnode: AirnodeAddress, template: TemplateId) =>
-  getState().signedApiStore[deriveBeaconId(airnode, template)!];
-
 export const getStoreDataPoint = (dataFeedId: BeaconId) => getState().signedApiStore[dataFeedId];
 
 export const clear = () => {

src/state/state.ts

@@ -5,7 +5,6 @@ import type { Config } from '../config/schema';
 import type {
   DapiName,
   PrivateKey,
-  DecodedDataFeed,
   ChainId,
   SignedData,
   BeaconId,
@@ -19,31 +18,13 @@ interface GasState {
   sponsorLastUpdateTimestampMs: Record<string, number>;
 }
 
-export interface DataFeedValue {
-  value: BigNumber;
-  timestamp: number;
-}
-
-export interface DapiState {
-  dataFeed: DecodedDataFeed;
-  dataFeedValues: Record<ChainId, DataFeedValue>;
-  updateParameters: Record<ChainId, UpdateParameters>;
-}
-
-export interface UpdateParameters {
-  deviationThresholdInPercentage: BigNumber;
-  deviationReference: BigNumber;
-  heartbeatInterval: number;
-}
-
 export interface State {
   config: Config;
   dataFetcherInterval?: NodeJS.Timeout;
   gasPriceStore: Record<ChainId, Record<ProviderName, GasState>>;
   derivedSponsorWallets: Record<DapiName, PrivateKey>;
   signedApiStore: Record<BeaconId, SignedData>;
   signedApiUrlStore: Record<ChainId, Record<ProviderName, Record<AirnodeAddress, SignedApiUrl>>>;
-  dapis: Record<DapiName, DapiState>;
 }
 
 type StateUpdater = (draft: Draft<State>) => void;
@@ -65,7 +46,6 @@ export const setInitialState = (config: Config) => {
     signedApiStore: {},
     signedApiUrlStore: {},
     derivedSponsorWallets: {},
-    dapis: {},
   };
 };
 

src/update-feeds/update-feeds.ts

@@ -193,13 +193,6 @@ export const processBatch = async (
       for (const { airnodeAddress, url } of receivedUrls) {
         draft.signedApiUrlStore[chainId]![providerName]![airnodeAddress] = url;
       }
-
-      const cachedDapiResponse = draft.dapis[dapi.dapiName];
-      draft.dapis[dapi.dapiName] = {
-        dataFeed: cachedDapiResponse?.dataFeed ?? dapi.decodedDataFeed,
-        dataFeedValues: { ...cachedDapiResponse?.dataFeedValues, [chainId]: dapi.dataFeedValue },
-        updateParameters: { ...cachedDapiResponse?.updateParameters, [chainId]: dapi.updateParameters },
-      };
     }
   });
 

src/update-feeds/update-transactions.ts

@@ -47,17 +47,15 @@ export const updateFeeds = async (
         const goUpdate = await go(
           async () => {
             // Create calldata for all beacons of the particular data feed the dAPI points to.
-            const beaconUpdateCalls = updatableBeacons.map((beacon) => {
-              const { signedData } = beacon;
-
-              return api3ServerV1.interface.encodeFunctionData('updateBeaconWithSignedData', [
+            const beaconUpdateCalls = updatableBeacons.map(({ signedData }) =>
+              api3ServerV1.interface.encodeFunctionData('updateBeaconWithSignedData', [
                 signedData.airnode,
                 signedData.templateId,
                 signedData.timestamp,
                 signedData.encodedValue,
                 signedData.signature,
-              ]);
-            });
+              ])
+            );
 
             // If there are multiple beacons in the data feed it's a beacons set which we need to update as well.
             const dataFeedUpdateCalldatas =
@@ -155,23 +153,3 @@ export const getDerivedSponsorWallet = (sponsorWalletMnemonic: string, dapiName:
 
   return sponsorWallet;
 };
-
-export const createDummyBeaconUpdateData = async (dummyAirnode: ethers.Wallet = ethers.Wallet.createRandom()) => {
-  const dummyBeaconTemplateId = ethers.utils.hexlify(ethers.utils.randomBytes(32));
-  const dummyBeaconTimestamp = Math.floor(Date.now() / 1000);
-  const randomBytes = ethers.utils.randomBytes(Math.floor(Math.random() * 27) + 1);
-  const dummyBeaconData = ethers.utils.defaultAbiCoder.encode(
-    ['int224'],
-    // Any random number that fits into an int224
-    [ethers.BigNumber.from(randomBytes)]
-  );
-  const dummyBeaconSignature = await dummyAirnode.signMessage(
-    ethers.utils.arrayify(
-      ethers.utils.solidityKeccak256(
-        ['bytes32', 'uint256', 'bytes'],
-        [dummyBeaconTemplateId, dummyBeaconTimestamp, dummyBeaconData]
-      )
-    )
-  );
-  return { dummyAirnode, dummyBeaconTemplateId, dummyBeaconTimestamp, dummyBeaconData, dummyBeaconSignature };
-};

test/utils.ts

@@ -31,7 +31,6 @@ export const encodeBeaconFeedSet = (dataFeed: Beacon[]) =>
     ['address[]', 'bytes32[]'],
     [dataFeed.map((item) => item.airnodeAddress), dataFeed.map((item) => item.templateId)]
   );
-export const getUnixTimestamp = (dateString: string) => Math.floor(Date.parse(dateString) / 1000);
 
 export const generateSignedData = async (
   airnodeWallet: Wallet,