summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-11 13:38:39 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-05-11 21:55:01 +0200
commit46bbdef24701db8e61326b0645fd426a17111a11 (patch)
tree75ae2ba5103f3d606c4b97fce085b83e8c959a55 /gnu/packages/patches
parent16fbbf6a85eeefda2bec987d279b097f34fdc5f4 (diff)
downloadguix-46bbdef24701db8e61326b0645fd426a17111a11.tar.gz
gnu: bitcoin: Fix test failure with Python 3.8.
* gnu/packages/patches/bitcoin-core-python-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/finance.scm (bitcoin-core)[source](patches): New field.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/bitcoin-core-python-compat.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/bitcoin-core-python-compat.patch b/gnu/packages/patches/bitcoin-core-python-compat.patch
new file mode 100644
index 0000000000..6bf744124d
--- /dev/null
+++ b/gnu/packages/patches/bitcoin-core-python-compat.patch
@@ -0,0 +1,28 @@
+Get rid of deprecation warning emitted by Python 3.8, which causes a test failure(!).
+
+https://github.com/bitcoin/bitcoin/pull/17931
+
+Taken from upstream:
+
+https://github.com/bitcoin/bitcoin/commit/f117fb00da747147cddfb071c1427a2754c278cd
+
+diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
+index 20864881c165..07eacf410d88 100755
+--- a/test/functional/p2p_invalid_messages.py
++++ b/test/functional/p2p_invalid_messages.py
+@@ -145,13 +145,13 @@ def run_test(self):
+     def test_magic_bytes(self):
+         conn = self.nodes[0].add_p2p_connection(P2PDataStore())
+ 
+-        def swap_magic_bytes():
++        async def swap_magic_bytes():
+             conn._on_data = lambda: None  # Need to ignore all incoming messages from now, since they come with "invalid" magic bytes
+             conn.magic_bytes = b'\x00\x11\x22\x32'
+ 
+         # Call .result() to block until the atomic swap is complete, otherwise
+         # we might run into races later on
+-        asyncio.run_coroutine_threadsafe(asyncio.coroutine(swap_magic_bytes)(), NetworkThread.network_event_loop).result()
++        asyncio.run_coroutine_threadsafe(swap_magic_bytes(), NetworkThread.network_event_loop).result()
+ 
+         with self.nodes[0].assert_debug_log(['PROCESSMESSAGE: INVALID MESSAGESTART ping']):
+             conn.send_message(messages.msg_ping(nonce=0xff))