Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Commit

Permalink
reinstantiate log startup messages for bots, and remove duplicate log…
Browse files Browse the repository at this point in the history
… for ob-watcher
  • Loading branch information
AdamISZ committed Sep 13, 2016
1 parent 4352d1f commit 97d2603
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion joinmarket/yieldgenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ def ygmain(ygclass, txfee=1000, cjfee_a=200, cjfee_r=0.002, ordertype='reloffer'
wallet = Wallet(seed, max_mix_depth=mix_levels)
jm_single().bc_interface.sync_wallet(wallet)

log.debug('starting yield generator')
mcs = [IRCMessageChannel(c, realname='btcint=' + jm_single().config.get(
"BLOCKCHAIN", "blockchain_source"),
password=nickserv_password) for c in get_irc_mchannels()]
mcc = MessageChannelCollection(mcs)
log.debug('starting yield generator')
maker = ygclass(mcc, wallet, [options.txfee, cjfee_a, cjfee_r,
options.ordertype, options.minsize, mix_levels])
try:
Expand Down
3 changes: 1 addition & 2 deletions ob-watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@ def on_welcome(self):


def main():
jm_single().nickname = random_nick() # watcher' +binascii.hexlify(os.urandom(4))
load_program_config()

parser = OptionParser(
Expand All @@ -369,7 +368,7 @@ def main():
hostport = (options.host, options.port)
mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
mcc = MessageChannelCollection(mcs)

log.debug("Starting ob-watcher")
# todo: is the call to GUITaker needed, or the return. taker unused
taker = GUITaker(mcc, hostport)
print('starting irc')
Expand Down
1 change: 1 addition & 0 deletions sendpayment.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ def main():

mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
mcc = MessageChannelCollection(mcs)
log.debug("starting sendpayment")
taker = SendPayment(mcc, wallet, destaddr, amount, options.makercount,
options.txfee, options.waittime, options.mixdepth,
options.answeryes, chooseOrdersFunc)
Expand Down
2 changes: 1 addition & 1 deletion tumbler.py
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,9 @@ def main():
max_mix_depth=options['mixdepthsrc'] + options['mixdepthcount'])
jm_single().bc_interface.sync_wallet(wallet)
jm_single().wait_for_commitments = 1
log.debug('starting tumbler')
mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
mcc = MessageChannelCollection(mcs)
log.debug('starting tumbler')
tumbler = Tumbler(mcc, wallet, tx_list, options)
try:
log.debug('connecting to message channels')
Expand Down

0 comments on commit 97d2603

Please sign in to comment.