Browse Source

Output JM version at the start of yield generator

master
Kristaps Kaupe 5 years ago
parent
commit
da1fa05f4c
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 5
      jmbase/jmbase/support.py
  2. 3
      jmclient/jmclient/yieldgenerator.py

5
jmbase/jmbase/support.py

@ -222,8 +222,11 @@ def lookup_appdata_folder(appname):
data_folder = path.expanduser(path.join("~", "." + appname + "/"))
return data_folder
def get_jm_version_str():
return "JoinMarket " + JM_CORE_VERSION
def print_jm_version(option, opt_str, value, parser):
print("JoinMarket " + JM_CORE_VERSION)
print(get_jm_version_str())
sys.exit(EXIT_SUCCESS)
# helper functions for conversions of format between over-the-wire JM

3
jmclient/jmclient/yieldgenerator.py

@ -12,7 +12,7 @@ from jmclient import (Maker, jm_single, load_program_config,
WalletService, add_base_options, SNICKERReceiver,
SNICKERClientProtocolFactory)
from .wallet_utils import open_test_wallet_maybe, get_wallet_path
from jmbase.support import EXIT_ARGERROR, EXIT_FAILURE
from jmbase.support import EXIT_ARGERROR, EXIT_FAILURE, get_jm_version_str
jlog = get_log()
@ -27,6 +27,7 @@ class YieldGenerator(Maker):
def __init__(self, wallet_service):
Maker.__init__(self, wallet_service)
jlog.info(get_jm_version_str())
self.tx_unconfirm_timestamp = {}
self.statement_file = os.path.join(jm_single().datadir,
'logs', 'yigen-statement.csv')

Loading…
Cancel
Save