tremove blockchain object from verifier - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b4bed1ccaa3aca4d29d9d54b042c17912a01ef46
DIR parent 6e30894af6da909374cafc16223b99407c3850e5
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 10 Mar 2014 20:53:05 +0100
remove blockchain object from verifier
Diffstat:
M lib/network.py | 7 +++++++
M lib/verifier.py | 5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -402,6 +402,13 @@ class Network(threading.Thread):
return self.interface.synchronous_get(requests)
+ def get_header(self, tx_height):
+ return self.blockchain.read_header(tx_height)
+
+ def get_local_height(self):
+ return self.blockchain.local_height
+
+
#def retrieve_transaction(self, tx_hash, tx_height=0):
# import transaction
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -32,7 +32,6 @@ class TxVerifier(threading.Thread):
self.daemon = True
self.storage = storage
self.network = network
- self.blockchain = network.blockchain
self.transactions = {} # requested verifications (with height sent by the requestor)
self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions
self.merkle_roots = storage.get('merkle_roots',{}) # hashed by me
t@@ -46,7 +45,7 @@ class TxVerifier(threading.Thread):
with self.lock:
if tx in self.verified_tx:
height, timestamp, pos = self.verified_tx[tx]
- conf = (self.blockchain.local_height - height + 1)
+ conf = (self.network.get_local_height() - height + 1)
if conf <= 0: timestamp = None
elif tx in self.transactions:
t@@ -134,7 +133,7 @@ class TxVerifier(threading.Thread):
tx_height = result.get('block_height')
pos = result.get('pos')
self.merkle_roots[tx_hash] = self.hash_merkle_root(result['merkle'], tx_hash, pos)
- header = self.blockchain.read_header(tx_height)
+ header = self.network.get_header(tx_height)
if not header: return
assert header.get('merkle_root') == self.merkle_roots[tx_hash]
# we passed all the tests