debugging options should not be parameters, it makes the code unnecessarily complictated
This commit is contained in:
parent
8fd1dbadf6
commit
44dd7713e5
|
@ -65,7 +65,7 @@ def parse_proxy_options(s):
|
||||||
return proxy
|
return proxy
|
||||||
|
|
||||||
class Interface(threading.Thread):
|
class Interface(threading.Thread):
|
||||||
def __init__(self, host, port, debug_server, proxy):
|
def __init__(self, host, port, proxy):
|
||||||
threading.Thread.__init__(self)
|
threading.Thread.__init__(self)
|
||||||
self.daemon = True
|
self.daemon = True
|
||||||
self.host = host
|
self.host = host
|
||||||
|
@ -84,8 +84,6 @@ class Interface(threading.Thread):
|
||||||
self.responses = Queue.Queue()
|
self.responses = Queue.Queue()
|
||||||
self.unanswered_requests = {}
|
self.unanswered_requests = {}
|
||||||
|
|
||||||
self.debug_server = debug_server
|
|
||||||
|
|
||||||
def init_socket(self):
|
def init_socket(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -95,8 +93,8 @@ class Interface(threading.Thread):
|
||||||
|
|
||||||
def queue_json_response(self, c):
|
def queue_json_response(self, c):
|
||||||
|
|
||||||
if self.debug_server:
|
# uncomment to debug
|
||||||
print "<--",c
|
# print "<--",c
|
||||||
|
|
||||||
msg_id = c.get('id')
|
msg_id = c.get('id')
|
||||||
error = c.get('error')
|
error = c.get('error')
|
||||||
|
@ -138,10 +136,9 @@ class Interface(threading.Thread):
|
||||||
class PollingInterface(Interface):
|
class PollingInterface(Interface):
|
||||||
""" non-persistent connection. synchronous calls"""
|
""" non-persistent connection. synchronous calls"""
|
||||||
|
|
||||||
def __init__(self, host, port, debug_server, proxy):
|
def __init__(self, host, port, proxy):
|
||||||
Interface.__init__(self, host, port, debug_server, proxy)
|
Interface.__init__(self, host, port, proxy)
|
||||||
self.session_id = None
|
self.session_id = None
|
||||||
self.debug_server = debug_server
|
|
||||||
|
|
||||||
def get_history(self, address):
|
def get_history(self, address):
|
||||||
self.send([('blockchain.address.get_history', [address] )])
|
self.send([('blockchain.address.get_history', [address] )])
|
||||||
|
@ -253,9 +250,8 @@ class HttpStratumInterface(PollingInterface):
|
||||||
class TcpStratumInterface(Interface):
|
class TcpStratumInterface(Interface):
|
||||||
"""json-rpc over persistent TCP connection, asynchronous"""
|
"""json-rpc over persistent TCP connection, asynchronous"""
|
||||||
|
|
||||||
def __init__(self, host, port, debug_server, proxy):
|
def __init__(self, host, port, proxy):
|
||||||
Interface.__init__(self, host, port, debug_server, proxy)
|
Interface.__init__(self, host, port, proxy)
|
||||||
self.debug_server = debug_server
|
|
||||||
|
|
||||||
def init_socket(self):
|
def init_socket(self):
|
||||||
global proxy_modes
|
global proxy_modes
|
||||||
|
@ -314,8 +310,8 @@ class TcpStratumInterface(Interface):
|
||||||
request = json.dumps( { 'id':self.message_id, 'method':method, 'params':params } )
|
request = json.dumps( { 'id':self.message_id, 'method':method, 'params':params } )
|
||||||
self.unanswered_requests[self.message_id] = method, params
|
self.unanswered_requests[self.message_id] = method, params
|
||||||
|
|
||||||
if self.debug_server:
|
# uncomment to debug
|
||||||
print "-->",request
|
# print "-->",request
|
||||||
|
|
||||||
self.message_id += 1
|
self.message_id += 1
|
||||||
out += request + '\n'
|
out += request + '\n'
|
||||||
|
@ -360,7 +356,7 @@ class WalletSynchronizer(threading.Thread):
|
||||||
print_error("Error: Unknown protocol")
|
print_error("Error: Unknown protocol")
|
||||||
InterfaceClass = TcpStratumInterface
|
InterfaceClass = TcpStratumInterface
|
||||||
|
|
||||||
self.interface = InterfaceClass(host, port, self.wallet.debug_server, self.proxy)
|
self.interface = InterfaceClass(host, port, self.proxy)
|
||||||
self.wallet.interface = self.interface
|
self.wallet.interface = self.interface
|
||||||
|
|
||||||
def handle_response(self, r):
|
def handle_response(self, r):
|
||||||
|
|
Loading…
Reference in New Issue