Merge pull request #145 from smartcontractkit/merge-chainlink-sep-18

Merge chainlink sep 18

.github/workflows/delete-deployments.yml

@@ -1,4 +1,4 @@
-name: Deployments
+name: Cleanup integration deployments
 on:
   workflow_dispatch:
   schedule:
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: 🧼 Clean up Environment
+      - name: Clean up integration environment
         uses: ./.github/actions/delete-deployments
         with:
           environment: integration

.github/workflows/integration-tests.yml

@@ -3,8 +3,8 @@ on:
   merge_group:
   pull_request:
   schedule:
-    # - cron: "0 0 * * *"
-    - cron: "0 * * * *" # DEBUG: Run every hour to nail down flakes
+    - cron: "0 0 * * *"
+    # - cron: "0 * * * *" # DEBUG: Run every hour to nail down flakes
   push:
     tags:
       - "*"
@@ -88,15 +88,15 @@ jobs:
       - name: Check if image exists
         if: needs.changes.outputs.src == 'true'
         id: check-image
-        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
           repository: chainlink
           tag: ${{ github.sha }}${{ matrix.image.tag-suffix }}
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
       - name: Build Image
         if: steps.check-image.outputs.exists == 'false' && needs.changes.outputs.src == 'true'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
           cl_repo: smartcontractkit/chainlink
           cl_ref: ${{ github.sha }}
@@ -207,7 +207,7 @@ jobs:
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         env:
           PYROSCOPE_SERVER: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
@@ -218,7 +218,7 @@ jobs:
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ github.sha }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          artifacts_location: ./integration-tests/smoke/logs
+          artifacts_location: ./integration-tests/smoke/logs/
           publish_check_name: ${{ matrix.product.name }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
@@ -333,7 +333,7 @@ jobs:
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         env:
           PYROSCOPE_SERVER: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
@@ -344,7 +344,8 @@ jobs:
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ github.sha }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          artifacts_location: ./integration-tests/smoke/logs
+          artifacts_name: ${{ matrix.product.name }}-test-logs
+          artifacts_location: ./integration-tests/smoke/logs/
           publish_check_name: ${{ matrix.product.name }}
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
@@ -356,7 +357,7 @@ jobs:
       ## Run this step when changes that do not need the test to run are made
       - name: Run Setup
         if: needs.changes.outputs.src == 'false'
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-run-tests-environment@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-run-tests-environment@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           go_mod_path: ./integration-tests/go.mod
@@ -366,14 +367,6 @@ jobs:
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
 
-      - name: Upload test log
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        if: failure()
-        with:
-          name: test-log-${{ matrix.product.name }}
-          path: /tmp/gotest.log
-          retention-days: 7
-        continue-on-error: true
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
@@ -439,13 +432,14 @@ jobs:
     needs: [eth-smoke-tests]
     runs-on: ubuntu20.04-16cores-64GB
     name: ETH Smoke Tests Go Mod Cache
+    continue-on-error: true
     steps:
       - name: Checkout the repo
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Run Setup
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
           test_download_vendor_packages_command: |
             cd ./integration-tests
@@ -493,7 +487,7 @@ jobs:
         run: |
           echo "Running migration tests from version '${{ steps.get_latest_version.outputs.latest_version }}' to: '${{ github.sha }}'"
       - name: Run Migration Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
           test_command_to_run: make test_need_operator_assets && cd ./integration-tests && go test -timeout 30m -count=1 -json ./migration 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -954,4 +948,4 @@ jobs:
 #          SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
 #
 #  ### End Live Testnet Section
-#
+#

.github/workflows/solidity-foundry.yml

@@ -140,7 +140,8 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          # Has to match the `make foundry` version.
+          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
 
       - name: Run Forge build
         run: |

contracts/GNUmakefile

@@ -1,7 +1,6 @@
 # ALL_FOUNDRY_PRODUCTS contains a list of all products that have a foundry
-# profile defined. Adding a product to this list will make it available for
-# snapshotting.
-ALL_FOUNDRY_PRODUCTS = vrf automation llo-feeds functions shared ccip
+# profile defined and use the Foundry snapshots. 
+ALL_FOUNDRY_PRODUCTS = llo-feeds functions shared ccip
 
 # To make a snapshot for a specific product, either set the `FOUNDRY_PROFILE` env var
 # or call the target with `FOUNDRY_PROFILE=product`
@@ -37,9 +36,12 @@ abigen: ## Build & install abigen.
 mockery: $(mockery) ## Install mockery.
 	go install github.com/vektra/mockery/[email protected]
 
+.PHONY: foundry
+foundry: ## Install foundry.
+	foundryup --version nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
+
 .PHONY: foundry-refresh
-foundry-refresh:
-	foundryup
+foundry-refresh: foundry
 	git submodule deinit -f .
 	git submodule update --init --recursive
 

contracts/gas-snapshots/ccip.gas-snapshot

@@ -1,4 +1,4 @@
-ARMProxyStandaloneTest:testARMCallEmptyContractRevert() (gas: 19518)
+ARMProxyStandaloneTest:testARMCallEmptyContractRevert() (gas: 17944)
 ARMProxyStandaloneTest:testConstructor() (gas: 373973)
 ARMProxyStandaloneTest:testSetARM() (gas: 16033)
 ARMProxyStandaloneTest:testSetARMzero() (gas: 11176)
@@ -45,14 +45,14 @@ AggregateTokenLimiter__rateLimitValue:testUnknownTokenReverts() (gas: 18240)
 AggregateTokenLimiter_constructor:testConstructorSuccess() (gas: 21822)
 AggregateTokenLimiter_getTokenBucket:testGetTokenBucketSuccess() (gas: 15863)
 AggregateTokenLimiter_getTokenBucket:testRefillSuccess() (gas: 37863)
-AggregateTokenLimiter_getTokenBucket:testTimeUnderflowReverts() (gas: 15283)
+AggregateTokenLimiter_getTokenBucket:testTimeUnderflowReverts() (gas: 14424)
 AggregateTokenLimiter_getTokenLimitAdmin:testGetTokenLimitAdminSuccess() (gas: 7583)
 AggregateTokenLimiter_setAdmin:testOnlyOwnerOrAdminReverts() (gas: 17184)
 AggregateTokenLimiter_setAdmin:testOwnerSuccess() (gas: 18631)
 AggregateTokenLimiter_setRateLimiterConfig:testOnlyOnlyCallableByAdminOrOwnerReverts() (gas: 21552)
 AggregateTokenLimiter_setRateLimiterConfig:testOwnerSuccess() (gas: 41466)
 AggregateTokenLimiter_setRateLimiterConfig:testTokenLimitAdminSuccess() (gas: 48072)
-BurnMintERC677_burn:testPoolBurnRevertNotHealthyReverts() (gas: 59734)
+BurnMintERC677_burn:testPoolBurnRevertNotHealthyReverts() (gas: 58150)
 BurnMintERC677_burn:testPoolBurnSuccess() (gas: 197641)
 BurnMintERC677_mint:testPoolMintNotHealthyReverts() (gas: 55384)
 BurnMintERC677_mint:testPoolMintSuccess() (gas: 93675)
@@ -87,12 +87,12 @@ CommitStore_verify:testTooManyLeavesReverts() (gas: 36830)
 DefensiveExampleTest:testHappyPathSuccess() (gas: 174828)
 DefensiveExampleTest:testRecovery() (gas: 399728)
 E2E:testE2E_3MessagesSuccess_gas() (gas: 870710)
-EVM2EVMOffRamp__releaseOrMintTokens:testRateLimitErrorsReverts() (gas: 438942)
-EVM2EVMOffRamp__releaseOrMintTokens:testTokenHandlingErrorReverts() (gas: 101896)
-EVM2EVMOffRamp__releaseOrMintTokens:testUnsupportedTokenReverts() (gas: 19741)
+EVM2EVMOffRamp__releaseOrMintTokens:testRateLimitErrorsReverts() (gas: 428056)
+EVM2EVMOffRamp__releaseOrMintTokens:testTokenHandlingErrorReverts() (gas: 100322)
+EVM2EVMOffRamp__releaseOrMintTokens:testUnsupportedTokenReverts() (gas: 18159)
 EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokensSuccess() (gas: 139008)
 EVM2EVMOffRamp__report:testReportSuccess() (gas: 129025)
-EVM2EVMOffRamp__trialExecute:testRateLimitErrorReverts() (gas: 153324)
+EVM2EVMOffRamp__trialExecute:testRateLimitErrorReverts() (gas: 151693)
 EVM2EVMOffRamp__trialExecute:testTokenHandlingErrorIsCaughtSuccess() (gas: 181117)
 EVM2EVMOffRamp__trialExecute:test_trialExecuteSuccess() (gas: 229193)
 EVM2EVMOffRamp_applyPoolUpdates:testApplyPoolUpdatesSuccess() (gas: 2548304)
@@ -186,7 +186,7 @@ EVM2EVMOnRamp_forwardFromRouter:testShouldStoreNonLinkFees() (gas: 127810)
 EVM2EVMOnRamp_forwardFromRouter:testTooManyTokensReverts() (gas: 28108)
 EVM2EVMOnRamp_forwardFromRouter:testUnhealthyReverts() (gas: 42943)
 EVM2EVMOnRamp_forwardFromRouter:testUnsupportedTokenReverts() (gas: 108788)
-EVM2EVMOnRamp_forwardFromRouter:testZeroAddressReceiverReverts() (gas: 172104)
+EVM2EVMOnRamp_forwardFromRouter:testZeroAddressReceiverReverts() (gas: 154470)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 151462)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 197712)
 EVM2EVMOnRamp_forwardFromRouter_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 121267)
@@ -252,9 +252,9 @@ EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawNonLinkFeesSuccess() (gas: 50104)
 EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawToZeroAddressReverts() (gas: 12913)
 LockReleaseTokenPool_addLiquidity:testLiquidityNotAcceptedReverts() (gas: 2509153)
 LockReleaseTokenPool_canAcceptLiquidity:test_CanAcceptLiquiditySuccess() (gas: 2509647)
-LockReleaseTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 23303)
+LockReleaseTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21718)
 LockReleaseTokenPool_lockOrBurn:testLockOrBurnWithAllowListSuccess() (gas: 60504)
-LockReleaseTokenPool_lockOrBurn:testPoolBurnRevertNotHealthyReverts() (gas: 66291)
+LockReleaseTokenPool_lockOrBurn:testPoolBurnRevertNotHealthyReverts() (gas: 64707)
 LockReleaseTokenPool_releaseOrMint:testPoolMintNotHealthyReverts() (gas: 57674)
 LockReleaseTokenPool_removeLiquidity:testInsufficientLiquidityReverts() (gas: 83061)
 LockReleaseTokenPool_supportsInterface:testSupportsInterfaceSuccess() (gas: 8326)
@@ -299,7 +299,7 @@ PriceRegistry_applyPriceUpdatersUpdates:testOnlyCallableByOwnerReverts() (gas: 1
 PriceRegistry_constructor:testInvalidStalenessThresholdReverts() (gas: 66156)
 PriceRegistry_constructor:testSetupSuccess() (gas: 1658494)
 PriceRegistry_convertTokenAmount:testConvertTokenAmountSuccess() (gas: 60190)
-PriceRegistry_convertTokenAmount:testLinkTokenNotSupportedReverts() (gas: 23567)
+PriceRegistry_convertTokenAmount:testLinkTokenNotSupportedReverts() (gas: 22707)
 PriceRegistry_convertTokenAmount:testStaleFeeTokenReverts() (gas: 31634)
 PriceRegistry_convertTokenAmount:testStaleLinkTokenReverts() (gas: 31104)
 PriceRegistry_getTokenAndGasPrices:testGetFeeTokenAndGasPricesSuccess() (gas: 59721)
@@ -327,7 +327,7 @@ RateLimiter_consume:testTokenRateLimitReachedReverts() (gas: 24382)
 RateLimiter_currentTokenBucketState:testCurrentTokenBucketStateSuccess() (gas: 32403)
 RateLimiter_currentTokenBucketState:testRefillSuccess() (gas: 41673)
 RateLimiter_setTokenBucketConfig:testSetRateLimiterConfigSuccess() (gas: 35459)
-Router_applyRampUpdates:testOffRampDisable() (gas: 193482)
+Router_applyRampUpdates:testOffRampDisable() (gas: 192139)
 Router_applyRampUpdates:testOffRampMismatchReverts() (gas: 108518)
 Router_applyRampUpdates:testOnRampDisable() (gas: 52147)
 Router_applyRampUpdates:testOnlyOwnerReverts() (gas: 12224)
@@ -359,11 +359,11 @@ Router_recoverTokens:testRecoverTokensValueReceiverReverts() (gas: 444668)
 Router_routeMessage:testAutoExecSuccess() (gas: 38973)
 Router_routeMessage:testExecutionEventSuccess() (gas: 208846)
 Router_routeMessage:testManualExecSuccess() (gas: 31211)
-Router_routeMessage:testOnlyOffRampReverts() (gas: 23620)
-Router_routeMessage:testWhenNotHealthyReverts() (gas: 47157)
+Router_routeMessage:testOnlyOffRampReverts() (gas: 22025)
+Router_routeMessage:testWhenNotHealthyReverts() (gas: 45570)
 Router_setWrappedNative:testOnlyOwnerReverts() (gas: 10976)
 ThirdPartyBurnMintTokenPool_applyRampUpdates:testInvalidOffRampReverts() (gas: 23375)
-ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 23317)
+ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21732)
 ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListSuccess() (gas: 99869)
 TokenPoolWithAllowList_applyAllowListUpdates:testOnlyOwnerReverts() (gas: 12072)
 TokenPoolWithAllowList_applyAllowListUpdates:testSetAllowListSkipsZeroSuccess() (gas: 20409)
@@ -389,9 +389,9 @@ TokenProxy_getFee:testGetFeeInvalidTokenReverts() (gas: 12616)
 TokenProxy_getFee:testGetFeeNoDataAllowedReverts() (gas: 15763)
 TokenProxy_getFee:testGetFeeSuccess() (gas: 73739)
 USDCTokenPool__validateMessage:testValidateInvalidMessageReverts() (gas: 25129)
-USDCTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 23411)
-USDCTokenPool_lockOrBurn:testPermissionsErrorReverts() (gas: 14004)
-USDCTokenPool_lockOrBurn:testUnknownDomainReverts() (gas: 184546)
+USDCTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21826)
+USDCTokenPool_lockOrBurn:testPermissionsErrorReverts() (gas: 12428)
+USDCTokenPool_lockOrBurn:testUnknownDomainReverts() (gas: 183236)
 USDCTokenPool_releaseOrMint:testReleaseOrMintRealTxSuccess() (gas: 55869)
 USDCTokenPool_releaseOrMint:testTokenMaxCapacityExceededReverts() (gas: 27768)
 USDCTokenPool_releaseOrMint:testUnlockingUSDCFailedReverts() (gas: 50610)

contracts/gas-snapshots/functions.gas-snapshot

@@ -87,9 +87,9 @@ FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotAll
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotSubscriptionOwner() (gas: 89340)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPaused() (gas: 20191)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPendingRequests() (gas: 193277)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitAllBalanceAsDeposit() (gas: 114636)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitSomeBalanceAsDeposit() (gas: 125891)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessRecieveDeposit() (gas: 312021)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitAllBalanceAsDeposit() (gas: 113352)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitSomeBalanceAsDeposit() (gas: 124604)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessRecieveDeposit() (gas: 310123)
 FunctionsSubscriptions_Constructor:test_Constructor_Success() (gas: 7654)
 FunctionsSubscriptions_CreateSubscriptionWithConsumer:test_CreateSubscriptionWithConsumer_RevertIfNotAllowedSender() (gas: 28637)
 FunctionsSubscriptions_CreateSubscriptionWithConsumer:test_CreateSubscriptionWithConsumer_RevertIfPaused() (gas: 17948)
@@ -98,8 +98,8 @@ FunctionsSubscriptions_GetConsumer:test_GetConsumer_Success() (gas: 16225)
 FunctionsSubscriptions_GetFlags:test_GetFlags_Success() (gas: 40858)
 FunctionsSubscriptions_GetSubscription:test_GetSubscription_Success() (gas: 30959)
 FunctionsSubscriptions_GetSubscriptionCount:test_GetSubscriptionCount_Success() (gas: 12967)
-FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfEndIsAfterLastSubscription() (gas: 16523)
-FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 13436)
+FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfEndIsAfterLastSubscription() (gas: 14949)
+FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 11863)
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Success() (gas: 59568)
 FunctionsSubscriptions_GetTotalBalance:test_GetTotalBalance_Success() (gas: 15032)
 FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata() (gas: 27594)
@@ -110,7 +110,7 @@ FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_Success() (gas: 5627
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_RevertIfNoSubscription() (gas: 12818)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_RevertIfNotOwner() (gas: 15549)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_Success() (gas: 54867)
-FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessDeletesSubscription() (gas: 49624)
+FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessDeletesSubscription() (gas: 48362)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessSubOwnerRefunded() (gas: 50896)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessWhenRequestInFlight() (gas: 163911)
 FunctionsSubscriptions_ProposeSubscriptionOwnerTransfer:test_ProposeSubscriptionOwnerTransfer_RevertIfEmptyNewOwner() (gas: 27610)