Merge pull request #3649

3078b58 linearize.py: Harmonize rpcpass to rpcpassword (Subo1978)
This commit is contained in:
Wladimir J. van der Laan 2014-02-17 10:52:33 +01:00
commit 256a71b835
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 3 additions and 3 deletions

View file

@ -1,7 +1,7 @@
# bitcoind RPC settings # bitcoind RPC settings
rpcuser=someuser rpcuser=someuser
rpcpass=somepassword rpcpassword=somepassword
host=127.0.0.1 host=127.0.0.1
port=8332 port=8332

View file

@ -71,7 +71,7 @@ def getblock(rpc, settings, n):
def get_blocks(settings): def get_blocks(settings):
rpc = BitcoinRPC(settings['host'], settings['port'], rpc = BitcoinRPC(settings['host'], settings['port'],
settings['rpcuser'], settings['rpcpass']) settings['rpcuser'], settings['rpcpassword'])
outf = open(settings['output'], 'ab') outf = open(settings['output'], 'ab')
@ -118,7 +118,7 @@ if __name__ == '__main__':
settings['min_height'] = 0 settings['min_height'] = 0
if 'max_height' not in settings: if 'max_height' not in settings:
settings['max_height'] = 279000 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" print "Missing username and/or password in cfg file"
sys.exit(1) sys.exit(1)