This PR adds the a datadir option to the linearize configuration file to allow linearize-hashes to look for and use the RPC cookie file in the datadir. It will still allow rpcuser and rpcpassword to be specified and those options will take precendence if both rpcuser/pass and datadir config options are set.
closes #10103
Nice. utACK 476c6d4c8dcf41f9e3accf5be1b84fdd4718046b
Makes sense, utACK
utACK 476c6d4
92 | @@ -93,6 +93,14 @@ def get_block_hashes(settings, max_blocks_per_call=10000): 93 | 94 | height += num_blocks 95 | 96 | +def get_rpc_cookie(settings): 97 | + # Open the cookie file 98 | + with open(settings['datadir'] + '/.cookie', 'r') as f:
open(os.path.join(os.path.expanduser(settings['datadir']), '/.cookie'), 'r')
done
my bad
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index 721d204..db8eb70 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -16,6 +16,8 @@ import json
import re
import base64
import sys
+import os
+import os.path
settings = {}
@@ -93,9 +95,9 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
height += num_blocks
-def get_rpc_cookie(settings):
+def get_rpc_cookie():
# Open the cookie file
- with open(os.path.join(os.path.expanduser(settings['datadir']), '/.cookie'), 'r') as f:
+ with open(os.path.join(os.path.expanduser(settings['datadir']), '.cookie'), 'r') as f:
combined = f.readline()
combined_split = combined.split(":")
settings['rpcuser'] = combined_split[0]
@@ -150,6 +152,6 @@ if __name__ == '__main__':
# Get the rpc user and pass from the cookie if the datadir is set
if use_datadir:
- get_rpc_cookie(settings)
+ get_rpc_cookie()
get_block_hashes(settings)
Adds a datadir configuration option to the linearize scripts to allow the script to use the RPC cookie instead of requiring the user to set a rpcuser and rpcpassword for the rpc server.