Skip to content

Commit ec42def

Browse files
committed
Stop on ClaimDelayNotPassedException
Signed-off-by: cyc60 <avsysoev60@gmail.com>
1 parent 4545a19 commit ec42def

2 files changed

Lines changed: 0 additions & 27 deletions

File tree

src/commands/internal/process_redeemer.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from src.common.wallet import wallet
3232
from src.config.networks import AVAILABLE_NETWORKS, ZERO_CHECKSUM_ADDRESS
3333
from src.config.settings import settings
34-
from src.meta_vault.exceptions import ClaimDelayNotPassedException
3534
from src.meta_vault.graph import graph_get_vaults
3635
from src.meta_vault.service import is_meta_vault, is_meta_vault_state_update_required
3736
from src.meta_vault.tasks import meta_vault_tree_update_state
@@ -341,13 +340,6 @@ async def update_vaults_state(
341340
root_meta_vault=root_meta_vault,
342341
meta_vaults_map=meta_vaults_map,
343342
)
344-
except ClaimDelayNotPassedException as e:
345-
logger.error(
346-
'Cannot update meta vault %s state because claim delay for exit request '
347-
'with position ticket %s has not passed yet',
348-
vault,
349-
e.exit_request.position_ticket,
350-
)
351343
except Exception as e:
352344
raise RuntimeError(f'Failed to update meta vault tree state for vault {vault}') from e
353345

src/commands/tests/test_internal/test_process_redeemer.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
update_vaults_state,
2626
)
2727
from src.common.typings import HarvestParams
28-
from src.meta_vault.exceptions import ClaimDelayNotPassedException
2928
from src.meta_vault.typings import SubVaultRedemption
3029
from src.redemptions.os_token_converter import OsTokenConverter
3130
from src.redemptions.typings import OsTokenPosition
@@ -510,24 +509,6 @@ async def test_meta_vault_update_state_failure_raises(self) -> None:
510509
with pytest.raises(RuntimeError, match='Failed to update meta vault tree state'):
511510
await update_vaults_state(vaults=[VAULT_1], block_number=BlockNumber(100))
512511

513-
async def test_meta_vault_claim_delay_logged_and_continues(self) -> None:
514-
"""ClaimDelayNotPassedException is caught, logged, and does not abort the round.
515-
516-
Regular vaults batched alongside the meta vault are still processed.
517-
"""
518-
exit_request = MagicMock()
519-
exit_request.vault = VAULT_1
520-
exit_request.position_ticket = 1234
521-
params = make_harvest_params()
522-
with _mock_update_vaults_state(
523-
meta_vaults_map={VAULT_1: MagicMock()},
524-
harvest_params={VAULT_2: params},
525-
update_state_exception=ClaimDelayNotPassedException(exit_request),
526-
) as mocks:
527-
await update_vaults_state(vaults=[VAULT_1, VAULT_2], block_number=BlockNumber(100))
528-
mocks['update_state'].assert_awaited_once()
529-
mocks['redeemer'].batch_update_vault_state.assert_awaited_once_with({VAULT_2: params})
530-
531512
@pytest.mark.parametrize(
532513
'has_params, expected_multicall_calls',
533514
[(True, 1), (False, 0)],

0 commit comments

Comments
 (0)