clean up

joinmarket/support.py

@@ -5,9 +5,6 @@
 import logging
 import pprint
 import random
-import os
-import json
-import re
 
 from decimal import Decimal
 
@@ -250,11 +247,8 @@ def pick_order(orders, n):
 
 
 def choose_orders(db, cj_amount, n, chooseOrdersBy, ignored_makers=None):
-    log.debug("choose orders: cj_amount: "+str(cj_amount)+", n:"+str(n))
     if ignored_makers is None:
         ignored_makers = []
-    else:
-        log.debug("have ignored makers: "+str(len(ignored_makers)))
     sqlorders = db.execute(
         'SELECT * FROM orderbook WHERE minsize <= :cja AND :cja <= maxsize;',
         {'cja': cj_amount}).fetchall()

joinmarket/taker.py

@@ -380,6 +380,7 @@ def push(self):
         log.debug('\n' + tx)
         self.txid = btc.txhash(tx)
         log.info('txid = ' + self.txid)
+
         tx_broadcast = jm_single().config.get('POLICY', 'tx_broadcast')
         if tx_broadcast == 'self':
             pushed = jm_single().bc_interface.pushtx(tx)
@@ -653,7 +654,7 @@ def start_cj(self,
                  my_change_addr,
                  total_txfee,
                  finishcallback=None,
-                 choose_orders_recover=None,
+                 choose_orders_recover=None
                  ):
         self.cjtx = None
         #needed during commitment preparation, self.cjtx.cj_amount