preserve 200/errored shape in multiReserves for outsideUpdateWindow

Author: cawthorne

packages/composites/proof-of-reserves/src/endpoint/multiReserves.ts

@@ -4,7 +4,6 @@ import { Config } from '../config'
 import {
   getOutsideUpdateWindowDetails,
   isOutsideUpdateWindowResponse,
-  makeOutsideUpdateWindowResponse,
 } from '../utils/outsideUpdateWindow'
 import type { TInputParameters as SingleTInputParameters } from './reserves'
 import { execute as singleExecute } from './reserves'
@@ -49,19 +48,21 @@ export const execute: ExecuteWithConfig<Config> = async (input, context, config)
     ),
   )
 
-  const outsideWindowResult = results.find((r) => isOutsideUpdateWindowResponse(r))
-  if (outsideWindowResult) {
-    return makeOutsideUpdateWindowResponse(
-      jobRunID,
-      getOutsideUpdateWindowDetails(outsideWindowResult) ?? 'Outside schedule window',
-    )
-  }
-
   const result = results
     .map((result) => {
       if (result.statusCode != 200 || !result.result) {
+        // Preserve outsideUpdateWindow fields in the error body so monitoring
+        // can detect a planned window pause vs an unplanned failure, while
+        // keeping the existing 200/errored response shape.
+        const outsideWindowDetails = isOutsideUpdateWindowResponse(result)
+          ? {
+              outsideUpdateWindow: true,
+              outsideUpdateWindowDetails: getOutsideUpdateWindowDetails(result),
+            }
+          : {}
         throw new AdapterError({
           ...result,
+          ...outsideWindowDetails,
         })
       } else {
         // Scaling everything up to 18 to preserve precision

packages/composites/proof-of-reserves/test/integration/__snapshots__/adapter.test.ts.snap

@@ -108,17 +108,15 @@ exports[`execute multiReserves endpoint view-function-multi-chain should return
 
 exports[`execute multiReserves endpoint - schedule window should return outsideUpdateWindow response when any sub-reserve is outside schedule window 1`] = `
 {
-  "data": {
+  "error": {
+    "message": "Unspecified error",
+    "name": "AdapterError",
     "outsideUpdateWindow": true,
     "outsideUpdateWindowDetails": "Outside schedule window. Current UTC: 2022-01-01T11:11:11.111Z, window: 2022-01-01T12:00:00.000Z - 2022-01-01T13:00:00.000Z",
-    "result": null,
-    "statusCode": 503,
   },
   "jobRunID": "1",
-  "outsideUpdateWindow": true,
-  "outsideUpdateWindowDetails": "Outside schedule window. Current UTC: 2022-01-01T11:11:11.111Z, window: 2022-01-01T12:00:00.000Z - 2022-01-01T13:00:00.000Z",
-  "result": null,
-  "statusCode": 503,
+  "status": "errored",
+  "statusCode": 200,
 }
 `;
 

packages/composites/proof-of-reserves/test/integration/adapter.test.ts

@@ -472,7 +472,7 @@ describe('execute', () => {
         .set('Accept', '*/*')
         .set('Content-Type', 'application/json')
         .expect('Content-Type', /json/)
-        .expect(503)
+        .expect(200)
       expect(response.body).toMatchSnapshot()
     })
   })