From 23a445c244ce9668a6cb1b766339190346ae3360 Mon Sep 17 00:00:00 2001 From: 4tochka Date: Fri, 10 May 2019 01:48:29 +0400 Subject: [PATCH] connector --- pybtc/connector/block_loader.py | 8 ++++---- pybtc/connector/connector.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pybtc/connector/block_loader.py b/pybtc/connector/block_loader.py index 2d27a56..21552e3 100644 --- a/pybtc/connector/block_loader.py +++ b/pybtc/connector/block_loader.py @@ -10,7 +10,7 @@ import sys import aiojsonrpc import traceback from pybtc.connector.utils import decode_block_tx -from pickle import loads, dumps +import pickle from lru import LRU @@ -162,7 +162,7 @@ class BlockLoader: if msg_type == b'result': self.worker_busy[index] = False - blocks = loads(msg) + blocks = pickle.loads(msg) for i in blocks: self.parent.block_preload.set(i, blocks[i]) @@ -256,9 +256,9 @@ class Worker: blocks[x]["rawTx"][y]["vOut"][i]["_s_"] = self.destroyed_coins[pointer] except: pass - # blocks[x] = msgpack.dumps(blocks[x]) + blocks[x] = pickle.dumps(blocks[x]) - self.pipe_sent_msg(b'result', dumps(blocks)) + self.pipe_sent_msg(b'result', pickle.dumps(blocks)) except: self.log.critical(str(traceback.format_exc())) diff --git a/pybtc/connector/connector.py b/pybtc/connector/connector.py index ca8ee40..2beaa0b 100644 --- a/pybtc/connector/connector.py +++ b/pybtc/connector/connector.py @@ -304,7 +304,7 @@ class Connector: raw_block = self.block_preload.pop(self.last_block_height + 1) if raw_block: q = time.time() - block = raw_block + block = loads(raw_block) block["hash"] self.blocks_decode_time += time.time() - q