From e815ee10e108b28ceeab4462a88978d8557a1d7a Mon Sep 17 00:00:00 2001
From: 4tochka <admin@bitaps.com>
Date: Fri, 17 May 2019 13:47:33 +0400
Subject: [PATCH] connector

---
 pybtc/connector/connector.py |  2 +-
 pybtc/connector/utxo.py      | 45 +-----------------------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/pybtc/connector/connector.py b/pybtc/connector/connector.py
index 4da08e1..91a5cfb 100644
--- a/pybtc/connector/connector.py
+++ b/pybtc/connector/connector.py
@@ -387,7 +387,7 @@ class Connector:
                     # self.utxo.checkpoints = n
                     if self.utxo.checkpoints[0] < block["height"]:
                         self.utxo.deleted_last_block = block["height"]
-                        self.utxo.pending_deleted = self.utxo.pending_deleted.union(self.utxo.deleted)
+                        for d in self.utxo.deleted: self.utxo.pending_deleted.add(d)
                         self.utxo.deleted = set()
                         self.loop.create_task(self.utxo.save_utxo())
 
diff --git a/pybtc/connector/utxo.py b/pybtc/connector/utxo.py
index 7dd680c..53db59e 100644
--- a/pybtc/connector/utxo.py
+++ b/pybtc/connector/utxo.py
@@ -90,38 +90,6 @@ class UTXO():
                 self.log.critical("checkpoint not found " +str(lb) +" > "+ str(self.checkpoints))
                 await asyncio.sleep(5)
                 return
-            # self.log.critical("checkpoints " + str(self.checkpoints) + " > " + str(checkpoint))
-            # self.log.critical("found checkpoint " + str(lb) + "  len " + str(len(utxo)) + " cached " + str(len(self.cached)) )
-
-            # self.log.critical(">" + str(len(self.cached)))
-            #
-            #     block_height
-            # for key in iter(self.cached):
-            #     i = self.cached[key]
-            #     if c>0 and (i[0] >> 42) <= block_height:
-            #         c -= 1
-            #         lb = i[0] >> 42
-            #         continue
-            #     break
-            #
-            # if lb:
-            #     d = set()
-            #     for key in range(self.last_saved_block + 1, lb + 1):
-            #         try:
-            #             [d.add(i) for i in self.deleted[key]]
-            #         except:
-            #             pass
-            #
-            #     a = set()
-            #     for key in iter(self.cached):
-            #         i = self.cached[key]
-            #         if (i[0] >> 42) > lb: break
-            #         a.add((key,b"".join((int_to_c_int(i[0]),
-            #                               int_to_c_int(i[1]),
-            #                               i[2]))))
-
-            # insert to db
-            # self.log.critical("start  " + str(len(utxo)))
 
 
             async with self._db_pool.acquire() as conn:
@@ -140,18 +108,7 @@ class UTXO():
             self.deleted_utxo += len(self.pending_deleted)
             self.pending_deleted = set()
 
-            # # remove from cache
-            # for key in a:
-            #     try:
-            #         self.cached.pop(key[0])
-            #     except:
-            #         pass
-            #
-            # for key in range(self.last_saved_block + 1, lb + 1):
-            #     try:
-            #         self.deleted.pop(key)
-            #     except:
-            #         pass
+
             self.last_saved_block = lb
         except:
             import traceback