GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 1a35447595 into merged_master (Bitcoin PR bitcoin/bitcoin#31417)

Browse source
This commit is contained in:
ivanlele 2026-04-08 13:57:45 +00:00
commit e4484a849f
No known key found for this signature in database
18 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/functional/test_framework/messages.py
View file

@ -329,7 +329,7 @@ class CAddress:
elif self.net == self.NET_CJDNS:
self.ip = socket.inet_ntop(socket.AF_INET6, addr_bytes)
else:
raise Exception(f"Address type not supported")
raise Exception("Address type not supported")
self.port = int.from_bytes(f.read(2), "big")
@ -356,7 +356,7 @@ class CAddress:
elif self.net == self.NET_CJDNS:
r += socket.inet_pton(socket.AF_INET6, self.ip)
else:
raise Exception(f"Address type not supported")
raise Exception("Address type not supported")
r += self.port.to_bytes(2, "big")
return r

2
test/functional/test_framework/socks5.py
View file

@ -195,7 +195,7 @@ class Socks5Connection():
if not self.serv.keep_alive:
self.conn.close()
else:
logger.debug(f"Keeping client connection alive")
logger.debug("Keeping client connection alive")
class Socks5Server():
def __init__(self, conf):