1010import json
1111import logging
1212import os
13+ import re
1314import subprocess
1415import time
1516
2223 p2p_port ,
2324)
2425
26+ # For Python 3.4 compatibility
27+ JSONDecodeError = getattr (json , "JSONDecodeError" , ValueError )
28+
2529BITCOIND_PROC_WAIT_TIMEOUT = 60
2630
2731class TestNode ():
@@ -38,7 +42,7 @@ class TestNode():
3842 To make things easier for the test writer, any unrecognised messages will
3943 be dispatched to the RPC connection."""
4044
41- def __init__ (self , i , dirname , extra_args , rpchost , timewait , binary , stderr , mocktime , coverage_dir ):
45+ def __init__ (self , i , dirname , extra_args , rpchost , timewait , binary , stderr , mocktime , coverage_dir , use_cli = False ):
4246 self .index = i
4347 self .datadir = os .path .join (dirname , "node" + str (i ))
4448 self .rpchost = rpchost
@@ -58,6 +62,7 @@ def __init__(self, i, dirname, extra_args, rpchost, timewait, binary, stderr, mo
5862 self .args = [self .binary , "-datadir=" + self .datadir , "-server" , "-keypool=1" , "-discover=0" , "-rest" , "-logtimemicros" , "-debug" , "-debugexclude=libevent" , "-debugexclude=leveldb" , "-mocktime=" + str (mocktime ), "-uacomment=testnode%d" % i ]
5963
6064 self .cli = TestNodeCLI (os .getenv ("BITCOINCLI" , "bitcoin-cli" ), self .datadir )
65+ self .use_cli = use_cli
6166
6267 self .running = False
6368 self .process = None
@@ -69,9 +74,12 @@ def __init__(self, i, dirname, extra_args, rpchost, timewait, binary, stderr, mo
6974 self .p2ps = []
7075
7176 def __getattr__ (self , name ):
72- """Dispatches any unrecognised messages to the RPC connection."""
73- assert self .rpc_connected and self .rpc is not None , "Error: no RPC connection"
74- return getattr (self .rpc , name )
77+ """Dispatches any unrecognised messages to the RPC connection or a CLI instance."""
78+ if self .use_cli :
79+ return getattr (self .cli , name )
80+ else :
81+ assert self .rpc_connected and self .rpc is not None , "Error: no RPC connection"
82+ return getattr (self .rpc , name )
7583
7684 def start (self , extra_args = None , stderr = None ):
7785 """Start the node."""
@@ -110,10 +118,13 @@ def wait_for_rpc_connection(self):
110118 raise AssertionError ("Unable to connect to bitcoind" )
111119
112120 def get_wallet_rpc (self , wallet_name ):
113- assert self .rpc_connected
114- assert self .rpc
115- wallet_path = "wallet/%s" % wallet_name
116- return self .rpc / wallet_path
121+ if self .use_cli :
122+ return self .cli ("-rpcwallet={}" .format (wallet_name ))
123+ else :
124+ assert self .rpc_connected
125+ assert self .rpc
126+ wallet_path = "wallet/%s" % wallet_name
127+ return self .rpc / wallet_path
117128
118129 def stop_node (self ):
119130 """Stop the node."""
@@ -187,6 +198,16 @@ def disconnect_p2ps(self):
187198 p .peer_disconnect ()
188199 del self .p2ps [:]
189200
201+ class TestNodeCLIAttr :
202+ def __init__ (self , cli , command ):
203+ self .cli = cli
204+ self .command = command
205+
206+ def __call__ (self , * args , ** kwargs ):
207+ return self .cli .send_cli (self .command , * args , ** kwargs )
208+
209+ def get_request (self , * args , ** kwargs ):
210+ return lambda : self (* args , ** kwargs )
190211
191212class TestNodeCLI ():
192213 """Interface to bitcoin-cli for an individual node"""
@@ -196,17 +217,26 @@ def __init__(self, binary, datadir):
196217 self .binary = binary
197218 self .datadir = datadir
198219 self .input = None
220+ self .log = logging .getLogger ('TestFramework.bitcoincli' )
199221
200222 def __call__ (self , * args , input = None ):
201223 # TestNodeCLI is callable with bitcoin-cli command-line args
202- self .args = [str (arg ) for arg in args ]
203- self .input = input
204- return self
224+ cli = TestNodeCLI (self .binary , self .datadir )
225+ cli .args = [str (arg ) for arg in args ]
226+ cli .input = input
227+ return cli
205228
206229 def __getattr__ (self , command ):
207- def dispatcher (* args , ** kwargs ):
208- return self .send_cli (command , * args , ** kwargs )
209- return dispatcher
230+ return TestNodeCLIAttr (self , command )
231+
232+ def batch (self , requests ):
233+ results = []
234+ for request in requests :
235+ try :
236+ results .append (dict (result = request ()))
237+ except JSONRPCException as e :
238+ results .append (dict (error = e ))
239+ return results
210240
211241 def send_cli (self , command , * args , ** kwargs ):
212242 """Run bitcoin-cli command. Deserializes returned string as python object."""
@@ -218,10 +248,18 @@ def send_cli(self, command, *args, **kwargs):
218248 if named_args :
219249 p_args += ["-named" ]
220250 p_args += [command ] + pos_args + named_args
251+ self .log .debug ("Running bitcoin-cli command: %s" % command )
221252 process = subprocess .Popen (p_args , stdin = subprocess .PIPE , stdout = subprocess .PIPE , stderr = subprocess .PIPE , universal_newlines = True )
222253 cli_stdout , cli_stderr = process .communicate (input = self .input )
223254 returncode = process .poll ()
224255 if returncode :
256+ match = re .match (r'error code: ([-0-9]+)\nerror message:\n(.*)' , cli_stderr )
257+ if match :
258+ code , message = match .groups ()
259+ raise JSONRPCException (dict (code = int (code ), message = message ))
225260 # Ignore cli_stdout, raise with cli_stderr
226261 raise subprocess .CalledProcessError (returncode , self .binary , output = cli_stderr )
227- return json .loads (cli_stdout , parse_float = decimal .Decimal )
262+ try :
263+ return json .loads (cli_stdout , parse_float = decimal .Decimal )
264+ except JSONDecodeError :
265+ return cli_stdout .rstrip ("\n " )
0 commit comments