LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 01:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lnpeer: make feature-bit testing easier

Browse source 
so that we can always test like: self.localfeatures & FEATURE_BIT_OPT
This commit is contained in:
SomberNight 2019-08-02 17:58:45 +02:00 • committed by ThomasV
parent 014b921393
commit fdf8d8609b
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
electrum/lnpeer.py
View file

@ -176,9 +176,9 @@ class Peer(Logger):
return return
# if they required some even flag we don't have, they will close themselves # if they required some even flag we don't have, they will close themselves
# but if we require an even flag they don't have, we close # but if we require an even flag they don't have, we close
self.their_localfeatures = int.from_bytes(payload['localfeatures'], byteorder="big") their_localfeatures = int.from_bytes(payload['localfeatures'], byteorder="big")
our_flags = set(list_enabled_bits(self.localfeatures)) our_flags = set(list_enabled_bits(self.localfeatures))
their_flags = set(list_enabled_bits(self.their_localfeatures)) their_flags = set(list_enabled_bits(their_localfeatures))
for flag in our_flags: for flag in our_flags:
if flag not in their_flags and get_ln_flag_pair_of_bit(flag) not in their_flags: if flag not in their_flags and get_ln_flag_pair_of_bit(flag) not in their_flags:
# they don't have this feature we wanted :( # they don't have this feature we wanted :(
@ -186,6 +186,12 @@ class Peer(Logger):
raise GracefulDisconnect("remote does not have even flag {}" raise GracefulDisconnect("remote does not have even flag {}"
.format(str(LnLocalFeatures(1 << flag)))) .format(str(LnLocalFeatures(1 << flag))))
self.localfeatures ^= 1 << flag # disable flag self.localfeatures ^= 1 << flag # disable flag
else:
# They too have this flag.
# For easier feature-bit-testing, if this is an even flag, we also
# set the corresponding odd flag now.
if flag % 2 == 0 and self.localfeatures & (1 << flag):
self.localfeatures |= 1 << get_ln_flag_pair_of_bit(flag)
if isinstance(self.transport, LNTransport): if isinstance(self.transport, LNTransport):
self.channel_db.add_recent_peer(self.transport.peer_addr) self.channel_db.add_recent_peer(self.transport.peer_addr)
self.initialized.set() self.initialized.set()

2
electrum/lnutil.py
View file

@ -563,7 +563,7 @@ class LnLocalFeatures(IntFlag):
LN_LOCAL_FEATURES_KNOWN_SET = set(LnLocalFeatures) LN_LOCAL_FEATURES_KNOWN_SET = set(LnLocalFeatures)
def get_ln_flag_pair_of_bit(flag_bit: int): def get_ln_flag_pair_of_bit(flag_bit: int) -> int:
"""Ln Feature flags are assigned in pairs, one even, one odd. See BOLT-09. """Ln Feature flags are assigned in pairs, one even, one odd. See BOLT-09.
Return the other flag from the pair. Return the other flag from the pair.
e.g. 6 -> 7 e.g. 6 -> 7