fix bugs

shuffle/bot.py

@@ -28,6 +28,14 @@ def send(self, message):
         print(message)
         if message.startswith("Error"):
             self.pThread.done.set()
+        elif message.startswith("Blame"):
+            if "insufficient" in message:
+                pass
+            elif "wrong hash" in message:
+                pass
+            else:
+                self.pThread.done.set()
+
 
 def job():
     logger = SimpleLogger()
@@ -38,14 +46,12 @@ def job():
                    if not pool.get("fool", False)
                    and pool.get("amount") == amount][0]
         if members >= args.limit:
-            # network.start()
             sleep(5)
             pThread = ProtocolThread(host, port, network, amount, fee, sk, pubk, new_addr, change, logger=logger)
             logger.pThread = pThread
             pThread.start()
             while not is_protocol_done(pThread):
                 sleep(1)
-            # network.stop()
             pThread.join()
             pThread = None
         else:
@@ -67,8 +73,6 @@ def job():
 parser.add_argument("-C", "--change", help="change address", type=str, required=True)
 parser.add_argument("-T", "--period", help="period for checking the server in minutes", type=int, default=10)
 
-
-
 args = parser.parse_args()
 # Get network
 config = SimpleConfig({})
@@ -87,7 +91,6 @@ def job():
 # privkey
 priv_key = args.key
 sk, pubk = keys_from_priv(priv_key)
-print(pubk)
 # new address and change
 new_addr = args.new_address
 change = args.change
@@ -99,4 +102,4 @@ def job():
 
 while True:
     schedule.run_pending()
-    sleep(60)
+    sleep(30)

shuffle/coin_shuffle.py

@@ -35,10 +35,10 @@ def __init__(self, coin, crypto, messages,
                 self.me = {players[player] : player for player in players}[self.vk]
             else:
                 self.logchan('Error: publick key is not in the players list')
-                raise ValueError('My public key is not in players list')
+                # raise ValueError('My public key is not in players list')
         else:
             self.logchan.send('Error: same publick keys appears in the pool!')
-            raise ValueError('Same public keys appears!')
+            # raise ValueError('Same public keys appears!')
         self.encryption_keys = dict()
         self.new_addresses = set()
         self.addr_new = addr_new
@@ -189,10 +189,10 @@ def blame_insufficient_funds(self):
                 self.number_of_players = len(self.players)
             else:
                 self.logchan.send('Error: not enough players with sufficent funds')
-                raise Exception('Error: not enough players with sufficent funds')
+                # raise Exception('Error: not enough players with sufficent funds')
             if self.vk in offenders:
                 self.logchan.send('Error: players funds is not enough')
-                raise Exception('Error: players funds is not enough')
+                # raise Exception('Error: players funds is not enough')
             return False
 
     def broadcast_new_key(self):