From 3078b582cc6c2e8389ef8e6b5807a51ebae7bf67 Mon Sep 17 00:00:00 2001 From: Subo1978 Date: Mon, 10 Feb 2014 15:52:31 +0100 Subject: [PATCH] linearize.py: Harmonize rpcpass to rpcpassword linearize.py: harmonize rpcpass to rpcpassword according settings in bitcoin.conf --- contrib/linearize/example-linearize.cfg | 2 +- contrib/linearize/linearize.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 65bba712a..f5cdab532 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,7 +1,7 @@ # bitcoind RPC settings rpcuser=someuser -rpcpass=somepassword +rpcpassword=somepassword host=127.0.0.1 port=8332 diff --git a/contrib/linearize/linearize.py b/contrib/linearize/linearize.py index ea3814ab7..650f7d368 100644 --- a/contrib/linearize/linearize.py +++ b/contrib/linearize/linearize.py @@ -71,7 +71,7 @@ def getblock(rpc, settings, n): def get_blocks(settings): rpc = BitcoinRPC(settings['host'], settings['port'], - settings['rpcuser'], settings['rpcpass']) + settings['rpcuser'], settings['rpcpassword']) outf = open(settings['output'], 'ab') @@ -118,7 +118,7 @@ if __name__ == '__main__': settings['min_height'] = 0 if 'max_height' not in settings: settings['max_height'] = 279000 - if 'rpcuser' not in settings or 'rpcpass' not in settings: + if 'rpcuser' not in settings or 'rpcpassword' not in settings: print "Missing username and/or password in cfg file" sys.exit(1)