aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 23:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: Using python-bitcoinlib instead of python-bitcoinrpc

Browse Source 
The latter is unmaintained and has a number of problems.
This commit is contained in:
Christian Decker
2017-01-21 14:10:55 +01:00
parent 180c96776b
commit 1948062250
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/requirements.txt
View File

@@ -1 +1 @@
python-bitcoinrpc==1.0 python-bitcoinlib==0.7.0

15
tests/utils.py
View File

@@ -1,4 +1,4 @@
from bitcoinrpc.authproxy import AuthServiceProxy from bitcoin.rpc import RawProxy as BitcoinProxy
from lightning import LightningRpc from lightning import LightningRpc
import logging import logging
@@ -108,17 +108,6 @@ class TailableProc(object):
pos += 1 pos += 1
class ThreadSafeAuthServiceProxy(AuthServiceProxy):
"""Thread-safe variant of the AuthServiceProxy.
"""
lock = threading.RLock()
def __call__(self, *args):
with ThreadSafeAuthServiceProxy.lock:
AuthServiceProxy.__call__(self, *args)
class BitcoinD(TailableProc): class BitcoinD(TailableProc):
def __init__(self, bitcoin_dir="/tmp/bitcoind-test", rpcport=18332): def __init__(self, bitcoin_dir="/tmp/bitcoind-test", rpcport=18332):
@@ -145,7 +134,7 @@ class BitcoinD(TailableProc):
BITCOIND_CONFIG['rpcport'] = rpcport BITCOIND_CONFIG['rpcport'] = rpcport
write_config(os.path.join(bitcoin_dir, 'bitcoin.conf'), BITCOIND_CONFIG) write_config(os.path.join(bitcoin_dir, 'bitcoin.conf'), BITCOIND_CONFIG)
write_config(os.path.join(regtestdir, 'bitcoin.conf'), BITCOIND_CONFIG) write_config(os.path.join(regtestdir, 'bitcoin.conf'), BITCOIND_CONFIG)
self.rpc = ThreadSafeAuthServiceProxy( self.rpc = BitcoinProxy(
"http://rpcuser:rpcpass@127.0.0.1:{}".format(self.rpcport)) "http://rpcuser:rpcpass@127.0.0.1:{}".format(self.rpcport))
def start(self): def start(self):