From a3a2df3a14ab265c5bd5c2dbbc4ba299d3f8489c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 7 Nov 2013 16:02:17 -0500 Subject: [PATCH] fixes to complete mainline_bitcoind merge --- backends/bitcoind/blockchain_processor.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index cd169af..10b81c8 100644 --- 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 -- 1.7.1