Merge pull request #1727 from api3dao/backport-fixes

v0.10 - Fix hardcoded `deploymentId` in tests & prettier behavior

.changeset/dirty-feet-try.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/silly-actors-think.md

@@ -0,0 +1,5 @@
+---
+'@api3/airnode-node': patch
+---
+
+Replace hardcoded deploymentId values in tests

docker/Dockerfile

@@ -7,7 +7,7 @@ ENV appDir="/app" \
     CI="true"
 
 RUN apk add --update --no-cache git rsync docker $([ $(arch) == "aarch64" ] && echo "python3 make g++") && \
-    yarn global add npm && \
+    yarn global add npm@8.19.4 && \
     # Download both solidity compilers as per: https://github.com/nomiclabs/hardhat/issues/1280#issuecomment-949822371
     mkdir -p /root/.cache/hardhat-nodejs/compilers/wasm && \
     wget -O /root/.cache/hardhat-nodejs/compilers/wasm/soljson-v0.8.9+commit.e5eed63a.js https://solc-bin.ethereum.org/wasm/soljson-v0.8.9+commit.e5eed63a.js && \

packages/airnode-node/src/handlers/start-coordinator.test.ts

@@ -32,6 +32,9 @@ import * as fixtures from '../../test/fixtures';
 import * as calls from '../coordinator/calls';
 import { buildAggregatedRegularApiCall, buildConfig } from '../../test/fixtures';
 import { BLOCK_COUNT_HISTORY_LIMIT } from '../constants';
+import { DEPLOYMENT_ID_LENGTH } from '../workers';
+
+const deploymentIdRegex = RegExp(`local[0-9a-f]{${DEPLOYMENT_ID_LENGTH}}`);
 
 describe('startCoordinator', () => {
   jest.setTimeout(30_000);
@@ -172,7 +175,12 @@ describe('startCoordinator', () => {
     await startCoordinator(config, coordinatorId);
 
     // cached requests should not trigger an API call
-    expect(callApisSpy).toHaveBeenCalledWith([], expect.objectContaining({ deploymentId: 'localdd59d6d0' }));
+    expect(callApisSpy).toHaveBeenCalledWith(
+      [],
+      expect.objectContaining({
+        deploymentId: expect.stringMatching(deploymentIdRegex),
+      })
+    );
 
     expect(blockWithTransactionsSpy).toHaveBeenCalled();
     // API call was submitted

packages/airnode-node/src/providers/actions.test.ts

@@ -31,6 +31,9 @@ import * as providers from './actions';
 import * as fixtures from '../../test/fixtures';
 import { GroupedRequests } from '../types';
 import { ChainConfig } from '../config';
+import { DEPLOYMENT_ID_LENGTH } from '../workers';
+
+const deploymentIdRegex = RegExp(`local[0-9a-f]{${DEPLOYMENT_ID_LENGTH}}`);
 
 const chainProviderName1 = 'Pocket Ethereum Mainnet';
 const chainProviderName3 = 'Infura Sepolia';
@@ -124,7 +127,7 @@ describe('initialize', () => {
           },
           settings: {
             airnodeAddress: '0xA30CA71Ba54E83127214D3271aEA8F5D6bD4Dace',
-            deploymentId: 'localdd59d6d0',
+            deploymentId: expect.stringMatching(deploymentIdRegex),
             authorizers: {
               requesterEndpointAuthorizers: [ethers.constants.AddressZero],
               crossChainRequesterAuthorizers: [],
@@ -179,7 +182,7 @@ describe('initialize', () => {
           },
           settings: {
             airnodeAddress: '0xA30CA71Ba54E83127214D3271aEA8F5D6bD4Dace',
-            deploymentId: 'localdd59d6d0',
+            deploymentId: expect.stringMatching(deploymentIdRegex),
             authorizers: {
               requesterEndpointAuthorizers: [ethers.constants.AddressZero],
               crossChainRequesterAuthorizers: [],

packages/airnode-node/src/providers/state.test.ts

@@ -4,6 +4,9 @@ import * as fixtures from '../../test/fixtures';
 import { BLOCK_MIN_CONFIRMATIONS } from '../constants';
 import { EVMProviderState, ProviderState } from '../types';
 import { ChainConfig } from '../config';
+import { DEPLOYMENT_ID_LENGTH } from '../workers';
+
+const deploymentIdRegex = RegExp(`local[0-9a-f]{${DEPLOYMENT_ID_LENGTH}}`);
 
 describe('create', () => {
   fixtures.setEnvVariables({ AIRNODE_WALLET_PRIVATE_KEY: fixtures.getAirnodeWalletPrivateKey() });
@@ -54,7 +57,7 @@ describe('create', () => {
       },
       settings: {
         airnodeAddress: '0xA30CA71Ba54E83127214D3271aEA8F5D6bD4Dace',
-        deploymentId: 'localdd59d6d0',
+        deploymentId: expect.stringMatching(deploymentIdRegex),
         authorizers: {
           requesterEndpointAuthorizers: [ethers.constants.AddressZero],
           crossChainRequesterAuthorizers: [],
@@ -150,7 +153,7 @@ describe('create', () => {
       },
       settings: {
         airnodeAddress: '0xA30CA71Ba54E83127214D3271aEA8F5D6bD4Dace',
-        deploymentId: 'localdd59d6d0',
+        deploymentId: expect.stringMatching(deploymentIdRegex),
         authorizers: {
           requesterEndpointAuthorizers: [ethers.constants.AddressZero],
           crossChainRequesterAuthorizers: [],

packages/airnode-node/src/workers/index.ts

@@ -5,7 +5,7 @@ import * as localHandlers from './local-handlers';
 import { WorkerParameters, WorkerResponse } from '../types';
 import { LocalOrCloudProvider } from '../config';
 
-const DEPLOYMENT_ID_LENGTH = 8;
+export const DEPLOYMENT_ID_LENGTH = 8;
 
 export function spawn(params: WorkerParameters): Promise<WorkerResponse> {
   switch (params.cloudProvider.type) {

scripts/update-config-fixtures.ts

@@ -1,5 +1,6 @@
 import { readFileSync, writeFileSync } from 'fs';
 import fg from 'fast-glob';
+import { format } from 'prettier';
 import { version as packageVersion } from '../packages/airnode-node/package.json';
 
 const configPatterns = ['./packages/**/*config.example.json', './packages/**/*config.valid.json'];
@@ -13,7 +14,7 @@ configPatterns.forEach((pattern) => {
 
     // eslint-disable-next-line no-console
     console.log(`Updating "${f}" to version ${packageVersion}`);
-    writeFileSync(f, JSON.stringify(config, null, 2) + '\n');
+    writeFileSync(f, format(JSON.stringify(config, null, 2), { parser: 'json', printWidth: 120 }));
   });
 });