Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable m3-related tests #167

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions test/integration/StakingNode.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 6 additions & 2 deletions test/scenarios/ynETH.spec.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
Loading