1
0

Merge the network and network_proxy

This commit is contained in:
Neil Booth
2015-08-30 21:18:10 +09:00
parent 4d6a0f29ee
commit 2d05e7d891
14 changed files with 158 additions and 319 deletions

View File

@@ -40,9 +40,9 @@ class SPV(ThreadJob):
if tx_hash not in self.merkle_roots and tx_height <= lh:
request = ('blockchain.transaction.get_merkle',
[tx_hash, tx_height])
if self.network.send([request], self.merkle_response):
self.print_error('requested merkle', tx_hash)
self.merkle_roots[tx_hash] = None
self.network.send([request], self.merkle_response)
self.print_error('requested merkle', tx_hash)
self.merkle_roots[tx_hash] = None
def merkle_response(self, r):
if r.get('error'):