From 9a6d0217781f2decd0e47205db7e50e7144662bb Mon Sep 17 00:00:00 2001 From: philemon Date: Sun, 6 Mar 2016 08:55:50 +0300 Subject: [PATCH] Minor changes, created MANIFEST.in --- MANIFEST.in | 4 ++++ mmgen/main_addrimport.py | 3 +-- mmgen/main_txcreate.py | 2 +- mmgen/main_txsend.py | 2 +- mmgen/main_txsign.py | 2 +- mmgen/opts.py | 4 ++-- mmgen/tool.py | 8 ++++---- mmgen/tx.py | 29 ----------------------------- mmgen/util.py | 32 ++++++++++++++++++++++++++++++++ setup.py | 5 ----- test/__init__.py | 0 11 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 MANIFEST.in delete mode 100644 test/__init__.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..9bf2fb2e --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include test/*.py +include test/ref/* +include MMGenLive/build_system.sh +prune test/ref/__db* diff --git a/mmgen/main_addrimport.py b/mmgen/main_addrimport.py index 97ca28b8..527b063c 100755 --- a/mmgen/main_addrimport.py +++ b/mmgen/main_addrimport.py @@ -23,7 +23,6 @@ mmgen-addrimport: Import addresses into a MMGen bitcoind tracking wallet import time from mmgen.common import * -from mmgen.tx import connect_to_bitcoind from mmgen.addr import AddrInfo,AddrInfoEntry opts_data = { @@ -78,7 +77,7 @@ m = (' from Seed ID %s' % ai.seed_id) if ai.seed_id else '' qmsg('OK. %s addresses%s' % (ai.num_addrs,m)) if not opt.test: - c = connect_to_bitcoind() + c = bitcoin_connection() m = """ WARNING: You've chosen the '--rescan' option. Rescanning the blockchain is diff --git a/mmgen/main_txcreate.py b/mmgen/main_txcreate.py index 92e3f420..35eca510 100755 --- a/mmgen/main_txcreate.py +++ b/mmgen/main_txcreate.py @@ -322,7 +322,7 @@ cmd_args = opts.init(opts_data) if opt.comment_file: comment = get_tx_comment_from_file(opt.comment_file) -c = connect_to_bitcoind() +c = bitcoin_connection() if not opt.info: do_license_msg(immed=True) diff --git a/mmgen/main_txsend.py b/mmgen/main_txsend.py index 495e045b..ff151284 100755 --- a/mmgen/main_txsend.py +++ b/mmgen/main_txsend.py @@ -50,7 +50,7 @@ metadata,tx_hex,inputs_data,b2m_map,comment = parse_tx_file(tx_data,infile) qmsg("Signed transaction file '%s' is valid" % infile) -c = connect_to_bitcoind() +c = bitcoin_connection() prompt_and_view_tx_data(c,'View transaction data?', inputs_data,tx_hex,b2m_map,comment,metadata) diff --git a/mmgen/main_txsign.py b/mmgen/main_txsign.py index 27690b32..a8ea64b9 100755 --- a/mmgen/main_txsign.py +++ b/mmgen/main_txsign.py @@ -291,7 +291,7 @@ infiles = opts.init(opts_data,add_opts=['b16']) if not infiles: opts.usage() for i in infiles: check_infile(i) -c = connect_to_bitcoind() +c = bitcoin_connection() saved_seeds = {} tx_files = [i for i in infiles if get_extension(i) == g.rawtx_ext] diff --git a/mmgen/opts.py b/mmgen/opts.py index 689e3ccd..389a93ae 100755 --- a/mmgen/opts.py +++ b/mmgen/opts.py @@ -48,8 +48,8 @@ def usage(): def print_version_info(): Msg(""" {pgnm_uc} version {g.version} -Part of the {pnm} suite, a Bitcoin cold-storage solution for the com- -mand line. Copyright (C) {g.Cdates} {g.author} {g.email} +Part of the {pnm} suite, a Bitcoin cold-storage solution for the command line. +Copyright (C) {g.Cdates} {g.author} {g.email} """.format(pnm=g.proj_name, g=g, pgnm_uc=g.prog_name.upper()).strip()) def die_on_incompatible_opts(incompat_list): diff --git a/mmgen/tool.py b/mmgen/tool.py index 102b7d73..6ab2c4a3 100755 --- a/mmgen/tool.py +++ b/mmgen/tool.py @@ -378,7 +378,7 @@ def listaddresses(addrs='',minconf=1,showempty=False,pager=False,showbtcaddrs=Fa if not tmp: return False usr_addr_list = ['%s:%s' % (sid,i) for i in tmp] - c = connect_to_bitcoind() + c = bitcoin_connection() addrs = {} # reusing variable name! from decimal import Decimal @@ -444,7 +444,7 @@ def listaddresses(addrs='',minconf=1,showempty=False,pager=False,showbtcaddrs=Fa def getbalance(minconf=1): accts = {} - for d in connect_to_bitcoind().listunspent(0): + for d in bitcoin_connection().listunspent(0): ma = split2(d['account'])[0] keys = ['TOTAL'] if d['spendable']: keys += ['SPENDABLE'] @@ -465,7 +465,7 @@ def getbalance(minconf=1): for a in accts[key]])) def txview(infile,pager=False,terse=False): - c = connect_to_bitcoind() + c = bitcoin_connection() tx_data = get_lines_from_file(infile,'transaction data') metadata,tx_hex,inputs_data,b2m_map,comment = parse_tx_file(tx_data,infile) @@ -476,7 +476,7 @@ def add_label(mmaddr,label,remove=False): die(1,'{a}: not a valid {pnm} address'.format(pnm=pnm,a=mmaddr)) check_addr_label(label) # Exits on failure - c = connect_to_bitcoind() + c = bitcoin_connection() from mmgen.addr import AddrInfoList btcaddr = AddrInfoList(bitcoind_connection=c).mmaddr2btcaddr(mmaddr) diff --git a/mmgen/tx.py b/mmgen/tx.py index 435461b4..5f61a356 100755 --- a/mmgen/tx.py +++ b/mmgen/tx.py @@ -309,32 +309,3 @@ def mmaddr2btcaddr_addrdata(mmaddr,addr_data,source=''): return addr_data[seed_id][idx] return '','' - -def get_bitcoind_cfg_options(cfg_keys): - - cfg_file = os.path.join(get_homedir(), get_datadir(), 'bitcoin.conf') - - cfg = dict([(k,v) for k,v in [split2(line.translate(None,'\t '),'=') - for line in get_lines_from_file(cfg_file)] if k in cfg_keys]) - - for k in set(cfg_keys) - set(cfg.keys()): cfg[k] = '' - return cfg - -def get_bitcoind_auth_cookie(): - - f = os.path.join(get_homedir(), get_datadir(), '.cookie') - - if file_is_readable(f): - return get_lines_from_file(f)[0] - else: - return '' - -def connect_to_bitcoind(): - - host,port,user,passwd = 'localhost',8332,'rpcuser','rpcpassword' - cfg = get_bitcoind_cfg_options((user,passwd)) - auth_cookie = get_bitcoind_auth_cookie() - - import mmgen.rpc - return mmgen.rpc.BitcoinRPCConnection( - host,port,cfg[user],cfg[passwd],auth_cookie=auth_cookie) diff --git a/mmgen/util.py b/mmgen/util.py index 68127bac..c6c33c11 100755 --- a/mmgen/util.py +++ b/mmgen/util.py @@ -759,3 +759,35 @@ def do_license_msg(immed=False): else: msg_r('\r') msg('') + + +def get_bitcoind_cfg_options(cfg_keys): + + cfg_file = os.path.join(get_homedir(), get_datadir(), 'bitcoin.conf') + + cfg = dict([(k,v) for k,v in [split2(line.translate(None,'\t '),'=') + for line in get_lines_from_file(cfg_file)] if k in cfg_keys]) \ + if file_is_readable(cfg_file) else {} + + for k in set(cfg_keys) - set(cfg.keys()): cfg[k] = '' + + return cfg + +def get_bitcoind_auth_cookie(): + + f = os.path.join(get_homedir(), get_datadir(), '.cookie') + + if file_is_readable(f): + return get_lines_from_file(f)[0] + else: + return '' + +def bitcoin_connection(): + + host,port,user,passwd = 'localhost',8332,'rpcuser','rpcpassword' + cfg = get_bitcoind_cfg_options((user,passwd)) + auth_cookie = get_bitcoind_auth_cookie() + + import mmgen.rpc + return mmgen.rpc.BitcoinRPCConnection( + host,port,cfg[user],cfg[passwd],auth_cookie=auth_cookie) diff --git a/setup.py b/setup.py index 514f2e2b..50af1b0a 100755 --- a/setup.py +++ b/setup.py @@ -60,11 +60,6 @@ setup( 'mmgen.share.__init__', 'mmgen.share.Opts', - - 'test.__init__', - 'test.test', - 'test.tooltest', - 'test.gentest', ], scripts=[ 'mmgen-addrgen', diff --git a/test/__init__.py b/test/__init__.py deleted file mode 100644 index e69de29b..00000000