git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(from parent 1:
6504ac9
)
fixes to complete mainline_bitcoind merge
author
Emery Hemingway
<emery@fuzzlabs.org>
Thu, 7 Nov 2013 21:02:17 +0000 (16:02 -0500)
committer
Emery Hemingway
<emery@fuzzlabs.org>
Thu, 7 Nov 2013 21:02:17 +0000 (16:02 -0500)
backends/bitcoind/blockchain_processor.py
patch
|
blob
|
history
diff --git
a/backends/bitcoind/blockchain_processor.py
b/backends/bitcoind/blockchain_processor.py
index
cd169af
..
10b81c8
100644
(file)
--- a/
backends/bitcoind/blockchain_processor.py
+++ b/
backends/bitcoind/blockchain_processor.py
@@
-782,7
+782,7
@@
class BlockchainProcessor(Processor):
if addr not in self.watched_addresses:
self.watched_addresses.append(addr)
- def getfullblock(block_hash):
+ def getfullblock(self, block_hash):
block = self.bitcoind('getblock', [block_hash])
rawtxreq = []
@@
-805,9
+805,9
@@
class BlockchainProcessor(Processor):
r = loads(respdata)
rawtxdata = []
for ir in r:
- if r['error'] is not None:
+ if ir['error'] is not None:
raise BaseException(r['error'])
- rawtxdata.append(r['result'])
+ rawtxdata.append(ir['result'])
block['tx'] = rawtxdata
return block