fixes for more requested feedback. Restructure ACK receivers and Clie…

…ntBase

contracts/gas-snapshots/ccip.gas-snapshot

@@ -34,10 +34,10 @@ BurnWithFromMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 28675)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55158)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 243568)
 BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 24260)
-CCIPClientTest:test_ccipReceiveAndSendAck() (gas: 331271)
-CCIPClientTest:test_ccipSendAndReceiveAck_in_return() (gas: 347022)
-CCIPClientTest:test_ccipSend_withNonNativeFeetoken_andNoDestTokens() (gas: 241425)
-CCIPClientTest:test_send_tokens_that_are_not_feeToken() (gas: 552000)
+CCIPClientTest:test_ccipReceiveAndSendAck_Success() (gas: 331825)
+CCIPClientTest:test_ccipSendAndReceiveAck_in_return_Success() (gas: 348272)
+CCIPClientTest:test_ccipSend_withNonNativeFeetoken_andNoDestTokens_Success() (gas: 241532)
+CCIPClientTest:test_send_tokens_that_are_not_feeToken_Success() (gas: 552173)
 CCIPConfigSetup:test_getCapabilityConfiguration_Success() (gas: 9495)
 CCIPConfig_ConfigStateMachine:test__computeConfigDigest_Success() (gas: 70755)
 CCIPConfig_ConfigStateMachine:test__computeNewConfigWithMeta_InitToRunning_Success() (gas: 357994)
@@ -88,21 +88,22 @@ CCIPConfig_validateConfig:test__validateConfig_TooManyBootstrapP2PIds_Reverts()
 CCIPConfig_validateConfig:test__validateConfig_TooManySigners_Reverts() (gas: 1160583)
 CCIPConfig_validateConfig:test__validateConfig_TooManyTransmitters_Reverts() (gas: 1158919)
 CCIPConfig_validateConfig:test_getCapabilityConfiguration_Success() (gas: 9562)
-CCIPReceiverTest:test_HappyPath_Success() (gas: 193588)
-CCIPReceiverTest:test_Recovery_from_invalid_sender() (gas: 428817)
-CCIPReceiverTest:test_Recovery_with_intentional_revert() (gas: 444784)
-CCIPReceiverTest:test_disableChain_andRevert_onccipReceive_REVERT() (gas: 205094)
-CCIPReceiverTest:test_removeSender_from_approvedList_and_revert() (gas: 425167)
-CCIPReceiverTest:test_retryFailedMessage_Success() (gas: 420799)
-CCIPReceiverTest:test_withdraw_nativeToken_to_owner() (gas: 18806)
-CCIPReceiverWithAckTest:test_ccipReceive_ack_message() (gas: 55172)
-CCIPReceiverWithAckTest:test_ccipReceive_and_respond_with_ack() (gas: 331323)
-CCIPReceiverWithAckTest:test_ccipReceiver_ack_with_invalidAckMessageHeaderBytes_REVERT() (gas: 437616)
-CCIPReceiverWithAckTest:test_feeTokenApproval_in_constructor() (gas: 2643085)
-CCIPReceiverWithAckTest:test_modifyFeeToken() (gas: 72519)
-CCIPSenderTest:test_ccipSend_withNonNativeFeetoken_andDestTokens() (gas: 339182)
-CCIPSenderTest:test_ccipSend_withNonNativeFeetoken_andNoDestTokens() (gas: 224256)
-CCIPSenderTest:test_ccipSend_with_NativeFeeToken_andDestTokens() (gas: 367940)
+CCIPReceiverTest:test_HappyPath_Success() (gas: 193812)
+CCIPReceiverTest:test_Recovery_from_invalid_sender_Success() (gas: 430948)
+CCIPReceiverTest:test_Recovery_with_intentional_Revert() (gas: 445121)
+CCIPReceiverTest:test_disableChain_andRevert_onccipReceive_Revert() (gas: 199816)
+CCIPReceiverTest:test_modifyRouter_Success() (gas: 26470)
+CCIPReceiverTest:test_removeSender_from_approvedList_and_revert_Success() (gas: 427992)
+CCIPReceiverTest:test_retryFailedMessage_Success() (gas: 421204)
+CCIPReceiverTest:test_withdraw_nativeToken_to_owner_Success() (gas: 20689)
+CCIPReceiverWithAckTest:test_ccipReceive_ack_message_Success() (gas: 56254)
+CCIPReceiverWithAckTest:test_ccipReceive_and_respond_with_ack_Success() (gas: 331794)
+CCIPReceiverWithAckTest:test_ccipReceiver_ack_with_invalidAckMessageHeaderBytes_Revert() (gas: 438731)
+CCIPReceiverWithAckTest:test_feeTokenApproval_in_constructor_Success() (gas: 2948564)
+CCIPReceiverWithAckTest:test_modifyFeeToken_Success() (gas: 74835)
+CCIPSenderTest:test_ccipSend_withNonNativeFeetoken_andDestTokens() (gas: 339572)
+CCIPSenderTest:test_ccipSend_withNonNativeFeetoken_andNoDestTokens() (gas: 224467)
+CCIPSenderTest:test_ccipSend_with_NativeFeeToken_andDestTokens() (gas: 368160)
 CommitStore_constructor:test_Constructor_Success() (gas: 3091326)
 CommitStore_isUnpausedAndRMNHealthy:test_RMN_Success() (gas: 73420)
 CommitStore_report:test_InvalidIntervalMinLargerThanMax_Revert() (gas: 28670)
@@ -209,7 +210,7 @@ EVM2EVMMultiOffRamp_executeSingleReport:test_NonExistingSourceChain_Revert() (ga
 EVM2EVMMultiOffRamp_executeSingleReport:test_ReceiverError_Success() (gas: 181595)
 EVM2EVMMultiOffRamp_executeSingleReport:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 189957)
 EVM2EVMMultiOffRamp_executeSingleReport:test_RootNotCommitted_Revert() (gas: 47044)
-EVM2EVMMultiOffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 1408453)
+EVM2EVMMultiOffRamp_executeSingleReport:test_RouterYULCall_Revert() (gas: 1709977)
 EVM2EVMMultiOffRamp_executeSingleReport:test_SingleMessageNoTokensOtherChain_Success() (gas: 248935)
 EVM2EVMMultiOffRamp_executeSingleReport:test_SingleMessageNoTokensUnordered_Success() (gas: 174421)
 EVM2EVMMultiOffRamp_executeSingleReport:test_SingleMessageNoTokens_Success() (gas: 193347)
@@ -235,8 +236,8 @@ EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouche
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_FailedTx_Revert() (gas: 207222)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_ForkedChain_Revert() (gas: 28130)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_GasLimitMismatchMultipleReports_Revert() (gas: 158903)
-EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 1479082)
-EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails() (gas: 3171008)
+EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_LowGasLimit_Success() (gas: 1780718)
+EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_ReentrancyFails() (gas: 3496512)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_Success() (gas: 209279)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_WithGasOverride_Success() (gas: 209853)
 EVM2EVMMultiOffRamp_manuallyExecute:test_manuallyExecute_WithMultiReportGasOverride_Success() (gas: 664710)
@@ -375,7 +376,7 @@ EVM2EVMOffRamp_execute:test_Paused_Revert() (gas: 101458)
 EVM2EVMOffRamp_execute:test_ReceiverError_Success() (gas: 165192)
 EVM2EVMOffRamp_execute:test_RetryFailedMessageWithoutManualExecution_Revert() (gas: 177948)
 EVM2EVMOffRamp_execute:test_RootNotCommitted_Revert() (gas: 41317)
-EVM2EVMOffRamp_execute:test_RouterYULCall_Revert() (gas: 1376538)
+EVM2EVMOffRamp_execute:test_RouterYULCall_Revert() (gas: 1678062)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokensUnordered_Success() (gas: 159863)
 EVM2EVMOffRamp_execute:test_SingleMessageNoTokens_Success() (gas: 175094)
 EVM2EVMOffRamp_execute:test_SingleMessageToNonCCIPReceiver_Success() (gas: 248764)
@@ -407,14 +408,14 @@ EVM2EVMOffRamp_execute_upgrade:test_V2_Success() (gas: 131906)
 EVM2EVMOffRamp_getAllRateLimitTokens:test_GetAllRateLimitTokens_Success() (gas: 38408)
 EVM2EVMOffRamp_getExecutionState:test_FillExecutionState_Success() (gas: 3213556)
 EVM2EVMOffRamp_getExecutionState:test_GetExecutionState_Success() (gas: 83091)
-EVM2EVMOffRamp_manuallyExecute:test_LowGasLimitManualExec_Success() (gas: 1457911)
+EVM2EVMOffRamp_manuallyExecute:test_LowGasLimitManualExec_Success() (gas: 1759547)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecFailedTx_Revert() (gas: 186809)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecForkedChain_Revert() (gas: 25894)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecGasLimitMismatch_Revert() (gas: 43519)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecInvalidGasLimit_Revert() (gas: 26009)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExecWithGasOverride_Success() (gas: 189003)
 EVM2EVMOffRamp_manuallyExecute:test_ManualExec_Success() (gas: 188464)
-EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails() (gas: 2844986)
+EVM2EVMOffRamp_manuallyExecute:test_ReentrancyManualExecuteFails() (gas: 3171279)
 EVM2EVMOffRamp_manuallyExecute:test_manuallyExecute_DoesNotRevertIfUntouched_Success() (gas: 144106)
 EVM2EVMOffRamp_metadataHash:test_MetadataHash_Success() (gas: 8871)
 EVM2EVMOffRamp_setDynamicConfig:test_NonOwner_Revert() (gas: 40429)
@@ -685,9 +686,9 @@ OCR2Base_transmit:test_UnAuthorizedTransmitter_Revert() (gas: 23484)
 OCR2Base_transmit:test_UnauthorizedSigner_Revert() (gas: 39665)
 OCR2Base_transmit:test_WrongNumberOfSignatures_Revert() (gas: 20557)
 OnRampTokenPoolReentrancy:test_OnRampTokenPoolReentrancy_Success() (gas: 380711)
-PingPong_example_ccipReceive:test_CcipReceive_Success() (gas: 308231)
-PingPong_example_plumbing:test_Pausing_Success() (gas: 17898)
-PingPong_example_startPingPong:test_StartPingPong_Success() (gas: 234226)
+PingPong_example_ccipReceive:test_CcipReceive_Success() (gas: 308708)
+PingPong_example_plumbing:test_Pausing_Success() (gas: 17766)
+PingPong_example_startPingPong:test_StartPingPong_Success() (gas: 234292)
 PriceRegistry_applyFeeTokensUpdates:test_ApplyFeeTokensUpdates_Success() (gas: 79823)
 PriceRegistry_applyFeeTokensUpdates:test_OnlyCallableByOwner_Revert() (gas: 12580)
 PriceRegistry_constructor:test_InvalidStalenessThreshold_Revert() (gas: 67418)
@@ -834,8 +835,8 @@ Router_routeMessage:test_ManualExec_Success() (gas: 35381)
 Router_routeMessage:test_OnlyOffRamp_Revert() (gas: 25116)
 Router_routeMessage:test_WhenNotHealthy_Revert() (gas: 44724)
 Router_setWrappedNative:test_OnlyOwner_Revert() (gas: 10985)
-SelfFundedPingPong_ccipReceive:test_FundingIfNotANop_Revert() (gas: 290288)
-SelfFundedPingPong_ccipReceive:test_Funding_Success() (gas: 451971)
+SelfFundedPingPong_ccipReceive:test_FundingIfNotANop_Revert() (gas: 290920)
+SelfFundedPingPong_ccipReceive:test_Funding_Success() (gas: 456179)
 SelfFundedPingPong_setCountIncrBeforeFunding:test_setCountIncrBeforeFunding() (gas: 20203)
 TokenAdminRegistry_acceptAdminRole:test_acceptAdminRole_OnlyPendingAdministrator_Revert() (gas: 51085)
 TokenAdminRegistry_acceptAdminRole:test_acceptAdminRole_Success() (gas: 43947)