fix: harden skipped ledger resolution paths
Co-authored-by: genichin <4282227+genichin@users.noreply.github.com>
This commit is contained in:
co-authored by
genichin
parent
b88b21b772
commit
48dfc3e76f
@@ -6,7 +6,7 @@ critical path while the ledger write is eventually-consistent.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from trex_core.adapters.broker.kis import KISBroker
|
||||
from trex_core.adapters.broker.paper import PaperBroker
|
||||
@@ -63,6 +63,55 @@ class _SkipStore:
|
||||
def resolve_for_fill(self, **_kwargs):
|
||||
return []
|
||||
|
||||
def resolve_for_delivery(
|
||||
self,
|
||||
*,
|
||||
instance_key,
|
||||
portfolio_id,
|
||||
side,
|
||||
order_id,
|
||||
execution_id,
|
||||
resolution_reason,
|
||||
):
|
||||
resolved = []
|
||||
updated = {}
|
||||
for key, record in self._by_key.items():
|
||||
if (
|
||||
record.instance_key == instance_key
|
||||
and record.portfolio_id == portfolio_id
|
||||
and record.side == side
|
||||
and (
|
||||
record.execution_id == execution_id
|
||||
or (record.execution_id is None and record.order_id == order_id)
|
||||
)
|
||||
):
|
||||
record = LedgerSkipRecord(
|
||||
skip_key=record.skip_key,
|
||||
instance_key=record.instance_key,
|
||||
slot_id=record.slot_id,
|
||||
portfolio_id=record.portfolio_id,
|
||||
symbol=record.symbol,
|
||||
order_id=record.order_id,
|
||||
execution_id=record.execution_id or execution_id,
|
||||
side=record.side,
|
||||
qty=record.qty,
|
||||
price=record.price,
|
||||
executed_at=record.executed_at,
|
||||
order_venue=record.order_venue,
|
||||
execution_venue=record.execution_venue,
|
||||
skip_reason=record.skip_reason,
|
||||
status="resolved",
|
||||
resolution_reason=resolution_reason,
|
||||
resolved_at=record.executed_at,
|
||||
created_at=record.created_at,
|
||||
updated_at=record.executed_at,
|
||||
)
|
||||
resolved.append(record)
|
||||
updated[key] = record
|
||||
self._by_key = updated
|
||||
self.records = list(self._by_key.values())
|
||||
return resolved
|
||||
|
||||
|
||||
|
||||
def _wire(broker, *, ledger=None, clock=None, alarm_emitter=None, ledger_skip_store=None):
|
||||
@@ -79,9 +128,13 @@ def _wire(broker, *, ledger=None, clock=None, alarm_emitter=None, ledger_skip_st
|
||||
alarm_emitter=alarm_emitter,
|
||||
ledger_skip_store=ledger_skip_store,
|
||||
)
|
||||
writer = (
|
||||
LedgerWriter(outbox, ledger or InMemoryLedger(), clock=clock)
|
||||
if clock else LedgerWriter(outbox, ledger or InMemoryLedger())
|
||||
writer = LedgerWriter(
|
||||
outbox,
|
||||
ledger or InMemoryLedger(),
|
||||
clock=clock,
|
||||
alarm_emitter=alarm_emitter,
|
||||
ledger_skip_store=ledger_skip_store,
|
||||
instance_key="default",
|
||||
)
|
||||
repo.reconcile_universe("default", {"PF-1": "SYM"})
|
||||
return repo, svc, intents, execution, outbox, writer
|
||||
@@ -294,6 +347,50 @@ def test_missing_execution_id_persists_skip_record() -> None:
|
||||
assert record.execution_id is None
|
||||
|
||||
|
||||
def test_skip_resolves_only_after_writer_completes_delivery() -> None:
|
||||
transport = InMemoryTransport()
|
||||
skip_store = _SkipStore()
|
||||
ledger = InMemoryLedger()
|
||||
_repo, _, intents, execution, outbox, writer = _wire(
|
||||
PaperBroker(fill_after_polls=0),
|
||||
ledger=ledger,
|
||||
alarm_emitter=AlarmEmitter(transport),
|
||||
ledger_skip_store=skip_store,
|
||||
)
|
||||
sid = _buy(intents, iid="delayed-skip-resolution").slot_id
|
||||
record, _ = skip_store.record_skip(
|
||||
instance_key="default",
|
||||
slot_id=sid,
|
||||
portfolio_id="PF-1",
|
||||
symbol="005930",
|
||||
order_id="PAPER-000001",
|
||||
execution_id=None,
|
||||
side="buy",
|
||||
qty=10.0,
|
||||
price=1000.0,
|
||||
executed_at=datetime(2026, 8, 24, 0, 0, tzinfo=UTC),
|
||||
order_venue="SOR",
|
||||
execution_venue="unknown",
|
||||
skip_reason="missing_execution_id",
|
||||
)
|
||||
|
||||
result = execution.run_once()
|
||||
|
||||
assert result.ledger_enqueued == 1
|
||||
assert outbox.all_items()
|
||||
assert skip_store._by_key[record.skip_key].status == "unresolved"
|
||||
assert transport.alarm_events() == []
|
||||
|
||||
stats = writer.run_once()
|
||||
|
||||
assert stats.completed == 1
|
||||
resolved = skip_store._by_key[record.skip_key]
|
||||
assert resolved.status == "resolved"
|
||||
assert resolved.execution_id is not None
|
||||
assert resolved.resolution_reason == "ledger_recorded"
|
||||
assert [payload["code"] for _, payload in transport.alarm_events()] == ["ledger_skip_resolved"]
|
||||
|
||||
|
||||
def test_ledger_skip_emits_warning(caplog):
|
||||
"""dcy-011 / REQ-018 FR-4 (S-3): ledger skip is logged, not silent."""
|
||||
import logging
|
||||
|
||||
Reference in New Issue
Block a user