qa: finally get rid of python-bitcoinlib

I'm surprised i didn't have an issue to mark as closed now. Maybe mentioning revault#268 which is made largely easier with this.
darosior · Dec 3, 2021 · 7231b5d · 7231b5d
1 parent 3ff23dc
commit 7231b5d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,4 +1,3 @@
-python-bitcoinlib==0.11.0
 pytest==6.2
 pytest-xdist==1.31.0
 pytest-timeout==1.3.4

diff --git a/tests/test_framework/bitcoind.py b/tests/test_framework/bitcoind.py
@@ -1,11 +1,10 @@
-import bitcoin
 import logging
 import os
 
 from decimal import Decimal
 from ephemeral_port_reserve import reserve
 from test_framework.authproxy import AuthServiceProxy
-from test_framework.utils import TailableProc, wait_for, TIMEOUT, BITCOIND_PATH
+from test_framework.utils import TailableProc, wait_for, TIMEOUT, BITCOIND_PATH, COIN
 
 
 class BitcoinDProxy:
@@ -59,7 +58,7 @@ def __init__(self, bitcoin_dir, rpcport=None):
             "port": self.p2pport,
             "rpcport": rpcport,
             "debug": 1,
-            "fallbackfee": Decimal(1000) / bitcoin.core.COIN,
+            "fallbackfee": Decimal(1000) / COIN,
             "rpcthreads": 32,
         }
         self.conf_file = os.path.join(bitcoin_dir, "bitcoin.conf")

diff --git a/tests/test_framework/revault_network.py b/tests/test_framework/revault_network.py
@@ -1,10 +1,8 @@
 import bip32
-import bitcoin
 import logging
 import os
 import random
 
-from bitcoin.wallet import CBitcoinSecret
 from ephemeral_port_reserve import reserve
 from nacl.public import PrivateKey as Curve25519Private
 from test_framework import serializations
@@ -16,7 +14,6 @@
     get_descriptors,
     get_participants,
     wait_for,
-    RpcError,
     TIMEOUT,
     WT_PLUGINS_DIR,
 )
@@ -104,10 +101,8 @@ def deploy(
             stks_xpubs, cosigs_keys, mans_xpubs, managers_threshold, cpfp_xpubs, csv
         )
         # Generate a dummy 2of2 to be used as our Emergency address
-        bitcoin.SelectParams("regtest")
-        pka = str(CBitcoinSecret.from_secret_bytes(os.urandom(32)))
-        pkb = str(CBitcoinSecret.from_secret_bytes(os.urandom(32)))
-        desc = f"wsh(multi(2,{pka},{pkb}))"
+        desc = "wsh(multi(2,cRE7qAArQYnFQK7S1gXFTArFT4UWvh8J2v2EUajRWXbWFvRzxoeF,\
+                cTzcgRCmHNqUqZuZgvCPLUDXXrQSoVQpZiXQZWQzsLEytcTr6iXi))"
         checksum = self.bitcoind.rpc.getdescriptorinfo(desc)["checksum"]
         desc = f"{desc}#{checksum}"
         self.emergency_address = self.bitcoind.rpc.deriveaddresses(desc)[0]

diff --git a/tests/test_framework/utils.py b/tests/test_framework/utils.py
@@ -62,6 +62,9 @@
 WT_PLUGINS_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "wtplugins")
 
 
+COIN = 10 ** 8
+
+
 def wait_for(success, timeout=TIMEOUT, debug_fn=None):
     """
     Run success() either until it returns True, or until the timeout is reached.

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -2,13 +2,13 @@
 import pytest
 import os
 
-from bitcoin.core import COIN
 from fixtures import *
 from test_framework.utils import (
     TailableProc,
     POSTGRES_IS_SETUP,
     RpcError,
     wait_for,
+    COIN,
 )
 
 

diff --git a/tests/test_watchtowers.py b/tests/test_watchtowers.py
@@ -1,12 +1,12 @@
 import os
 import pytest
 
-from bitcoin.core import COIN
 from fixtures import *
 from test_framework.utils import (
     wait_for,
     POSTGRES_IS_SETUP,
     WT_PLUGINS_DIR,
+    COIN,
 )