balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shell: tezos-node identity should read the configuration file

Browse Source
This commit is contained in:
Grégoire Henry 2017-02-27 22:25:22 +01:00
parent 0b27503f30
commit de050bfee1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/node/main/node_identity_command.ml
View File

@ -24,7 +24,7 @@ let generate { Node_config_file.data_dir ; net } =
fail (Node_identity_file.Existent_identity_file identity_file) fail (Node_identity_file.Existent_identity_file identity_file)
else else
let target = Crypto_box.make_target net.expected_pow in let target = Crypto_box.make_target net.expected_pow in
Format.eprintf "Generating a new identity... " ; Format.eprintf "Generating a new identity... (level: %.2f) " net.expected_pow ;
let id = let id =
P2p.Identity.generate_with_animation Format.err_formatter target in P2p.Identity.generate_with_animation Format.err_formatter target in
Node_identity_file.write identity_file id >>=? fun () -> Node_identity_file.write identity_file id >>=? fun () ->
@ -52,7 +52,12 @@ module Term = struct
begin begin
match data_dir, config_file with match data_dir, config_file with
| None, None -> | None, None ->
return Node_config_file.default_config let default_config =
Node_config_file.default_data_dir // "config.json" in
if Sys.file_exists default_config then
Node_config_file.read default_config
else
return Node_config_file.default_config
| None, Some config_file -> | None, Some config_file ->
Node_config_file.read config_file Node_config_file.read config_file
| Some data_dir, None -> | Some data_dir, None ->