diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-17 10:52:33 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-17 10:52:41 +0100 |
| commit | 256a71b835eb0f0d9332c015dfb46dd695dfc971 (patch) | |
| tree | 8e983c4b76d6a8063d508f0422919b4eb37eeebc | |
| parent | 7af65ac01e46acb9bfe88cd2b4bae3264b0de8ab (diff) | |
| parent | 3078b582cc6c2e8389ef8e6b5807a51ebae7bf67 (diff) | |
Merge pull request #3649
3078b58 linearize.py: Harmonize rpcpass to rpcpassword (Subo1978)
| -rw-r--r-- | contrib/linearize/example-linearize.cfg | 2 | ||||
| -rw-r--r-- | 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 65bba712a5..f5cdab5325 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 ea3814ab72..650f7d3684 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) |