mirror of
https://github.com/agessaman/meshcore-bot.git
synced 2026-11-01 18:42:56 +00:00
agessaman
eebd83a2b2
Four if/elif ladders (SNR and RSSI, for DMs and channel messages) checked a list of payload keys, then a list of metadata keys, converting the first present value. _signal_value takes the key lists and converter, so each site keeps its own keys: DMs still accept signal_to_noise and signal_noise_ratio, channel messages do not. A present-but-None key still ends the search, metadata is still read only when no payload key is present, and the cache and RF fallbacks after each call are untouched. A test checks it against the original ladder for every combination of absent, None and valued keys.
49 lines
1.8 KiB
Python
49 lines
1.8 KiB
Python
"""_signal_value must reproduce the if/elif chains it replaced, for every key layout."""
|
|
|
|
import itertools
|
|
|
|
import pytest
|
|
|
|
from modules.message_handler import _signal_value
|
|
|
|
DM_SNR = (("SNR", "snr", "signal_to_noise", "signal_noise_ratio"), ("snr", "SNR"), float)
|
|
CHANNEL_SNR = (("SNR", "snr"), ("snr", "SNR"), float)
|
|
RSSI = (("RSSI", "rssi", "signal_strength"), ("rssi", "RSSI"), int)
|
|
|
|
|
|
def _original_chain(payload, metadata, payload_keys, metadata_keys, convert):
|
|
# The removed code: elif over payload keys, then `elif metadata:` with an
|
|
# inner if/elif over metadata keys; a present None stops the search.
|
|
for key in payload_keys:
|
|
if key in payload:
|
|
raw = payload.get(key)
|
|
return convert(raw) if raw is not None else None
|
|
if metadata:
|
|
for key in metadata_keys:
|
|
if key in metadata:
|
|
raw = metadata.get(key)
|
|
return convert(raw) if raw is not None else None
|
|
return None
|
|
|
|
|
|
def _layouts(keys):
|
|
# Each key absent, present as None, or present with a value.
|
|
for states in itertools.product((None, "none", "val"), repeat=len(keys)):
|
|
d = {}
|
|
for i, (key, state) in enumerate(zip(keys, states, strict=True)):
|
|
if state == "none":
|
|
d[key] = None
|
|
elif state == "val":
|
|
d[key] = f"{-5 - i}"
|
|
yield d
|
|
|
|
|
|
@pytest.mark.parametrize("spec", [DM_SNR, CHANNEL_SNR, RSSI])
|
|
def test_matches_original_chain(spec):
|
|
payload_keys, metadata_keys, convert = spec
|
|
for payload in _layouts(payload_keys):
|
|
for metadata in [None, {}, *_layouts(metadata_keys)]:
|
|
assert _signal_value(payload, metadata, payload_keys, metadata_keys, convert) == _original_chain(
|
|
payload, metadata, payload_keys, metadata_keys, convert
|
|
), (payload, metadata)
|