From 88d66c9b7eb88cf223fd75244390a71edc1e35ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Wed, 21 Sep 2022 17:23:33 +0200 Subject: [PATCH] Build: remove clic from base, depend on it directly Clic is useful for - binaries - the few modules of the few libraries that define parameters for the binaries --- manifest/main.ml | 21 ++++++++++++++-- opam/tezos-accuser-012-Psithaca.opam | 1 + opam/tezos-accuser-013-PtJakart.opam | 1 + opam/tezos-accuser-014-PtKathma.opam | 1 + opam/tezos-accuser-alpha.opam | 1 + opam/tezos-baker-012-Psithaca.opam | 1 + opam/tezos-baker-013-PtJakart.opam | 1 + opam/tezos-baker-014-PtKathma.opam | 1 + opam/tezos-baker-alpha.opam | 1 + opam/tezos-baking-012-Psithaca.opam | 1 + opam/tezos-baking-013-PtJakart.opam | 1 + opam/tezos-baking-014-PtKathma.opam | 1 + opam/tezos-baking-alpha.opam | 1 + opam/tezos-base.opam | 1 - opam/tezos-client-000-Ps9mPmXa.opam | 1 + opam/tezos-client-001-PtCJ7pwo.opam | 1 + opam/tezos-client-002-PsYLVpVv.opam | 1 + opam/tezos-client-003-PsddFKi3.opam | 1 + opam/tezos-client-004-Pt24m4xi.opam | 1 + opam/tezos-client-005-PsBabyM1.opam | 1 + opam/tezos-client-006-PsCARTHA.opam | 1 + opam/tezos-client-007-PsDELPH1.opam | 1 + opam/tezos-client-008-PtEdo2Zk.opam | 1 + opam/tezos-client-009-PsFLoren.opam | 1 + opam/tezos-client-010-PtGRANAD.opam | 1 + opam/tezos-client-011-PtHangz2.opam | 1 + opam/tezos-client-012-Psithaca.opam | 1 + opam/tezos-client-013-PtJakart.opam | 1 + opam/tezos-client-014-PtKathma.opam | 1 + opam/tezos-client-alpha.opam | 1 + opam/tezos-client-base-unix.opam | 1 + opam/tezos-client-base.opam | 1 + opam/tezos-client.opam | 1 + opam/tezos-dal-node.opam | 1 + opam/tezos-mockup-commands.opam | 1 + opam/tezos-sc-rollup-client-013-PtJakart.opam | 1 + opam/tezos-sc-rollup-client-014-PtKathma.opam | 1 + opam/tezos-sc-rollup-client-alpha.opam | 1 + opam/tezos-sc-rollup-node-013-PtJakart.opam | 1 + opam/tezos-sc-rollup-node-014-PtKathma.opam | 1 + opam/tezos-sc-rollup-node-alpha.opam | 1 + opam/tezos-signer-backends.opam | 1 + opam/tezos-signer.opam | 1 + opam/tezos-tx-rollup-client-013-PtJakart.opam | 1 + opam/tezos-tx-rollup-client-014-PtKathma.opam | 1 + opam/tezos-tx-rollup-client-alpha.opam | 1 + opam/tezos-tx-rollup-node-013-PtJakart.opam | 1 + opam/tezos-tx-rollup-node-014-PtKathma.opam | 1 + opam/tezos-tx-rollup-node-alpha.opam | 1 + src/bin_client/dune | 2 ++ src/bin_dal_node/dune | 2 ++ src/bin_signer/dune | 1 + src/bin_signer/main_signer.ml | 21 ++++++++-------- src/bin_snoop/dune | 1 + src/lib_base/dune | 2 -- src/lib_base/tzPervasives.ml | 1 - src/lib_base/tzPervasives.mli | 2 -- src/lib_benchmark/registration.ml | 2 +- src/lib_client_base/client_aliases.ml | 22 ++++++++--------- src/lib_client_base/client_aliases.mli | 2 ++ src/lib_client_base/client_keys.ml | 2 ++ src/lib_client_base/client_keys.mli | 2 ++ src/lib_client_base/dune | 1 + src/lib_client_base_unix/client_config.ml | 6 ++--- src/lib_client_base_unix/client_main_run.ml | 1 + src/lib_client_base_unix/client_main_run.mli | 2 ++ src/lib_client_base_unix/dune | 1 + src/lib_client_commands/dune | 2 ++ src/lib_mockup/dune | 1 + src/lib_mockup/mockup_commands.mli | 3 ++- src/lib_proxy/proxy_commands.ml | 2 ++ src/lib_proxy/proxy_commands.mli | 3 ++- src/lib_signer_backends/unix/dune | 1 + .../unix/ledger.available.ml | 24 +++++++++---------- src/lib_signer_backends/unix/ledger.mli | 2 ++ src/proto_000_Ps9mPmXa/lib_client/dune | 2 ++ src/proto_001_PtCJ7pwo/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_002_PsYLVpVv/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_003_PsddFKi3/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_004_Pt24m4xi/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_005_PsBabyM1/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_006_PsCARTHA/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_007_PsDELPH1/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_008_PtEdo2Zk/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_009_PsFLoren/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_010_PtGRANAD/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ src/proto_011_PtHangz2/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ .../lib_client_sapling/dune | 2 ++ src/proto_012_Psithaca/bin_accuser/dune | 2 ++ src/proto_012_Psithaca/bin_baker/dune | 2 ++ .../michelson_commands.ml | 1 + .../lib_benchmarks_proto/sapling_commands.ml | 2 ++ src/proto_012_Psithaca/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ .../lib_client_sapling/dune | 2 ++ .../lib_delegate/baking_commands.ml | 1 + .../lib_delegate/baking_commands.mli | 2 ++ .../baking_commands_registration.ml | 2 +- src/proto_012_Psithaca/lib_delegate/dune | 2 ++ src/proto_013_PtJakart/bin_accuser/dune | 2 ++ src/proto_013_PtJakart/bin_baker/dune | 2 ++ .../bin_sc_rollup_client/dune | 2 ++ .../bin_sc_rollup_node/dune | 2 ++ .../bin_tx_rollup_client/dune | 2 ++ .../bin_tx_rollup_node/dune | 2 ++ .../michelson_commands.ml | 1 + .../lib_benchmarks_proto/sapling_commands.ml | 2 ++ src/proto_013_PtJakart/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ .../lib_client_sapling/dune | 2 ++ .../lib_delegate/baking_commands.ml | 1 + .../lib_delegate/baking_commands.mli | 2 ++ .../baking_commands_registration.ml | 2 +- src/proto_013_PtJakart/lib_delegate/dune | 2 ++ src/proto_014_PtKathma/bin_accuser/dune | 2 ++ src/proto_014_PtKathma/bin_baker/dune | 2 ++ .../bin_sc_rollup_client/dune | 2 ++ .../bin_sc_rollup_node/dune | 2 ++ .../bin_tx_rollup_client/dune | 2 ++ .../bin_tx_rollup_node/dune | 2 ++ .../michelson_commands.ml | 1 + .../lib_benchmarks_proto/sapling_commands.ml | 2 ++ src/proto_014_PtKathma/lib_client/dune | 2 ++ .../lib_client_commands/dune | 4 ++++ .../lib_client_sapling/dune | 2 ++ .../lib_delegate/baking_commands.ml | 1 + .../lib_delegate/baking_commands.mli | 2 ++ .../baking_commands_registration.ml | 2 +- src/proto_014_PtKathma/lib_delegate/dune | 2 ++ src/proto_alpha/bin_accuser/dune | 2 ++ src/proto_alpha/bin_baker/dune | 2 ++ src/proto_alpha/bin_sc_rollup_client/dune | 2 ++ src/proto_alpha/bin_sc_rollup_node/dune | 2 ++ src/proto_alpha/bin_tx_rollup_client/dune | 2 ++ src/proto_alpha/bin_tx_rollup_node/dune | 2 ++ .../michelson_commands.ml | 1 + .../lib_benchmarks_proto/sapling_commands.ml | 1 + src/proto_alpha/lib_client/dune | 2 ++ src/proto_alpha/lib_client_commands/dune | 4 ++++ src/proto_alpha/lib_client_sapling/dune | 2 ++ .../lib_delegate/baking_commands.ml | 1 + .../lib_delegate/baking_commands.mli | 2 ++ .../baking_commands_registration.ml | 2 +- src/proto_alpha/lib_delegate/dune | 2 ++ .../lib_client/client_proto_args.ml | 2 ++ .../lib_client/client_proto_args.mli | 2 ++ .../lib_client/client_proto_main.ml | 6 ++--- .../lib_client/client_proto_main.ml | 1 + 159 files changed, 318 insertions(+), 54 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index c13800cd703d..6e9af4004f5d 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -1018,7 +1018,6 @@ let octez_base = data_encoding |> open_; octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; octez_rpc |> open_; - octez_clic |> open_; octez_micheline |> open_; octez_event_logging |> open_; ptime; @@ -2491,6 +2490,7 @@ let octez_client_base = ~deps: [ octez_base |> open_ ~m:"TzPervasives"; + octez_clic; octez_rpc |> open_; octez_shell_services |> open_; octez_sapling; @@ -2587,6 +2587,7 @@ let octez_signer_backends_unix = fmt; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_stdlib_unix |> open_; octez_stdlib |> open_; octez_client_base |> open_; @@ -2628,6 +2629,7 @@ let octez_client_commands = [ octez_base |> open_ ~m:"TzPervasives"; octez_rpc |> open_; + octez_clic |> open_; octez_clic_unix |> open_; octez_client_base |> open_; octez_shell_services |> open_; @@ -2711,6 +2713,7 @@ let octez_mockup_commands = ~deps: [ octez_base |> open_ ~m:"TzPervasives"; + octez_clic; octez_client_commands; octez_client_base; octez_mockup |> open_; @@ -2823,6 +2826,7 @@ let octez_client_base_unix = [ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_rpc_http |> open_; octez_rpc_http_client_unix |> open_; octez_shell_services |> open_; @@ -4120,6 +4124,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_shell_services |> open_; octez_client_base |> open_; main |> open_; @@ -4229,6 +4234,7 @@ module Protocol = Protocol |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; octez_base |> if_ N.(number >= 15) |> open_ ~m:"TzPervasives"; + octez_clic |> open_; main |> open_; parameters |> if_some |> if_ N.(number >= 013) |> open_; octez_stdlib_unix |> open_; @@ -4260,6 +4266,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_crypto; octez_stdlib_unix |> open_; octez_client_base |> open_; @@ -4284,6 +4291,7 @@ module Protocol = Protocol |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; octez_base |> if_ N.(number >= 15) |> open_ ~m:"TzPervasives"; + octez_clic |> open_; main |> open_; parameters |> if_some |> if_ N.(number >= 013) |> open_; octez_protocol_environment; @@ -4313,6 +4321,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_version; main |> open_; plugin |> if_some |> open_; @@ -4494,6 +4503,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; main |> open_; client |> if_some |> open_; octez_client_commands |> open_; @@ -4575,6 +4585,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_client_base; client |> if_some |> open_; octez_client_commands |> open_; @@ -4599,6 +4610,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_client_commands |> open_; octez_stdlib_unix |> open_; octez_client_base |> open_; @@ -4675,6 +4687,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; main |> open_ |> open_ ~m:"Protocol"; client |> if_some |> open_; client_commands |> if_some |> open_; @@ -4697,6 +4710,7 @@ module Protocol = Protocol octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals" |> open_; + octez_clic |> open_; main |> open_; client |> if_some |> open_; octez_client_base |> open_; @@ -5361,6 +5375,7 @@ let _octez_client = ([ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic |> open_; octez_rpc_http_client |> open_; octez_stdlib_unix |> open_; octez_shell_services |> open_; @@ -5467,7 +5482,7 @@ let _octez_snoop = octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_stdlib_unix |> open_; - octez_clic; + octez_clic |> open_; octez_benchmark |> open_; octez_benchmark_examples; octez_shell_benchmarks; @@ -5525,6 +5540,7 @@ let _octez_signer = [ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_client_base |> open_; octez_client_base_unix |> open_; octez_client_commands |> open_; @@ -5619,6 +5635,7 @@ let _octez_dal_node = ([ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic |> open_; octez_client_base |> open_; octez_client_base_unix |> open_; octez_client_commands |> open_; diff --git a/opam/tezos-accuser-012-Psithaca.opam b/opam/tezos-accuser-012-Psithaca.opam index cc1b488debb0..bf53d2f57fd8 100644 --- a/opam/tezos-accuser-012-Psithaca.opam +++ b/opam/tezos-accuser-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" "tezos-client-commands" diff --git a/opam/tezos-accuser-013-PtJakart.opam b/opam/tezos-accuser-013-PtJakart.opam index f0e541714fc3..f0de0e369513 100644 --- a/opam/tezos-accuser-013-PtJakart.opam +++ b/opam/tezos-accuser-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-accuser-014-PtKathma.opam b/opam/tezos-accuser-014-PtKathma.opam index 7b4a4501c1c5..bbaafccee194 100644 --- a/opam/tezos-accuser-014-PtKathma.opam +++ b/opam/tezos-accuser-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-accuser-alpha.opam b/opam/tezos-accuser-alpha.opam index b42cbd44814d..06a64fa0510e 100644 --- a/opam/tezos-accuser-alpha.opam +++ b/opam/tezos-accuser-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-baker-012-Psithaca.opam b/opam/tezos-baker-012-Psithaca.opam index 7bff25343f2d..cd371e6dbd9a 100644 --- a/opam/tezos-baker-012-Psithaca.opam +++ b/opam/tezos-baker-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" "tezos-client-commands" diff --git a/opam/tezos-baker-013-PtJakart.opam b/opam/tezos-baker-013-PtJakart.opam index 76a9e9beea8c..bf5e598ea375 100644 --- a/opam/tezos-baker-013-PtJakart.opam +++ b/opam/tezos-baker-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-baker-014-PtKathma.opam b/opam/tezos-baker-014-PtKathma.opam index 5e1a22ce174c..e58771027d09 100644 --- a/opam/tezos-baker-014-PtKathma.opam +++ b/opam/tezos-baker-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-baker-alpha.opam b/opam/tezos-baker-alpha.opam index 445ea5e2f2b2..4075a4e0a078 100644 --- a/opam/tezos-baker-alpha.opam +++ b/opam/tezos-baker-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-baking-012-Psithaca.opam b/opam/tezos-baking-012-Psithaca.opam index a6d519c4d4be..403bd0af508f 100644 --- a/opam/tezos-baking-012-Psithaca.opam +++ b/opam/tezos-baking-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" diff --git a/opam/tezos-baking-013-PtJakart.opam b/opam/tezos-baking-013-PtJakart.opam index 1327404a02b5..ff107cf195ea 100644 --- a/opam/tezos-baking-013-PtJakart.opam +++ b/opam/tezos-baking-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" diff --git a/opam/tezos-baking-014-PtKathma.opam b/opam/tezos-baking-014-PtKathma.opam index e99b86a2d51e..6ab6522a8927 100644 --- a/opam/tezos-baking-014-PtKathma.opam +++ b/opam/tezos-baking-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 4d464338071f..bf9db9226833 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index 12345389ab42..790a4f629598 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -14,7 +14,6 @@ depends: [ "data-encoding" { >= "0.6" & < "0.7" } "tezos-error-monad" "tezos-rpc" - "tezos-clic" "tezos-micheline" "tezos-event-logging" "ptime" { >= "1.0.0" } diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 177fe2ed48ab..21083327c7f9 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-000-Ps9mPmXa" diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index 990dcddecf4c..800490404664 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-001-PtCJ7pwo" diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index 4946c312eba4..4129a3fed450 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-002-PsYLVpVv" diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 5313da024aa5..c24060409360 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-003-PsddFKi3" diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 357defdb512b..cae11a70e1ca 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-004-Pt24m4xi" diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 5940d6faf372..983381dd9d68 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-005-PsBabyM1" diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index 21715e3fa5be..2b6580bfba2b 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-006-PsCARTHA" diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index e8a0c73e77ab..b7b0d405820c 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-007-PsDELPH1" diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index a0735ce4af86..4308eba4d215 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-008-PtEdo2Zk" diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 26a331bb9ddb..dbee6f77f953 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-009-PsFLoren" diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index fd2a3fe29e1b..c2ca5692e2bc 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-010-PtGRANAD" diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index be541410186a..308e7f9f9661 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-011-PtHangz2" diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 4d56f0dc548c..8c2d041ecb59 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-012-Psithaca" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index db5bab006933..191d69bf8b77 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-013-PtJakart" diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 63dcf08d73b5..2215a17e0392 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-014-PtKathma" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 59781a3a852a..c35306b64569 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-alpha" diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 8e85bb4f19db..746f3b5dcedd 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc-http" "tezos-rpc-http-client-unix" "tezos-shell-services" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index c9c68a4f9c51..00cc2df19915 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc" "tezos-shell-services" "tezos-sapling" diff --git a/opam/tezos-client.opam b/opam/tezos-client.opam index 2e4da877871d..6ba0a3d67183 100644 --- a/opam/tezos-client.opam +++ b/opam/tezos-client.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc-http-client" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/opam/tezos-dal-node.opam b/opam/tezos-dal-node.opam index b63f927979d0..50398edfe45d 100644 --- a/opam/tezos-dal-node.opam +++ b/opam/tezos-dal-node.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index 30eb326226b9..83026c24c394 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-client-base" "tezos-mockup" diff --git a/opam/tezos-sc-rollup-client-013-PtJakart.opam b/opam/tezos-sc-rollup-client-013-PtJakart.opam index e9b8017a4649..85aad518a008 100644 --- a/opam/tezos-sc-rollup-client-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-client-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-client-014-PtKathma.opam b/opam/tezos-sc-rollup-client-014-PtKathma.opam index a494404840e5..e13af8743b4b 100644 --- a/opam/tezos-sc-rollup-client-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-client-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-client-alpha.opam b/opam/tezos-sc-rollup-client-alpha.opam index da8a90ddf86b..40ae0fdff254 100644 --- a/opam/tezos-sc-rollup-client-alpha.opam +++ b/opam/tezos-sc-rollup-client-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index 4ffc02327e19..5a857c620499 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-sc-rollup-node-014-PtKathma.opam b/opam/tezos-sc-rollup-node-014-PtKathma.opam index c8a33144eb0a..afe29f495efb 100644 --- a/opam/tezos-sc-rollup-node-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-node-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 8e620ad04d78..fc64c63c42b1 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 2d706ec99b73..d8c757a1f28d 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -22,6 +22,7 @@ depends: [ "alcotest-lwt" { with-test & >= "1.5.0" } "ocplib-endian" "fmt" { >= "0.8.7" } + "tezos-clic" "tezos-stdlib-unix" "tezos-rpc-http-client-unix" ] diff --git a/opam/tezos-signer.opam b/opam/tezos-signer.opam index 71e97a48df5d..5a9cfc1348c6 100644 --- a/opam/tezos-signer.opam +++ b/opam/tezos-signer.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/tezos-tx-rollup-client-013-PtJakart.opam b/opam/tezos-tx-rollup-client-013-PtJakart.opam index 2447b650a9b8..82d2d43e8f61 100644 --- a/opam/tezos-tx-rollup-client-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-client-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-client-014-PtKathma.opam b/opam/tezos-tx-rollup-client-014-PtKathma.opam index b0e2af796d23..52f57c382665 100644 --- a/opam/tezos-tx-rollup-client-014-PtKathma.opam +++ b/opam/tezos-tx-rollup-client-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-client-alpha.opam b/opam/tezos-tx-rollup-client-alpha.opam index 8d24f7327312..05297480cfab 100644 --- a/opam/tezos-tx-rollup-client-alpha.opam +++ b/opam/tezos-tx-rollup-client-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-node-013-PtJakart.opam b/opam/tezos-tx-rollup-node-013-PtJakart.opam index 1c913348e6f6..a1ff80268392 100644 --- a/opam/tezos-tx-rollup-node-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-node-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-base" diff --git a/opam/tezos-tx-rollup-node-014-PtKathma.opam b/opam/tezos-tx-rollup-node-014-PtKathma.opam index 8b2d15fa0d22..4ed197847f65 100644 --- a/opam/tezos-tx-rollup-node-014-PtKathma.opam +++ b/opam/tezos-tx-rollup-node-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-base" diff --git a/opam/tezos-tx-rollup-node-alpha.opam b/opam/tezos-tx-rollup-node-alpha.opam index 4fdae6e3d18f..0f7f393bb9cb 100644 --- a/opam/tezos-tx-rollup-node-alpha.opam +++ b/opam/tezos-tx-rollup-node-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-base" diff --git a/src/bin_client/dune b/src/bin_client/dune index 75bc6c2678ad..de6a2a48187d 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-rpc-http-client tezos-stdlib-unix tezos-shell-services @@ -100,6 +101,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_rpc_http_client -open Tezos_stdlib_unix -open Tezos_shell_services diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 013a58da9c92..7054c46c80cc 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands @@ -34,6 +35,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_client_base -open Tezos_client_base_unix -open Tezos_client_commands diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 8cd676d2cc73..e71a9371acaf 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_signer/main_signer.ml b/src/bin_signer/main_signer.ml index 2d4312228ae7..15a706bfaf9a 100644 --- a/src/bin_signer/main_signer.ml +++ b/src/bin_signer/main_signer.ml @@ -54,7 +54,7 @@ let default_http_port = | None -> "6732" | Some port -> port -open Clic +open Tezos_clic let group = {Clic.name = "signer"; title = "Commands specific to the signing daemon"} @@ -89,12 +89,12 @@ let high_watermark_switch = () let pidfile_arg = - arg + Clic.arg ~doc:"write process id in file" ~short:'P' ~long:"pidfile" ~placeholder:"filename" - (parameter (fun _ s -> Lwt.return_ok s)) + (Clic.parameter (fun _ s -> Lwt.return_ok s)) let may_setup_pidfile pidfile_opt f = match pidfile_opt with @@ -106,7 +106,8 @@ let may_setup_pidfile pidfile_opt f = ~filename:pidfile f -let commands base_dir require_auth : Client_context.full command list = +let commands base_dir require_auth : Client_context.full Clic.command list = + let open Clic in let open Lwt_result_syntax in Tezos_signer_backends_unix.Ledger.commands () @ Client_keys_commands.commands None @@ -306,11 +307,11 @@ let home = try Sys.getenv "HOME" with Not_found -> "/root" let default_base_dir = Filename.concat home ".tezos-signer" -let string_parameter () : (string, _) parameter = - parameter (fun _ x -> Lwt.return_ok x) +let string_parameter () : (string, _) Clic.parameter = + Clic.parameter (fun _ x -> Lwt.return_ok x) let base_dir_arg () = - arg + Clic.arg ~long:"base-dir" ~short:'d' ~placeholder:"path" @@ -321,14 +322,14 @@ let base_dir_arg () = (string_parameter ()) let require_auth_arg () = - switch + Clic.switch ~long:"require-authentication" ~short:'A' ~doc:"Require a signature from the caller to sign." () let password_filename_arg () = - arg + Clic.arg ~long:"password-filename" ~short:'f' ~placeholder:"filename" @@ -336,7 +337,7 @@ let password_filename_arg () = (string_parameter ()) let global_options () = - args3 (base_dir_arg ()) (require_auth_arg ()) (password_filename_arg ()) + Clic.args3 (base_dir_arg ()) (require_auth_arg ()) (password_filename_arg ()) module Signer_config = struct type t = string option * bool * string option diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 7ec90371ef46..e0b91cb8dd52 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -26,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_stdlib_unix + -open Tezos_clic -open Tezos_benchmark)) (cram (deps main_snoop.exe) (package tezos-snoop)) diff --git a/src/lib_base/dune b/src/lib_base/dune index 857d6adae866..a3e7da1b08fa 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -13,7 +13,6 @@ data-encoding tezos-error-monad tezos-rpc - tezos-clic tezos-micheline tezos-event-logging ptime @@ -31,7 +30,6 @@ -open Tezos_error_monad -open Tezos_error_monad.TzLwtreslib -open Tezos_rpc - -open Tezos_clic -open Tezos_micheline -open Tezos_event_logging)) diff --git a/src/lib_base/tzPervasives.ml b/src/lib_base/tzPervasives.ml index ed424938e1b9..e668091d7cd4 100644 --- a/src/lib_base/tzPervasives.ml +++ b/src/lib_base/tzPervasives.ml @@ -26,7 +26,6 @@ include Tezos_stdlib module Error_monad = Tezos_error_monad.Error_monad include Tezos_rpc -include Tezos_clic include Tezos_crypto include Tezos_micheline module Data_encoding = Data_encoding diff --git a/src/lib_base/tzPervasives.mli b/src/lib_base/tzPervasives.mli index 9e42afc69a2b..352b6a72a361 100644 --- a/src/lib_base/tzPervasives.mli +++ b/src/lib_base/tzPervasives.mli @@ -31,8 +31,6 @@ module Error_monad = Tezos_error_monad.Error_monad include module type of Tezos_rpc -include module type of Tezos_clic - include module type of Tezos_crypto module Data_encoding = Data_encoding diff --git a/src/lib_benchmark/registration.ml b/src/lib_benchmark/registration.ml index 0d4f1bb26f76..77605c381527 100644 --- a/src/lib_benchmark/registration.ml +++ b/src/lib_benchmark/registration.ml @@ -27,7 +27,7 @@ module String_table = String.Hashtbl let bench_table : Benchmark.t String_table.t = String_table.create 51 -let clic_table : unit Clic.command list ref = ref [] +let clic_table : unit Tezos_clic.Clic.command list ref = ref [] let codegen_table : Model.for_codegen String_table.t = String_table.create 51 diff --git a/src/lib_client_base/client_aliases.ml b/src/lib_client_base/client_aliases.ml index efcbe644febf..f0d3ace985dd 100644 --- a/src/lib_client_base/client_aliases.ml +++ b/src/lib_client_base/client_aliases.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (* Tezos Command line interface - Local Storage for Configuration *) let rec try_alternatives input = function @@ -39,8 +41,6 @@ let parse_alternatives alts input = | _ -> assert false (* cannot happen due to String.split's implementation. *) -open Clic - module type Entity = sig type t @@ -113,7 +113,7 @@ module type Alias = sig ('a, (< .. > as 'obj)) Clic.params -> (fresh_param -> 'a, 'obj) Clic.params - val force_switch : unit -> (bool, _) arg + val force_switch : unit -> (bool, _) Clic.arg val of_fresh : #Client_context.wallet -> bool -> fresh_param -> string tzresult Lwt.t @@ -335,17 +335,17 @@ module Alias (Entity : Entity) = struct let alias_parameter () = let open Lwt_result_syntax in - parameter ~autocomplete (fun cctxt s -> + Clic.parameter ~autocomplete (fun cctxt s -> let* v = find cctxt s in return (s, v)) let alias_param ?(name = "name") ?(desc = "existing " ^ Entity.name ^ " alias") next = - param ~name ~desc (alias_parameter ()) next + Clic.param ~name ~desc (alias_parameter ()) next let aliases_parameter () = let open Lwt_result_syntax in - parameter ~autocomplete (fun cctxt s -> + Clic.parameter ~autocomplete (fun cctxt s -> String.split_no_empty ',' s |> List.map_es (fun s -> let* pkh = find cctxt s in @@ -353,7 +353,7 @@ module Alias (Entity : Entity) = struct let aliases_param ?(name = "name") ?(desc = "existing " ^ Entity.name ^ " aliases") next = - param ~name ~desc (aliases_parameter ()) next + Clic.param ~name ~desc (aliases_parameter ()) next type fresh_param = Fresh of string @@ -381,10 +381,10 @@ module Alias (Entity : Entity) = struct let fresh_alias_param ?(name = "new") ?(desc = "new " ^ Entity.name ^ " alias") next = - param + Clic.param ~name ~desc - (parameter (fun (_ : < .. >) s -> Lwt.return_ok (Fresh s))) + (Clic.parameter (fun (_ : < .. >) s -> Lwt.return_ok (Fresh s))) next let parse_source_string cctxt s = @@ -416,7 +416,7 @@ module Alias (Entity : Entity) = struct Entity.name Entity.name in - param ~name ~desc (parameter parse_source_string) next + Clic.param ~name ~desc (Clic.parameter parse_source_string) next let source_arg ?(long = "source " ^ Entity.name) ?(placeholder = "src") ?(doc = "") () = @@ -435,7 +435,7 @@ module Alias (Entity : Entity) = struct Entity.name Entity.name in - arg ~long ~placeholder ~doc (parameter parse_source_string) + Clic.arg ~long ~placeholder ~doc (Clic.parameter parse_source_string) let force_switch () = Clic.switch diff --git a/src/lib_client_base/client_aliases.mli b/src/lib_client_base/client_aliases.mli index 5d49c070a410..2d04fe69e2fc 100644 --- a/src/lib_client_base/client_aliases.mli +++ b/src/lib_client_base/client_aliases.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (** Allows to parse an argument taking one of many forms. Accepts a list of alternative parsers and an input string. Each alternative consists of a string being the name of the format and a function diff --git a/src/lib_client_base/client_keys.ml b/src/lib_client_base/client_keys.ml index d770eb261bee..265da26e9e95 100644 --- a/src/lib_client_base/client_keys.ml +++ b/src/lib_client_base/client_keys.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + type error += Unregistered_key_scheme of string type error += Wrong_key_scheme of (string * string) diff --git a/src/lib_client_base/client_keys.mli b/src/lib_client_base/client_keys.mli index 8ced7730cd64..9a6d8bc9a7a5 100644 --- a/src/lib_client_base/client_keys.mli +++ b/src/lib_client_base/client_keys.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (** {2 Cryptographic keys tables } *) type pk_uri = private Uri.t diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 61720a0fe2c8..c920e690e5ff 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -9,6 +9,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-rpc tezos-shell-services tezos-sapling diff --git a/src/lib_client_base_unix/client_config.ml b/src/lib_client_base_unix/client_config.ml index 9d5418230b69..626141dd15ab 100644 --- a/src/lib_client_base_unix/client_config.ml +++ b/src/lib_client_base_unix/client_config.ml @@ -324,7 +324,7 @@ let default_cli_args = client_mode = `Mode_client; } -open Clic +open Tezos_clic.Clic let string_parameter () : (string, #Client_context.full) parameter = parameter (fun _ x -> Lwt.return_ok x) @@ -769,10 +769,10 @@ let config_init_mockup cctxt protocol_hash_opt bootstrap_accounts_file let commands config_file cfg (client_mode : client_mode) (protocol_hash_opt : Protocol_hash.t option) (base_dir : string) = - let open Clic in + let open Tezos_clic.Clic in let group = { - Clic.name = "config"; + name = "config"; title = "Commands for editing and viewing the client's config file"; } in diff --git a/src/lib_client_base_unix/client_main_run.ml b/src/lib_client_base_unix/client_main_run.ml index a4be8f354b2f..3f2aba82bc09 100644 --- a/src/lib_client_base_unix/client_main_run.ml +++ b/src/lib_client_base_unix/client_main_run.ml @@ -27,6 +27,7 @@ (* Tezos Command line interface - Main Program *) open Client_context_unix +open Tezos_clic let builtin_commands = let open Lwt_syntax in diff --git a/src/lib_client_base_unix/client_main_run.mli b/src/lib_client_base_unix/client_main_run.mli index 183dd2853a52..5c5b08511b30 100644 --- a/src/lib_client_base_unix/client_main_run.mli +++ b/src/lib_client_base_unix/client_main_run.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module type M = (* This module type lists the parameters you can give to the function [run] defined below; most calls use and will use the default value for this module type, which is module diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 032172d1d0e1..f3c98ecc0179 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -8,6 +8,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-rpc-http tezos-rpc-http-client-unix tezos-shell-services diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 0e0e7e690ea9..72ade90d98f3 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -8,6 +8,7 @@ (libraries tezos-base tezos-rpc + tezos-clic tezos-clic.unix tezos-client-base tezos-shell-services @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_rpc + -open Tezos_clic -open Tezos_clic_unix -open Tezos_client_base -open Tezos_shell_services diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 02610de07af4..e796914cbacb 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -52,6 +52,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-client-base tezos-mockup diff --git a/src/lib_mockup/mockup_commands.mli b/src/lib_mockup/mockup_commands.mli index 6ae86c8c9e1f..9a0e53bb6c6d 100644 --- a/src/lib_mockup/mockup_commands.mli +++ b/src/lib_mockup/mockup_commands.mli @@ -25,4 +25,5 @@ val group : Tezos_clic.Clic.group -val commands : unit -> Tezos_client_base.Client_context.full Clic.command list +val commands : + unit -> Tezos_client_base.Client_context.full Tezos_clic.Clic.command list diff --git a/src/lib_proxy/proxy_commands.ml b/src/lib_proxy/proxy_commands.ml index 7086ce7bb526..4dd8b1f74380 100644 --- a/src/lib_proxy/proxy_commands.ml +++ b/src/lib_proxy/proxy_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + let group : Clic.group = { Clic.name = "proxy"; diff --git a/src/lib_proxy/proxy_commands.mli b/src/lib_proxy/proxy_commands.mli index a80e77c780ae..e893dfd749a3 100644 --- a/src/lib_proxy/proxy_commands.mli +++ b/src/lib_proxy/proxy_commands.mli @@ -27,4 +27,5 @@ val group : Tezos_clic.Clic.group (** All provided commands *) -val commands : unit -> Tezos_client_base.Client_context.full Clic.command list +val commands : + unit -> Tezos_client_base.Client_context.full Tezos_clic.Clic.command list diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 834cb6a550aa..93e33b9bfac5 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -10,6 +10,7 @@ fmt tezos-base tezos-base.unix + tezos-clic tezos-stdlib-unix tezos-stdlib tezos-client-base diff --git a/src/lib_signer_backends/unix/ledger.available.ml b/src/lib_signer_backends/unix/ledger.available.ml index 2bf526f9229b..f04401d82803 100644 --- a/src/lib_signer_backends/unix/ledger.available.ml +++ b/src/lib_signer_backends/unix/ledger.available.ml @@ -486,7 +486,7 @@ module Ledger_uri = struct "An imported ledger alias or a ledger URI (e.g. \ \"ledger://animal/curve/path\")." in - let open Clic in + let open Tezos_clic.Clic in param ~name ~desc @@ -816,7 +816,7 @@ let pp_ledger_chain_id fmt s = (** Commands for both ledger applications. *) let generic_commands group = let open Lwt_result_syntax in - Clic. + Tezos_clic.Clic. [ command ~group @@ -882,7 +882,7 @@ let generic_commands group = return_none) in return_unit); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Display version/public-key/address information for a Ledger URI" (args1 (switch ~doc:"Test signing operation" ~long:"test-sign" ())) @@ -1010,9 +1010,9 @@ let generic_commands group = which get a specific treatment in {!high_water_mark_commands}. *) let baking_commands group = let open Lwt_result_syntax in - Clic. + Tezos_clic.Clic. [ - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Query the path of the authorized key" no_options @@ -1071,7 +1071,7 @@ let baking_commands group = curve Bip32_path.pp_path (Bip32_path.tezos_root @ path)))); - Clic.command + Tezos_clic.Clic.command ~group ~desc: "Authorize a Ledger to bake for a key (deprecated, use `setup ledger \ @@ -1130,7 +1130,7 @@ let baking_commands group = pk in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Setup a Ledger to bake for a key" (let hwm_arg kind = @@ -1265,7 +1265,7 @@ let baking_commands group = pk in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Deauthorize Ledger from baking" no_options @@ -1295,9 +1295,9 @@ let high_water_mark_commands group watermark_spelling = desc ^ " (legacy/deprecated spelling)" else desc in - Clic. + Tezos_clic.Clic. [ - Clic.command + Tezos_clic.Clic.command ~group ~desc:(make_desc "Get high water mark of a Ledger") (args1 @@ -1361,7 +1361,7 @@ let high_water_mark_commands group watermark_spelling = tr in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:(make_desc "Set high water mark of a Ledger") no_options @@ -1406,7 +1406,7 @@ let high_water_mark_commands group watermark_spelling = let commands = let group = { - Clic.name = "ledger"; + Tezos_clic.Clic.name = "ledger"; title = "Commands for managing the connected Ledger Nano devices"; } in diff --git a/src/lib_signer_backends/unix/ledger.mli b/src/lib_signer_backends/unix/ledger.mli index d3d06973a711..bacd4a12b42c 100644 --- a/src/lib_signer_backends/unix/ledger.mli +++ b/src/lib_signer_backends/unix/ledger.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Signer_implementation : Client_keys.SIGNER val commands : unit -> Client_context.full Clic.command list diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index d2dbc3b45d16..25eb0dab9597 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-000-Ps9mPmXa) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-000-Ps9mPmXa @@ -16,6 +17,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_000_Ps9mPmXa diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index 7270da86ab42..885c38d95356 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-001-PtCJ7pwo) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-001-PtCJ7pwo @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_001_PtCJ7pwo diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index ab400514c832..c8199f7c684f 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-001-PtCJ7pwo.commands) (libraries tezos-base + tezos-clic tezos-protocol-001-PtCJ7pwo tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_001_PtCJ7pwo -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-001-PtCJ7pwo.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-001-PtCJ7pwo tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_001_PtCJ7pwo -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index 935bd38f99fe..d8a152368b28 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-002-PsYLVpVv) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-002-PsYLVpVv @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_002_PsYLVpVv diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index f685df1f4a90..4547d4580045 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-002-PsYLVpVv.commands) (libraries tezos-base + tezos-clic tezos-protocol-002-PsYLVpVv tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_002_PsYLVpVv -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-002-PsYLVpVv.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-002-PsYLVpVv tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_002_PsYLVpVv -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index cd47d933ecc1..f3f989ce6c0e 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-003-PsddFKi3) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-003-PsddFKi3 @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_003_PsddFKi3 diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index f7483368b9f4..45d06d83d356 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-003-PsddFKi3.commands) (libraries tezos-base + tezos-clic tezos-protocol-003-PsddFKi3 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_003_PsddFKi3 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-003-PsddFKi3.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-003-PsddFKi3 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_003_PsddFKi3 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 1d015d77b21e..ecdd2a8f9e3f 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-004-Pt24m4xi) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-004-Pt24m4xi @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_004_Pt24m4xi diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 44affb9a13de..5c063a8939a9 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-004-Pt24m4xi.commands) (libraries tezos-base + tezos-clic tezos-protocol-004-Pt24m4xi tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_004_Pt24m4xi -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-004-Pt24m4xi.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-004-Pt24m4xi tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_004_Pt24m4xi -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 98fed923f200..cd95546d8860 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-005-PsBabyM1) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-005-PsBabyM1 @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_005_PsBabyM1 diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index b02ddcae1905..8cf1e00fdac1 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-005-PsBabyM1.commands) (libraries tezos-base + tezos-clic tezos-protocol-005-PsBabyM1 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_005_PsBabyM1 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-005-PsBabyM1.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-005-PsBabyM1 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_005_PsBabyM1 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index 321f281f35a7..a11ae6986318 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-006-PsCARTHA) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-006-PsCARTHA @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_006_PsCARTHA diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index eae98a9a821e..15fe615c999d 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-006-PsCARTHA.commands) (libraries tezos-base + tezos-clic tezos-protocol-006-PsCARTHA tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_006_PsCARTHA -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-006-PsCARTHA.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-006-PsCARTHA tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_006_PsCARTHA -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 4768293027e7..e758e4c47844 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-007-PsDELPH1) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-007-PsDELPH1 @@ -18,6 +19,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_007_PsDELPH1 diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 4f877d212c87..af30a7197d84 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-007-PsDELPH1.commands) (libraries tezos-base + tezos-clic tezos-protocol-007-PsDELPH1 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_007_PsDELPH1 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-007-PsDELPH1.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-007-PsDELPH1 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_007_PsDELPH1 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index e80b82f6373c..8be098714a01 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-008-PtEdo2Zk @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_008_PtEdo2Zk diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 2df48867a7b6..b06d605a6c80 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-008-PtEdo2Zk tezos-stdlib-unix tezos-protocol-environment @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_008_PtEdo2Zk -open Tezos_stdlib_unix -open Tezos_shell_services @@ -37,6 +39,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-008-PtEdo2Zk tezos-protocol-environment tezos-shell-services @@ -51,6 +54,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_008_PtEdo2Zk -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 64bb92a3fdf9..9a5404dc842c 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-009-PsFLoren @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_009_PsFLoren diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 2bf1e497003c..26b2197627fb 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-009-PsFLoren tezos-stdlib-unix tezos-protocol-environment @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_009_PsFLoren -open Tezos_stdlib_unix -open Tezos_shell_services @@ -39,6 +41,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-009-PsFLoren tezos-protocol-environment tezos-shell-services @@ -53,6 +56,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_009_PsFLoren -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 04f661a046aa..abc3ca6196f4 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-010-PtGRANAD @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_010_PtGRANAD diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index 454d11459df4..a8bdbdf4446b 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-010-PtGRANAD tezos-stdlib-unix tezos-protocol-environment @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_010_PtGRANAD -open Tezos_stdlib_unix -open Tezos_shell_services @@ -39,6 +41,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-010-PtGRANAD tezos-protocol-environment tezos-shell-services @@ -53,6 +56,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_010_PtGRANAD -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 0d3fb4005d3f..5d27530ae457 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-011-PtHangz2 @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_011_PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index ee9fb55e1228..aa4e2c4793b5 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-011-PtHangz2 tezos-stdlib-unix tezos-protocol-environment @@ -26,6 +27,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_011_PtHangz2 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -43,6 +45,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-011-PtHangz2 tezos-protocol-environment tezos-shell-services @@ -58,6 +61,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_011_PtHangz2 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index 23950c5cd2f7..9db56da4162c 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_011_PtHangz2 diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune index 4a7c9ba5761c..bf0ab3e1ec25 100644 --- a/src/proto_012_Psithaca/bin_accuser/dune +++ b/src/proto_012_Psithaca/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-client-012-Psithaca tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_client_012_Psithaca -open Tezos_client_commands diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune index 94b726ad423c..e2cb2efda2f8 100644 --- a/src/proto_012_Psithaca/bin_baker/dune +++ b/src/proto_012_Psithaca/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-client-012-Psithaca tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_client_012_Psithaca -open Tezos_client_commands diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec..887c4bc6b572 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml index 77b42a0b848b..9576a60cd65f 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 899102c6e176..e43b38c7d014 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-012-Psithaca @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_012_Psithaca diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index ef053c71e629..46b7561905c8 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-stdlib-unix tezos-protocol-environment @@ -26,6 +27,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_stdlib_unix -open Tezos_shell_services @@ -43,6 +45,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services @@ -58,6 +61,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index dd8ecbadf7ca..8db6210776fa 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_012_Psithaca diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml index 13b41c6971c2..1f133c90056d 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands.mli b/src/proto_012_Psithaca/lib_delegate/baking_commands.mli index 8c9f9ea45d06..4bf2dac9ce86 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands.mli +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml index 1050a6901021..245debeae240 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_012_Psithaca/lib_delegate/dune b/src/proto_012_Psithaca/lib_delegate/dune index 74dac18116c9..b8233a5b435e 100644 --- a/src/proto_012_Psithaca/lib_delegate/dune +++ b/src/proto_012_Psithaca/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-012-Psithaca tezos-protocol-plugin-012-Psithaca @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_protocol_plugin_012_Psithaca -open Tezos_shell_services diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune index 04210c11d41d..49d3f60e6d10 100644 --- a/src/proto_013_PtJakart/bin_accuser/dune +++ b/src/proto_013_PtJakart/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_commands diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune index ccc4f03888a0..265178210610 100644 --- a/src/proto_013_PtJakart/bin_baker/dune +++ b/src/proto_013_PtJakart/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_commands diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune index d1f27c48852c..c98739339e45 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-013-PtJakart tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_013_PtJakart -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index 124a12381728..264e0e03acd0 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -40,6 +41,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune index 2040f0219fc2..b53a77b68260 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-013-PtJakart.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune index aa082bffab66..9a414de6efdb 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_base diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec..887c4bc6b572 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml index 77b42a0b848b..9576a60cd65f 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 7954f2c5e5c3..2dea9fefd953 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-013-PtJakart @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_013_PtJakart diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 01b1390f2891..865454358673 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-stdlib-unix @@ -27,6 +28,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart_parameters -open Tezos_stdlib_unix @@ -45,6 +47,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-protocol-environment @@ -61,6 +64,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart_parameters -open Tezos_shell_services diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index affedc828da4..0c9efc078295 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_013_PtJakart diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands.ml b/src/proto_013_PtJakart/lib_delegate/baking_commands.ml index 89de07ff7c79..54f91377c3da 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands.ml +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands.mli b/src/proto_013_PtJakart/lib_delegate/baking_commands.mli index 8c9f9ea45d06..4bf2dac9ce86 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands.mli +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml b/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml index 1050a6901021..245debeae240 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_013_PtJakart/lib_delegate/dune b/src/proto_013_PtJakart/lib_delegate/dune index ae3ca057f540..af83700414a1 100644 --- a/src/proto_013_PtJakart/lib_delegate/dune +++ b/src/proto_013_PtJakart/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_plugin_013_PtJakart -open Tezos_shell_services diff --git a/src/proto_014_PtKathma/bin_accuser/dune b/src/proto_014_PtKathma/bin_accuser/dune index d3cf0aa0e6ee..57ad0bdbd706 100644 --- a/src/proto_014_PtKathma/bin_accuser/dune +++ b/src/proto_014_PtKathma/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_commands diff --git a/src/proto_014_PtKathma/bin_baker/dune b/src/proto_014_PtKathma/bin_baker/dune index 6730d0f32720..d8647ebaaa6b 100644 --- a/src/proto_014_PtKathma/bin_baker/dune +++ b/src/proto_014_PtKathma/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_commands diff --git a/src/proto_014_PtKathma/bin_sc_rollup_client/dune b/src/proto_014_PtKathma/bin_sc_rollup_client/dune index 758ef1c135e6..40dd3f306c7d 100644 --- a/src/proto_014_PtKathma/bin_sc_rollup_client/dune +++ b/src/proto_014_PtKathma/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-014-PtKathma tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_014_PtKathma -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_014_PtKathma/bin_sc_rollup_node/dune b/src/proto_014_PtKathma/bin_sc_rollup_node/dune index d2e3f873d7ef..74d892fffa88 100644 --- a/src/proto_014_PtKathma/bin_sc_rollup_node/dune +++ b/src/proto_014_PtKathma/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -40,6 +41,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_014_PtKathma/bin_tx_rollup_client/dune b/src/proto_014_PtKathma/bin_tx_rollup_client/dune index 71a85e0c90e0..42deae7a7bff 100644 --- a/src/proto_014_PtKathma/bin_tx_rollup_client/dune +++ b/src/proto_014_PtKathma/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-014-PtKathma.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma.Protocol -open Tezos_client_014_PtKathma diff --git a/src/proto_014_PtKathma/bin_tx_rollup_node/dune b/src/proto_014_PtKathma/bin_tx_rollup_node/dune index b0cb2cd5dcba..5050b6323515 100644 --- a/src/proto_014_PtKathma/bin_tx_rollup_node/dune +++ b/src/proto_014_PtKathma/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_base diff --git a/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml b/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec..887c4bc6b572 100644 --- a/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml b/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml index aab11070300c..dea4b695ca3a 100644 --- a/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index 90e7e6ed1790..81d8c22157fa 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-014-PtKathma @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_014_PtKathma diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index c2ecfac05311..08a4ac03d8c7 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters tezos-stdlib-unix @@ -27,6 +28,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma_parameters -open Tezos_stdlib_unix @@ -45,6 +47,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters tezos-protocol-environment @@ -61,6 +64,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma_parameters -open Tezos_shell_services diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index 3d08a22bea5d..601eebb5d9ce 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_014_PtKathma diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands.ml b/src/proto_014_PtKathma/lib_delegate/baking_commands.ml index 2b9258d233bb..f479dd0d2e2b 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands.ml +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands.mli b/src/proto_014_PtKathma/lib_delegate/baking_commands.mli index 8c9f9ea45d06..4bf2dac9ce86 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands.mli +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml b/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml index 1050a6901021..245debeae240 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_014_PtKathma/lib_delegate/dune b/src/proto_014_PtKathma/lib_delegate/dune index fc71e78fd09b..249e0ef870a6 100644 --- a/src/proto_014_PtKathma/lib_delegate/dune +++ b/src/proto_014_PtKathma/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-014-PtKathma tezos-protocol-plugin-014-PtKathma @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_plugin_014_PtKathma -open Tezos_shell_services diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 224537d64175..ec075c937079 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_commands diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 5d1b3748f549..1cf77c3d0d8a 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_commands diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index f657b4f98d73..9784c7f9233d 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-alpha tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_alpha -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 72aa7d93598d..3932b54eee4c 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -41,6 +42,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune index a6993f75fc9e..bf5537c63fa9 100644 --- a/src/proto_alpha/bin_tx_rollup_client/dune +++ b/src/proto_alpha/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-alpha.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune index f9c1cd6b5e2f..3fc9c43d215e 100644 --- a/src/proto_alpha/bin_tx_rollup_node/dune +++ b/src/proto_alpha/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_base diff --git a/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml b/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec..887c4bc6b572 100644 --- a/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml b/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml index aab11070300c..1f990533fffd 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml @@ -22,6 +22,7 @@ (* DEALINGS IN THE SOFTWARE. *) (* *) (*****************************************************************************) +open Tezos_clic module Sapling_gen_cmd = struct let lift_opt f opt_arg state = diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index e41c85e5056f..ea04eaa77e6d 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-alpha @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_alpha diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 5282bfdb1dfa..12928ee10798 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-stdlib-unix @@ -26,6 +27,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha_parameters -open Tezos_stdlib_unix @@ -44,6 +46,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-protocol-environment @@ -59,6 +62,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha_parameters -open Tezos_shell_services diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 29bac8436d1a..cb48b5e52843 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_alpha diff --git a/src/proto_alpha/lib_delegate/baking_commands.ml b/src/proto_alpha/lib_delegate/baking_commands.ml index 1874b8f170de..d1779de5787a 100644 --- a/src/proto_alpha/lib_delegate/baking_commands.ml +++ b/src/proto_alpha/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_alpha/lib_delegate/baking_commands.mli b/src/proto_alpha/lib_delegate/baking_commands.mli index 8c9f9ea45d06..4bf2dac9ce86 100644 --- a/src/proto_alpha/lib_delegate/baking_commands.mli +++ b/src/proto_alpha/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_alpha/lib_delegate/baking_commands_registration.ml b/src/proto_alpha/lib_delegate/baking_commands_registration.ml index 1050a6901021..245debeae240 100644 --- a/src/proto_alpha/lib_delegate/baking_commands_registration.ml +++ b/src/proto_alpha/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 0708852df93d..d0f83a4e57a2 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-alpha tezos-protocol-plugin-alpha @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_plugin_alpha -open Tezos_shell_services diff --git a/src/proto_demo_counter/lib_client/client_proto_args.ml b/src/proto_demo_counter/lib_client/client_proto_args.ml index e4cf25cc5853..6a6835814851 100644 --- a/src/proto_demo_counter/lib_client/client_proto_args.ml +++ b/src/proto_demo_counter/lib_client/client_proto_args.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + type error += Bad_amount_param of (string * string) let msg_parameter _param = Clic.parameter (fun _ s -> return s) diff --git a/src/proto_demo_counter/lib_client/client_proto_args.mli b/src/proto_demo_counter/lib_client/client_proto_args.mli index 3d5a2992148c..3a03ded36757 100644 --- a/src/proto_demo_counter/lib_client/client_proto_args.mli +++ b/src/proto_demo_counter/lib_client/client_proto_args.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val amount_param : name:string -> desc:string -> diff --git a/src/proto_demo_counter/lib_client/client_proto_main.ml b/src/proto_demo_counter/lib_client/client_proto_main.ml index 1d56d9ef2360..4a79e838548d 100644 --- a/src/proto_demo_counter/lib_client/client_proto_main.ml +++ b/src/proto_demo_counter/lib_client/client_proto_main.ml @@ -26,8 +26,8 @@ open Protocol module Commands = Client_proto_commands -let commands : Protocol_client_context.full Clic.command list = - let open Clic in +let commands : Protocol_client_context.full Tezos_clic.Clic.command list = + let open Tezos_clic.Clic in let open Client_proto_args in let group = {name = "Demo_counter"; title = "Commands for protocol Demo_counter"} @@ -79,6 +79,6 @@ let commands : Protocol_client_context.full Clic.command list = ] let () = - let f = Clic.map_command (new Protocol_client_context.wrap_full) in + let f = Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full) in let command_list = List.map f commands in Client_commands.register Protocol.hash (fun _network -> command_list) diff --git a/src/proto_genesis/lib_client/client_proto_main.ml b/src/proto_genesis/lib_client/client_proto_main.ml index 0478fd5f31c2..956fc3346d1e 100644 --- a/src/proto_genesis/lib_client/client_proto_main.ml +++ b/src/proto_genesis/lib_client/client_proto_main.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Protocol open Protocol_client_context -- GitLab