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.

Sign up for GitHub

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

fix oracle report for exited keys in CSM #325

Merged
merged 1 commit into from
Dec 3, 2024
Merged

fix oracle report for exited keys in CSM #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions tests/regression/test_csm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def test_csm_update_refunded(node_operator):

@pytest.mark.usefixtures("deposits_to_csm")
def test_csm_report_exited(csm, node_operator, extra_data_service):
total_exited = csm.getStakingModuleSummary()["totalExitedValidators"]
exited_keys = 5
extra_data = extra_data_service.collect({}, {(CSM_MODULE_ID, node_operator): exited_keys}, exited_keys, exited_keys)
oracle_report(
Expand All @@ -163,7 +164,8 @@ def test_csm_report_exited(csm, node_operator, extra_data_service):
extraDataItemsCount=1,
extraDataList=extra_data.extra_data_list,
stakingModuleIdsWithNewlyExitedValidators=[CSM_MODULE_ID],
numExitedValidatorsByStakingModule=[1],
numExitedValidatorsByStakingModule=[total_exited + exited_keys],

)

no = csm.getNodeOperator(node_operator)
Expand All @@ -172,6 +174,7 @@ def test_csm_report_exited(csm, node_operator, extra_data_service):

@pytest.mark.usefixtures("deposits_to_csm")
def test_csm_report_stuck(csm, node_operator, extra_data_service):
total_exited = csm.getStakingModuleSummary()["totalExitedValidators"]
stuck_keys = 5
extra_data = extra_data_service.collect( {(CSM_MODULE_ID, node_operator): stuck_keys}, {}, stuck_keys, stuck_keys)
oracle_report(
Expand All @@ -180,7 +183,7 @@ def test_csm_report_stuck(csm, node_operator, extra_data_service):
extraDataItemsCount=1,
extraDataList=extra_data.extra_data_list,
stakingModuleIdsWithNewlyExitedValidators=[CSM_MODULE_ID],
numExitedValidatorsByStakingModule=[1],
numExitedValidatorsByStakingModule=[total_exited],
)

no = csm.getNodeOperator(node_operator)
Expand All @@ -200,7 +203,7 @@ def test_csm_get_staking_module_summary(csm, accounting, node_operator, extra_da
extraDataItemsCount=1,
extraDataList=extra_data.extra_data_list,
stakingModuleIdsWithNewlyExitedValidators=[CSM_MODULE_ID],
numExitedValidatorsByStakingModule=[1],
numExitedValidatorsByStakingModule=[exited_before + exited_keys],
)

# Assure there are new deposited keys
Expand All @@ -221,6 +224,7 @@ def test_csm_get_staking_module_summary(csm, accounting, node_operator, extra_da

@pytest.mark.usefixtures("deposits_to_csm")
def test_csm_get_node_operator_summary(csm, node_operator, extra_data_service):
total_exited = csm.getStakingModuleSummary()["totalExitedValidators"]
no = csm.getNodeOperator(node_operator)
exited_keys = 1
stuck_keys = 1
Expand All @@ -231,7 +235,7 @@ def test_csm_get_node_operator_summary(csm, node_operator, extra_data_service):
extraDataItemsCount=2,
extraDataList=extra_data.extra_data_list,
stakingModuleIdsWithNewlyExitedValidators=[CSM_MODULE_ID],
numExitedValidatorsByStakingModule=[1],
numExitedValidatorsByStakingModule=[total_exited],
)

summary = contracts.staking_router.getNodeOperatorSummary(CSM_MODULE_ID, node_operator)
Expand Down
Loading