Compare commits
1 commit
102c8eac91
...
8dad72a00d
| Author | SHA1 | Date | |
|---|---|---|---|
| 8dad72a00d |
2 changed files with 61 additions and 1 deletions
5
tasks.py
5
tasks.py
|
|
@ -235,7 +235,10 @@ async def _record_rejected(payment: Payment, machine: Machine, exc: Exception) -
|
||||||
return
|
return
|
||||||
logger.error(
|
logger.error(
|
||||||
f"spirekeeper: rejected settlement {rejected.id} "
|
f"spirekeeper: rejected settlement {rejected.id} "
|
||||||
f"(machine={machine.machine_npub[:12]}..., "
|
# An unpaired machine (machine_npub None) reaches here now that
|
||||||
|
# assert_nostr_attribution rejects it — fall back to the id so the
|
||||||
|
# log line doesn't crash on None[:12].
|
||||||
|
f"(machine={(machine.machine_npub or machine.id)[:12]}..., "
|
||||||
f"payment_hash={payment.payment_hash[:12]}...): {exc}"
|
f"payment_hash={payment.payment_hash[:12]}...): {exc}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
57
tests/test_unpaired_machine_guards.py
Normal file
57
tests/test_unpaired_machine_guards.py
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
"""
|
||||||
|
Regression: `machine_npub` is nullable (#29/m011 register-unpaired flow), so
|
||||||
|
every consumer that derives a Nostr identity from it must handle `None` rather
|
||||||
|
than crash `normalize_public_key(None)` (AttributeError: 'NoneType' has no
|
||||||
|
'startswith') or `machine_npub[:12]` (TypeError). See PR #33 — an unpaired
|
||||||
|
machine on the demo broke the platform-fee update (500) and the cassette
|
||||||
|
consumer.
|
||||||
|
|
||||||
|
These cover the pure-function guards; the DB-backed loops
|
||||||
|
(get_machine_by_atm_pubkey_hex, the super-config republish loop) are exercised
|
||||||
|
on the dev stack with an unpaired active machine.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from ..bitspire import SettlementAttributionError, assert_nostr_attribution
|
||||||
|
from ..cassette_transport import build_state_d_tags_for_machines
|
||||||
|
from ..models import Machine
|
||||||
|
|
||||||
|
_PAIRED_HEX = "82341f882b6eabcbd6b1c2da5cd14df14b8e91dd0e6da41a72b78ad8f3a7d3b9"
|
||||||
|
|
||||||
|
|
||||||
|
def _machine(npub: str | None) -> Machine:
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
return Machine(
|
||||||
|
id="unpaired1",
|
||||||
|
operator_user_id="op1",
|
||||||
|
machine_npub=npub,
|
||||||
|
wallet_id="w1",
|
||||||
|
name="unpaired",
|
||||||
|
location=None,
|
||||||
|
fiat_code="EUR",
|
||||||
|
is_active=True,
|
||||||
|
created_at=now,
|
||||||
|
updated_at=now,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_attribution_rejects_unpaired_machine_cleanly():
|
||||||
|
"""An unpaired machine must raise the domain SettlementAttributionError
|
||||||
|
(which the listener records as 'rejected'), not an uncaught AttributeError
|
||||||
|
from normalize_public_key(None)."""
|
||||||
|
with pytest.raises(SettlementAttributionError):
|
||||||
|
assert_nostr_attribution(
|
||||||
|
_machine(None),
|
||||||
|
{"source": "bitspire", "nostr_sender_pubkey": _PAIRED_HEX},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_cassette_d_tags_skip_unpaired_machine():
|
||||||
|
"""build_state_d_tags_for_machines must skip unpaired machines rather than
|
||||||
|
crash _atm_hex_pubkey on a None npub — the cassette-consumer loop crash."""
|
||||||
|
tags = build_state_d_tags_for_machines([_machine(_PAIRED_HEX), _machine(None)])
|
||||||
|
assert len(tags) == 1 # only the paired machine contributes a d-tag
|
||||||
|
assert all("None" not in t for t in tags)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue