Client: do not fail when the protocol is unknown...
This commit is contained in:
parent
7ba73a5955
commit
2d828060d5
@ -9,7 +9,7 @@
|
||||
|
||||
(* Tezos Command line interface - Main Program *)
|
||||
|
||||
open Lwt
|
||||
open Lwt.Infix
|
||||
|
||||
let cctxt =
|
||||
let startup =
|
||||
@ -36,36 +36,33 @@ let cctxt =
|
||||
let main () =
|
||||
Random.self_init () ;
|
||||
Sodium.Random.stir () ;
|
||||
catch
|
||||
(fun () ->
|
||||
Lwt.catch begin fun () ->
|
||||
Client_config.preparse_args Sys.argv cctxt >>= fun block ->
|
||||
Lwt.catch
|
||||
(fun () ->
|
||||
Client_node_rpcs.Blocks.protocol cctxt block)
|
||||
(fun exn ->
|
||||
Lwt.catch begin fun () ->
|
||||
Client_node_rpcs.Blocks.protocol cctxt block >>= fun version ->
|
||||
Lwt.return (Some version, Client_commands.commands_for_version version)
|
||||
end begin fun exn ->
|
||||
cctxt.warning
|
||||
"Error trying to acquire the protocol version from the node: %s."
|
||||
"Failed to acquire the protocol version from the node: %s."
|
||||
(match exn with
|
||||
| Failure msg -> msg
|
||||
| exn -> Printexc.to_string exn) >>= fun () ->
|
||||
cctxt.warning
|
||||
"Using the default protocol version." >>= fun () ->
|
||||
Lwt.return Client_alpha.Client_proto_main.protocol)
|
||||
>>= fun version ->
|
||||
Lwt.return (None, [])
|
||||
end >>= fun (version, commands_for_version) ->
|
||||
let commands =
|
||||
Client_generic_rpcs.commands @
|
||||
Client_network.commands () @
|
||||
Client_keys.commands () @
|
||||
Client_protocols.commands () @
|
||||
Client_helpers.commands () @
|
||||
Client_commands.commands_for_version version in
|
||||
Client_config.parse_args ~version
|
||||
commands_for_version in
|
||||
Client_config.parse_args ?version
|
||||
(Cli_entries.usage ~commands)
|
||||
(Cli_entries.inline_dispatch commands)
|
||||
Sys.argv cctxt >>= fun command ->
|
||||
command cctxt >>= fun () ->
|
||||
Lwt.return 0)
|
||||
(function
|
||||
Lwt.return 0
|
||||
end begin function
|
||||
| Arg.Help help ->
|
||||
Format.printf "%s%!" help ;
|
||||
Lwt.return 0
|
||||
@ -90,7 +87,8 @@ let main () =
|
||||
| exn ->
|
||||
Format.printf "Fatal internal error: %s\n%!"
|
||||
(Printexc.to_string exn) ;
|
||||
Lwt.return 1)
|
||||
Lwt.return 1
|
||||
end
|
||||
|
||||
(* Where all the user friendliness starts *)
|
||||
let () = Pervasives.exit (Lwt_main.run (main ()))
|
||||
|
Loading…
Reference in New Issue
Block a user