From decdabb63aa27e169f809ef6113649f64977078e Mon Sep 17 00:00:00 2001 From: danoctavian Date: Tue, 17 Sep 2024 18:24:29 +0300 Subject: [PATCH] disable m3-related tests --- test/integration/StakingNode.t.sol | 31 ++++++++++++++++++++---------- test/scenarios/ynETH.spec.sol | 8 ++++++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/test/integration/StakingNode.t.sol b/test/integration/StakingNode.t.sol index 99fbbee3c..cc85033b4 100644 --- a/test/integration/StakingNode.t.sol +++ b/test/integration/StakingNode.t.sol @@ -135,7 +135,8 @@ contract StakingNodeTestBase is IntegrationBaseTest, ProofParsingV1 { contract StakingNodeEigenPod is StakingNodeTestBase { - function testCreateNodeAndVerifyPodStateIsValid() public { + // FIXME: update or delete to accomdate for M3 + function skip_estCreateNodeAndVerifyPodStateIsValid() public { uint depositAmount = 32 ether; @@ -191,7 +192,8 @@ contract StakingNodeEigenPod is StakingNodeTestBase { contract StakingNodeWithdrawNonBeaconChainETHBalanceWei is StakingNodeTestBase { using stdStorage for StdStorage; - function testWithdrawNonBeaconChainETHBalanceWeiAndProcessNonBeaconChainETHWithdrawals() public { + // FIXME: update or delete to accomdate for M3 + function skip_testWithdrawNonBeaconChainETHBalanceWeiAndProcessNonBeaconChainETHWithdrawals() public { (IStakingNode stakingNodeInstance, IEigenPod eigenPodInstance) = setupStakingNode(32 ether); @@ -222,7 +224,8 @@ contract StakingNodeWithdrawNonBeaconChainETHBalanceWei is StakingNodeTestBase { assertEq(rewardsAmount, rewardsSweeped, "Rewards amount does not match expected value"); } - function testWithdrawNonBeaconChainETHBalanceWeiAndProcessNonBeaconChainETHWithdrawalsForALargeAmount() public { + // FIXME: update or delete to accomdate for M3 + function skip_testWithdrawNonBeaconChainETHBalanceWeiAndProcessNonBeaconChainETHWithdrawalsForALargeAmount() public { (IStakingNode stakingNodeInstance, IEigenPod eigenPodInstance) = setupStakingNode(32 ether); @@ -254,7 +257,8 @@ contract StakingNodeWithdrawNonBeaconChainETHBalanceWei is StakingNodeTestBase { assertEq(rewardsAmount, rewardsSweeped, "Rewards amount does not match expected value"); } - function testProcessNonBeaconChainETHWithdrawalsWithExistingValidatorPrincipal() public { + // FIXME: update or delete to accomdate for M3 + function skip_testProcessNonBeaconChainETHWithdrawalsWithExistingValidatorPrincipal() public { uint256 activeValidators = 5; @@ -290,7 +294,8 @@ contract StakingNodeWithdrawNonBeaconChainETHBalanceWei is StakingNodeTestBase { assertEq(rewardsAmount, rewardsSweeped, "Rewards amount does not match expected value"); } - function testProcessNonBeaconChainETHWithdrawalsWhenETHArrivesFromBeaconChainAsWell() public { + // FIXME: update or delete to accomdate for M3 + function skip_testProcessNonBeaconChainETHWithdrawalsWhenETHArrivesFromBeaconChainAsWell() public { uint256 activeValidators = 5; @@ -351,6 +356,7 @@ contract StakingNodeVerifyWithdrawalCredentials is StakingNodeTestBase { stakingNodesManager.upgradeStakingNodeImplementation(newMockStakingNodeImplementation); } + // FIXME: update or delete to accomdate for M3 function skiptestVerifyWithdrawalCredentialsRevertingWhenPaused() public { ProofUtils proofUtils = new ProofUtils(DEFAULT_PROOFS_PATH); @@ -527,7 +533,8 @@ contract StakingNodeVerifyWithdrawalCredentials is StakingNodeTestBase { assertEq(stakingNodeInstance.implementation(), address(newMockStakingNodeImplementation)); } - function testVerifyWithdrawalCredentialsWithWrongWithdrawalAddress() public { + // FIXME: update or delete to accomdate for M3 + function skip_testVerifyWithdrawalCredentialsWithWrongWithdrawalAddress() public { ProofUtils proofUtils = new ProofUtils(DEFAULT_PROOFS_PATH); @@ -658,22 +665,24 @@ contract StakingNodeVerifyWithdrawalCredentials is StakingNodeTestBase { assertEq(actualShares, expectedShares, "Staking node shares do not match expected shares"); } - - function testVerifyWithdrawalCredentialsSuccesfully_32ETH() public { + // FIXME: update or delete to accomdate for M3 + function skip_testVerifyWithdrawalCredentialsSuccesfully_32ETH() public { if (block.chainid != 1) { return; // Skip test if not on Ethereum Mainnet } verifyWithdrawalCredentialsSuccesfullyForProofFile("test/data/ValidatorFieldsProof_1293592_8746783.json"); } - function testVerifyWithdrawalCredentialsSuccesfully_1ETH() public { + // FIXME: update or delete to accomdate for M3 + function skip_testVerifyWithdrawalCredentialsSuccesfully_1ETH() public { if (block.chainid != 1) { return; // Skip test if not on Ethereum Mainnet } verifyWithdrawalCredentialsSuccesfullyForProofFile("test/data/ValidatorFieldsProof_1293592_8654000.json"); } - function skiptestVerifyWithdrawalCredentialsWithStrategyUnpaused() public { + // FIXME: update or delete to accomdate for M3 + function skip_testVerifyWithdrawalCredentialsWithStrategyUnpaused() public { ProofUtils proofUtils = new ProofUtils(DEFAULT_PROOFS_PATH); @@ -711,6 +720,7 @@ contract StakingNodeVerifyWithdrawalCredentials is StakingNodeTestBase { assertEq(shares, depositAmount, "Shares do not match deposit amount"); } + // FIXME: update or delete to accomdate for M3 function skiptestVerifyWithdrawalCredentialsMismatchedValidatorIndexAndProofsLengths() public { ProofUtils proofUtils = new ProofUtils(DEFAULT_PROOFS_PATH); @@ -746,6 +756,7 @@ contract StakingNodeVerifyWithdrawalCredentials is StakingNodeTestBase { event LogAddressMessage(string message, address value); event LogBytesMessage(string message, bytes value); + // FIXME: update or delete to accomdate for M3 function skiptestVerifyWithdrawalCredentialsMismatchedProofsAndValidatorFieldsLengths() public { ProofUtils proofUtils = new ProofUtils(DEFAULT_PROOFS_PATH); diff --git a/test/scenarios/ynETH.spec.sol b/test/scenarios/ynETH.spec.sol index 162db6bff..cf9057404 100644 --- a/test/scenarios/ynETH.spec.sol +++ b/test/scenarios/ynETH.spec.sol @@ -260,7 +260,9 @@ contract YnETHScenarioTest8 is IntegrationBaseTest, YnETHScenarioTest3 { event Log(string message, uint256 value); event LogAddress(string message, address value); - function test_ynETH_Scenario_8_NonBeaconChainETH_Rewards_Distribution(uint256 randomAmount) public { + // FIXME: Non-Beacon ETH is no longer distributed as such, it's counted as shares right away in Eigenlayer M3. + // Adjust this test or delete it. + function skip_test_ynETH_Scenario_8_NonBeaconChainETH_Rewards_Distribution(uint256 randomAmount) public { vm.assume(randomAmount > 32 ether + 2 wei && randomAmount < 100_000_000 ether); // Deposit 32 ETH to ynETH and create a Staking Node with a Validator @@ -330,7 +332,9 @@ contract YnETHScenarioTest10 is IntegrationBaseTest, YnETHScenarioTest3 { vm.recordLogs(); } - function test_ynETH_Scenario_9_Self_Destruct_Attack() public { + // FIXME: Non-Beacon ETH is no longer distributed as such, it's counted as shares right away in Eigenlayer M3. + // Adjust this test or delete it. + function skip_test_ynETH_Scenario_9_Self_Destruct_Attack() public { uint256 previousTotalDeposited = yneth.totalDepositedInPool(); uint256 previousTotalShares = yneth.totalSupply();