pep8 and utility cleanup

[electrum-server.git] / backends / libbitcoin / history1 / __init__.py

diff --git a/backends/libbitcoin/history1/__init__.py b/backends/libbitcoin/history1/__init__.py
index f257a17..be555b1 100644 (file)
--- a/backends/libbitcoin/history1/__init__.py
+++ b/backends/libbitcoin/history1/__init__.py
@@ -1,12 +1,20 @@
-import _history
-from bitcoin import bind, _1, _2
 import json
 
+from bitcoin import bind, _1, _2
+import _history
+
+
 def wrap_finish(handle_finish, ec, result_json):
-    handle_finish(ec, json.loads(result_json))
+    try:
+        result = json.loads(result_json)
+    except ValueError:
+        print result_json
+        raise
+    else:
+        handle_finish(ec, result)
 
-def payment_history(service, chain, txpool, address, finish):
-    _history.payment_history(service.internal_ptr, chain.internal_ptr,
-                             txpool.internal_ptr, address,
-                             bind(wrap_finish, finish, _1, _2))
 
+def payment_history(service, chain, txpool, membuf, address, finish):
+    _history.payment_history(service.internal_ptr, chain.internal_ptr,
+                             txpool.internal_ptr, membuf.internal_ptr,
+                             str(address), bind(wrap_finish, finish, _1, _2))