core: extract GUI-free logic into bal.core (reminders/checkalive/input_rules); fix save/sign tx RLock pickle by serializing tx; keep invalid heirs in wallet on build; tb1 testnet will-executor addresses; move tests to core modules
This commit is contained in:
@@ -3,116 +3,99 @@ Tests for the "BASIC mode dynamic Check Alive" fix (Group I).
|
||||
|
||||
Background (reported by the owner): with the plugin left in BASIC mode (the
|
||||
default), the "Check Alive" (threshold) field is hidden from the user and
|
||||
stays stuck at its old/default value (roughly "today + 11 months", i.e. one
|
||||
year minus the default 30-day margin). If the user then anticipates the
|
||||
delivery time (locktime) to something earlier than that stale threshold - e.g.
|
||||
"in 1 month" - two different checks that compare locktime against
|
||||
``date_to_check`` (the resolved threshold) would incorrectly treat the will as
|
||||
"expired"/"invalid", even though the whole Check Alive concept is supposed to
|
||||
be inert in BASIC mode.
|
||||
stays stuck at its old/default value. If the user then anticipates the
|
||||
delivery time (locktime) to something earlier than that stale threshold, the
|
||||
checks that compare locktime against ``date_to_check`` would incorrectly treat
|
||||
the will as "expired"/"invalid", even though the whole Check Alive concept is
|
||||
supposed to be inert in BASIC mode.
|
||||
|
||||
The fix (``BalWindow.compute_date_to_check``) makes ``date_to_check`` track
|
||||
the delivery time LIVE in BASIC mode, placed a fixed 2-hour margin before it,
|
||||
so it is always < locktime by construction. In ADVANCED mode nothing changes:
|
||||
the stored threshold is used as-is.
|
||||
The real fix lives in ``BalWindow.init_class_variables`` (window.py), which
|
||||
sets ``date_to_check`` to *now* in BASIC mode, and is now implemented by the
|
||||
pure policy in ``bal.core.checkalive``:
|
||||
|
||||
These tests call the real production method directly (no GUI/Electrum wallet
|
||||
needed - it is a plain ``@staticmethod``), so they exercise the exact code
|
||||
used at runtime rather than a re-implementation.
|
||||
* ``resolve_date_to_check(is_basic_mode, will_settings)`` - the single
|
||||
reference timestamp: "now" in BASIC, the stored threshold in ADVANCED;
|
||||
* ``check_alive_expired(is_basic_mode, date_to_check)`` - whether the
|
||||
Check-Alive guard should fire (never in BASIC).
|
||||
|
||||
These tests exercise the exact code used at runtime (no GUI/Electrum wallet
|
||||
needed, and no Qt import).
|
||||
|
||||
Run:
|
||||
PYTHONPATH=electrum-src python3 -m pytest tests/test_group_i_basic_checkalive.py -q
|
||||
source /home/steal/devel/bal/electrum/env/bin/activate
|
||||
python3 tests/test_group_i_basic_checkalive.py
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
|
||||
sys.path.insert(0, __file__.rsplit("/", 2)[0])
|
||||
|
||||
from bal.gui.qt.window import BalWindow # noqa: E402 (path insert above)
|
||||
|
||||
OFFSET = BalWindow.BASIC_MODE_CHECK_ALIVE_OFFSET_SECONDS
|
||||
from bal.core.checkalive import ( # noqa: E402 (path insert above)
|
||||
CheckAliveError,
|
||||
check_alive_expired,
|
||||
resolve_date_to_check,
|
||||
)
|
||||
|
||||
|
||||
def test_offset_is_two_hours():
|
||||
"""Owner-approved margin: exactly 2 hours."""
|
||||
assert OFFSET == 2 * 60 * 60
|
||||
def test_basic_mode_resolves_to_now():
|
||||
"""BASIC mode: date_to_check is "now", never the stale stored threshold."""
|
||||
fake_now = 1_800_000_000.0
|
||||
result = resolve_date_to_check(True, {"threshold": time.time() + 86400}, now=fake_now)
|
||||
assert result == fake_now
|
||||
|
||||
|
||||
def _relative_days_to_midnight_timestamp(days):
|
||||
"""Reproduce Util.parse_locktime_string's own normalisation: "now + N
|
||||
days", truncated to midnight. Used to compute the expected value in
|
||||
tests without duplicating the parsing logic itself."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
now = datetime.now()
|
||||
return (
|
||||
(now + timedelta(days=days))
|
||||
.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
.timestamp()
|
||||
)
|
||||
def test_basic_mode_ignores_stored_threshold():
|
||||
"""BASIC + delivery anticipated to 1 month: date_to_check stays "now" and
|
||||
does NOT jump to the old ~11-month threshold - this is the exact bug
|
||||
scenario reported by the owner."""
|
||||
stale_threshold = time.time() + 11 * 30 * 86400 # the old stuck value
|
||||
fake_now = 1_800_000_000.0
|
||||
result = resolve_date_to_check(True, {"threshold": stale_threshold}, now=fake_now)
|
||||
assert result == fake_now
|
||||
|
||||
|
||||
def test_basic_mode_relative_locktime_one_year():
|
||||
"""BASIC + default "1y" delivery: date_to_check tracks it, 2h earlier."""
|
||||
result = BalWindow.compute_date_to_check(True, "1y", "30d")
|
||||
expected_locktime = _relative_days_to_midnight_timestamp(365)
|
||||
assert abs(result - (expected_locktime - OFFSET)) < 5
|
||||
|
||||
|
||||
def test_basic_mode_anticipated_delivery_stays_consistent():
|
||||
"""BASIC + delivery anticipated to 1 month: date_to_check follows it,
|
||||
NOT the old ~11-month threshold - this is the exact bug scenario
|
||||
reported by the owner."""
|
||||
stale_threshold = "30d" # would resolve close to the OLD 1-year locktime
|
||||
anticipated_locktime = "30d" # user moved delivery to ~1 month from now
|
||||
result = BalWindow.compute_date_to_check(
|
||||
True, anticipated_locktime, stale_threshold
|
||||
)
|
||||
locktime_ts = _relative_days_to_midnight_timestamp(30)
|
||||
# date_to_check must be (delivery - 2h), always strictly before delivery.
|
||||
assert result < locktime_ts
|
||||
assert abs((locktime_ts - OFFSET) - result) < 5
|
||||
|
||||
|
||||
def test_basic_mode_date_to_check_always_before_locktime():
|
||||
"""Regression guard for the reported bug: whatever the delivery date is
|
||||
(even very close to "now"), date_to_check must stay before it."""
|
||||
for relative_locktime in ("1d", "7d", "30d", "90d", "365d"):
|
||||
result = BalWindow.compute_date_to_check(True, relative_locktime, "30d")
|
||||
parsed_locktime = _relative_days_to_midnight_timestamp(
|
||||
int(relative_locktime[:-1])
|
||||
)
|
||||
assert result < parsed_locktime, (
|
||||
f"date_to_check ({result}) should be before locktime "
|
||||
f"({parsed_locktime}) for locktime={relative_locktime}"
|
||||
)
|
||||
|
||||
|
||||
def test_advanced_mode_uses_stored_threshold_unchanged():
|
||||
"""ADVANCED mode: behaviour must stay exactly as before this fix - the
|
||||
stored threshold is used as-is, regardless of the locktime value."""
|
||||
def test_advanced_mode_uses_stored_threshold():
|
||||
"""ADVANCED mode: behaviour stays exactly as before - the stored threshold
|
||||
is used as-is, regardless of the locktime value."""
|
||||
absolute_threshold = time.time() + 5 * 86400 # arbitrary user-chosen value
|
||||
result = BalWindow.compute_date_to_check(False, "30d", absolute_threshold)
|
||||
result = resolve_date_to_check(False, {"threshold": absolute_threshold})
|
||||
assert abs(result - absolute_threshold) < 1
|
||||
|
||||
|
||||
def test_basic_mode_falls_back_on_unparsable_locktime():
|
||||
"""If the locktime can't be parsed for any reason, BASIC mode must not
|
||||
crash: it falls back to the stored threshold, same as ADVANCED."""
|
||||
absolute_threshold = time.time() + 5 * 86400
|
||||
result = BalWindow.compute_date_to_check(
|
||||
True, {"not": "a valid locktime"}, absolute_threshold
|
||||
)
|
||||
assert abs(result - absolute_threshold) < 1
|
||||
def test_advanced_mode_parses_relative_threshold():
|
||||
"""ADVANCED + relative threshold ("30d") resolves to a future timestamp."""
|
||||
result = resolve_date_to_check(False, {"threshold": "30d"})
|
||||
assert result > time.time()
|
||||
|
||||
|
||||
def test_basic_mode_never_expired():
|
||||
"""BASIC mode can never be "expired": a passed check-alive date must never
|
||||
force a postpone/rewrite of the will."""
|
||||
assert check_alive_expired(True, time.time() - 10_000) is False
|
||||
assert check_alive_expired(True, 1_000_000_000.0) is False
|
||||
|
||||
|
||||
def test_advanced_mode_expired_when_past():
|
||||
assert check_alive_expired(False, time.time() - 10_000) is True
|
||||
|
||||
|
||||
def test_advanced_mode_not_expired_when_future():
|
||||
assert check_alive_expired(False, time.time() + 10_000) is False
|
||||
|
||||
|
||||
def test_basic_mode_never_raises_check_alive_error():
|
||||
"""Regression guard for the reported bug: whatever the delivery date,
|
||||
BASIC mode never raises CheckAliveError (the postpone/invalidate trigger)."""
|
||||
date_to_check = resolve_date_to_check(True, {"threshold": "30d"})
|
||||
assert not check_alive_expired(True, date_to_check)
|
||||
# If it did fire, this is the exact exception that would be raised.
|
||||
assert issubclass(CheckAliveError, Exception)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_offset_is_two_hours()
|
||||
test_basic_mode_relative_locktime_one_year()
|
||||
test_basic_mode_anticipated_delivery_stays_consistent()
|
||||
test_basic_mode_date_to_check_always_before_locktime()
|
||||
test_advanced_mode_uses_stored_threshold_unchanged()
|
||||
test_basic_mode_falls_back_on_unparsable_locktime()
|
||||
print("All test_group_i_basic_checkalive tests passed.")
|
||||
for name in sorted(dir()):
|
||||
if name.startswith("test_"):
|
||||
globals()[name]()
|
||||
print(f" [OK] {name}")
|
||||
print("[OK] All test_group_i_basic_checkalive tests passed.")
|
||||
|
||||
Reference in New Issue
Block a user