From 47b8facf3f91cf4547128fe90f882e020c2e9339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 7 Sep 2023 15:29:33 +0200 Subject: [PATCH] Revert "Merge tezos/tezos!9848: `Octez-codec`: Add command to dump Kaitai spec file" This reverts commit e5f968e27f8f5f6d2e2e3c77789280a85f6d7a77, reversing changes made to 9201adfb9c4069f91c473e58cb681f26e04f431a. --- .gitlab/ci/jobs/packaging/opam_package.yml | 9 +-- contrib/bin_codec/kaitai.t | 19 ----- contrib/kaitai-ocaml/src/dune | 4 +- contrib/kaitai-ocaml/test/basic.ml | 4 +- contrib/kaitai-ocaml/test/dune | 2 +- .../lib_kaitai_of_data_encoding/dune | 6 +- .../lib_kaitai_of_data_encoding/ground.ml | 4 +- .../lib_kaitai_of_data_encoding/ground.mli | 12 +-- .../lib_kaitai_of_data_encoding/test/dune | 6 +- .../test/test_translation_of_ground_types.ml | 8 +- .../test/test_translation_of_tuples.ml | 16 ++-- .../lib_kaitai_of_data_encoding/translate.ml | 3 +- .../lib_kaitai_of_data_encoding/translate.mli | 2 +- dune-project | 1 + manifest/main.ml | 81 +++++++++---------- manifest/manifest.ml | 23 ++---- opam/kaitai-of-data-encoding.opam | 23 ++++++ opam/kaitai.opam | 3 +- opam/octez-codec.opam | 3 +- .../bin_codec/additional_registrations.ml | 0 {contrib => src}/bin_codec/codec.ml | 0 {contrib => src}/bin_codec/commands.ml | 41 ---------- {contrib => src}/bin_codec/commands.mli | 0 {contrib => src}/bin_codec/dune | 4 - 24 files changed, 103 insertions(+), 171 deletions(-) delete mode 100644 contrib/bin_codec/kaitai.t rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/dune (57%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/ground.ml (97%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/ground.mli (90%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/test/dune (78%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml (92%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml (89%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/translate.ml (98%) rename contrib/{kaitai-ocaml => }/lib_kaitai_of_data_encoding/translate.mli (96%) create mode 100644 opam/kaitai-of-data-encoding.opam rename {contrib => src}/bin_codec/additional_registrations.ml (100%) rename {contrib => src}/bin_codec/codec.ml (100%) rename {contrib => src}/bin_codec/commands.ml (90%) rename {contrib => src}/bin_codec/commands.mli (100%) rename {contrib => src}/bin_codec/dune (98%) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index d5439fbaf73b..d5a84750ec97 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -416,12 +416,9 @@ opam:bls12-381: # Ignoring unreleased package internal-devtools. -opam:kaitai: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: kaitai +# Ignoring unreleased package kaitai. + +# Ignoring unreleased package kaitai-of-data-encoding. opam:octez-accuser-Proxford: extends: diff --git a/contrib/bin_codec/kaitai.t b/contrib/bin_codec/kaitai.t deleted file mode 100644 index 750259db8a79..000000000000 --- a/contrib/bin_codec/kaitai.t +++ /dev/null @@ -1,19 +0,0 @@ -ground.uint8 test - $ ./codec.exe dump kaitai for ground.uint8 - meta: - id: ground__uint8 - seq: - - id: uint8 - type: u1 -ground.bool test - $ ./codec.exe dump kaitai for ground.bool - meta: - id: ground__bool - enums: - bool: - 0: false - 255: true - seq: - - id: bool - type: u1 - enum: bool diff --git a/contrib/kaitai-ocaml/src/dune b/contrib/kaitai-ocaml/src/dune index 94c9515d675a..cf5762d3d40e 100644 --- a/contrib/kaitai-ocaml/src/dune +++ b/contrib/kaitai-ocaml/src/dune @@ -2,8 +2,8 @@ ; Edit file manifest/main.ml instead. (library - (name kaitai_ast) - (public_name kaitai.ast) + (name kaitai) + (public_name kaitai) (instrumentation (backend bisect_ppx)) (libraries yaml)) diff --git a/contrib/kaitai-ocaml/test/basic.ml b/contrib/kaitai-ocaml/test/basic.ml index 53de7a8e230f..05d7aeb096be 100644 --- a/contrib/kaitai-ocaml/test/basic.ml +++ b/contrib/kaitai-ocaml/test/basic.ml @@ -39,9 +39,9 @@ seq: doc: The actual data. |} in - let k = Kaitai_ast.Parse.parse s in + let k = Kaitai.Parse.parse s in print_endline "Parsing ok" ; - let s = Kaitai_ast.Print.print k in + let s = Kaitai.Print.print k in print_endline "Serialization ok" ; print_endline s ; [%expect diff --git a/contrib/kaitai-ocaml/test/dune b/contrib/kaitai-ocaml/test/dune index 2aba008f0869..112ea428dcd9 100644 --- a/contrib/kaitai-ocaml/test/dune +++ b/contrib/kaitai-ocaml/test/dune @@ -6,6 +6,6 @@ (package kaitai) (instrumentation (backend bisect_ppx)) (libraries - kaitai.ast) + kaitai) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect))) diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/dune b/contrib/lib_kaitai_of_data_encoding/dune similarity index 57% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/dune rename to contrib/lib_kaitai_of_data_encoding/dune index cb7f41443a55..44f3e5217a7a 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/dune +++ b/contrib/lib_kaitai_of_data_encoding/dune @@ -2,9 +2,9 @@ ; Edit file manifest/main.ml instead. (library - (name kaitai_kaitai_of_data_encoding) - (public_name kaitai.kaitai-of-data-encoding) + (name kaitai_of_data_encoding) + (public_name kaitai-of-data-encoding) (libraries yaml data-encoding - kaitai.ast)) + kaitai)) diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.ml b/contrib/lib_kaitai_of_data_encoding/ground.ml similarity index 97% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.ml rename to contrib/lib_kaitai_of_data_encoding/ground.ml index b6fcc87fafcf..7a5a63f9273d 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.ml +++ b/contrib/lib_kaitai_of_data_encoding/ground.ml @@ -24,7 +24,7 @@ (* *) (*****************************************************************************) -open Kaitai_ast.Types +open Kaitai.Types let default_doc_spec = DocSpec.{summary = None; refs = []} @@ -32,7 +32,7 @@ let cond_no_cond = AttrSpec.ConditionalSpec.{ifExpr = None; repeat = RepeatSpec.NoRepeat} module Enum = struct - type map = (string * Kaitai_ast.Types.EnumSpec.t) list + type map = (string * Kaitai.Types.EnumSpec.t) list let add enums ((k, e) as enum) = let rec add = function diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.mli b/contrib/lib_kaitai_of_data_encoding/ground.mli similarity index 90% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.mli rename to contrib/lib_kaitai_of_data_encoding/ground.mli index cec50e38f046..eec3a1fc0650 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/ground.mli +++ b/contrib/lib_kaitai_of_data_encoding/ground.mli @@ -25,29 +25,29 @@ (*****************************************************************************) (** [default_doc_spec] is without summary and references. *) -val default_doc_spec : Kaitai_ast.Types.DocSpec.t +val default_doc_spec : Kaitai.Types.DocSpec.t (** [Enum] module defines enum definitions needed for describing data-encoding ground types. *) module Enum : sig (** [map] describes mapping of enum id (string) with the corresponding [EnumSpec.t]. *) - type map = (string * Kaitai_ast.Types.EnumSpec.t) list + type map = (string * Kaitai.Types.EnumSpec.t) list (** [bool] is a mapping for boolean type. *) - val bool : string * Kaitai_ast.Types.EnumSpec.t + val bool : string * Kaitai.Types.EnumSpec.t (** [add enums enum] returns a list of enum mappings. If [enums] don't contain [enum], then new list with it is returned, otherwise existing [enums] list is returned. *) - val add : map -> string * Kaitai_ast.Types.EnumSpec.t -> map + val add : map -> string * Kaitai.Types.EnumSpec.t -> map end (** [Attr] is module for getting [AttrSpec.t] of ground types. *) module Attr : sig (** [bool] returns [AttrSpec.t] definition of bool ground type. *) - val bool : Kaitai_ast.Types.AttrSpec.t + val bool : Kaitai.Types.AttrSpec.t (** [u1] returns [AttrSpec.t] definition of 8-bit unsigned integer. *) - val u1 : Kaitai_ast.Types.AttrSpec.t + val u1 : Kaitai.Types.AttrSpec.t end diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/dune b/contrib/lib_kaitai_of_data_encoding/test/dune similarity index 78% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/dune rename to contrib/lib_kaitai_of_data_encoding/test/dune index 472b9864cd6e..fe5cfcafcd33 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/dune +++ b/contrib/lib_kaitai_of_data_encoding/test/dune @@ -3,11 +3,11 @@ (library (name kaitai_of_data_encoding_test) - (package kaitai) + (package kaitai-of-data-encoding) (libraries yaml data-encoding - kaitai.ast - kaitai.kaitai-of-data-encoding) + kaitai + kaitai-of-data-encoding) (inline_tests (flags -verbose) (modes native)) (preprocess (pps ppx_expect))) diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml b/contrib/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml similarity index 92% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml rename to contrib/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml index 99943459f6c4..3bb40a1110f5 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml +++ b/contrib/lib_kaitai_of_data_encoding/test/test_translation_of_ground_types.ml @@ -29,11 +29,11 @@ let%expect_test "test uint8 translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"ground_uint8" Data_encoding.uint8 in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: @@ -45,11 +45,11 @@ let%expect_test "test uint8 translation" = let%expect_test "test bool translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"ground_bool" Data_encoding.bool in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml b/contrib/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml similarity index 89% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml rename to contrib/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml index e01c009a88bb..44eff71495b7 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml +++ b/contrib/lib_kaitai_of_data_encoding/test/test_translation_of_tuples.ml @@ -26,11 +26,11 @@ let%expect_test "test tuple translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"simple_tuple" Data_encoding.(tup2 bool uint8) in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: @@ -49,11 +49,11 @@ let%expect_test "test tuple translation" = let%expect_test "test long tuple translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"simple_tuple" Data_encoding.(tup5 bool uint8 bool uint8 uint8) in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: @@ -78,11 +78,11 @@ let%expect_test "test long tuple translation" = let%expect_test "test tup1 tuple translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"tup1" Data_encoding.(tup1 uint8) in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: @@ -94,12 +94,12 @@ let%expect_test "test tup1 tuple translation" = let%expect_test "test tuples with tup1 translation" = let s = - Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding + Kaitai_of_data_encoding.Translate.from_data_encoding ~encoding_name:"tup1tup" Data_encoding.( tup3 (tup1 bool) (tup2 uint8 bool) (tup2 (tup1 uint8) uint8)) in - print_endline (Kaitai_ast.Print.print s) ; + print_endline (Kaitai.Print.print s) ; [%expect {| meta: diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.ml b/contrib/lib_kaitai_of_data_encoding/translate.ml similarity index 98% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.ml rename to contrib/lib_kaitai_of_data_encoding/translate.ml index 194d8cbdf489..79f23cfc2622 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.ml +++ b/contrib/lib_kaitai_of_data_encoding/translate.ml @@ -24,7 +24,7 @@ (* *) (*****************************************************************************) -open Kaitai_ast.Types +open Kaitai.Types (* We need to access the definition of data-encoding's [descr] type. For this reason we open the private/internal module [Data_encoding__Encoding] (rather @@ -117,5 +117,4 @@ let rec from_data_encoding : in {(default_class_spec ~encoding_name) with seq; enums} | Conv {encoding; _} -> from_data_encoding ~encoding_name encoding - | Describe {encoding; _} -> from_data_encoding ~encoding_name encoding | _ -> failwith "Not implemented" diff --git a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.mli b/contrib/lib_kaitai_of_data_encoding/translate.mli similarity index 96% rename from contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.mli rename to contrib/lib_kaitai_of_data_encoding/translate.mli index 6cf70370855b..56eb68758c88 100644 --- a/contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/translate.mli +++ b/contrib/lib_kaitai_of_data_encoding/translate.mli @@ -29,4 +29,4 @@ @param [encoding_name] is added to the "meta" section of the class-spec. *) val from_data_encoding : - encoding_name:string -> 'a Data_encoding.t -> Kaitai_ast.Types.ClassSpec.t + encoding_name:string -> 'a Data_encoding.t -> Kaitai.Types.ClassSpec.t diff --git a/dune-project b/dune-project index a23420a67ede..d8ad574f5657 100644 --- a/dune-project +++ b/dune-project @@ -5,6 +5,7 @@ (package (name bls12-381)) (package (name internal-devtools)) (package (name kaitai)) +(package (name kaitai-of-data-encoding)) (package (name octez-accuser-Proxford)) (package (name octez-accuser-PtNairob)) (package (name octez-accuser-alpha)) diff --git a/manifest/main.ml b/manifest/main.ml index 88e9ac5fdbe7..739e8b190055 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -7449,45 +7449,10 @@ let _octez_client = ]; ] -let kaitai = - public_lib - "kaitai.ast" - ~path:"contrib/kaitai-ocaml/src" - ~deps:[yaml] - ~synopsis:"OCaml library for reading Kaitai spec files" - -(* We use a private-lib with inline-tests in order to run the tests normally, - but without placing all the code for the tests within the main kaitai - library. *) -let _kaitai_test = - private_lib - "kaitai_test" - ~opam:"kaitai" - ~path:"contrib/kaitai-ocaml/test" - ~inline_tests:ppx_expect - ~deps:[kaitai] - -let kaitai_of_data_encoding = - public_lib - "kaitai.kaitai-of-data-encoding" - ~opam:"kaitai" - ~path:"contrib/kaitai-ocaml/lib_kaitai_of_data_encoding" - ~deps:[yaml; data_encoding; kaitai] - ~bisect_ppx:No - -let _kaitai_of_data_encoding_test = - private_lib - "kaitai_of_data_encoding_test" - ~opam:"kaitai" - ~path:"contrib/kaitai-ocaml/lib_kaitai_of_data_encoding/test" - ~deps:[yaml; data_encoding; kaitai; kaitai_of_data_encoding] - ~bisect_ppx:No - ~inline_tests:ppx_expect - let _octez_codec = public_exe "octez-codec" - ~path:"contrib/bin_codec" + ~path:"src/bin_codec" ~internal_name:"codec" ~synopsis:"Tezos: `octez-codec` binary to encode and decode values" ~release_status:Released @@ -7504,8 +7469,6 @@ let _octez_codec = octez_event_logging |> open_; octez_signer_services; octez_version_value; - kaitai_of_data_encoding; - kaitai; ] @ Protocol.all_optionally @@ [ @@ -7519,13 +7482,6 @@ let _octez_codec = if link then Protocol.client protocol else None); ]) ~linkall:true - ~dune: - Dune. - [ - S "cram" - :: G [S "deps" :: [S "codec.exe"]] - :: [S "package" :: [S "octez-codec"]]; - ] let _octez_proxy_server = public_exe @@ -8073,6 +8029,41 @@ let octez_scoru_wasm_regressions = ] ~preprocess:[staged_pps [ppx_import; ppx_deriving_show]] +let kaitai = + public_lib + "kaitai" + ~path:"contrib/kaitai-ocaml/src" + ~deps:[yaml] + ~synopsis:"OCaml library for reading Kaitai spec files" + +(* We use a private-lib with inline-tests in order to run the tests normally, + but without placing all the code for the tests within the main kaitai + library. *) +let _kaitai_test = + private_lib + "kaitai_test" + ~opam:"kaitai" + ~path:"contrib/kaitai-ocaml/test" + ~inline_tests:ppx_expect + ~deps:[kaitai] + +let kaitai_of_data_encoding = + public_lib + "kaitai-of-data-encoding" + ~path:"contrib/lib_kaitai_of_data_encoding" + ~synopsis:"Kaitai spec generator for data-encoding library" + ~deps:[yaml; data_encoding; kaitai] + ~bisect_ppx:No + +let _kaitai_of_data_encoding_test = + private_lib + "kaitai_of_data_encoding_test" + ~opam:"kaitai-of-data-encoding" + ~path:"contrib/lib_kaitai_of_data_encoding/test" + ~deps:[yaml; data_encoding; kaitai; kaitai_of_data_encoding] + ~bisect_ppx:No + ~inline_tests:ppx_expect + (* Add entries to this function to declare that some dune and .opam files are not generated by the manifest on purpose. diff --git a/manifest/manifest.ml b/manifest/manifest.ml index ecefeaa09c6a..c6ae9cfbf674 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -3102,24 +3102,11 @@ let generate_opam ?release for_package (internals : Target.internal list) : |> String_set.of_list |> String_set.elements |> List.concat_map make_runtest in - let rms = - let active_paths = - internals - |> List.map (fun x -> x.Target.path) - |> List.map (fun p -> - let slash_index = String.index p '/' in - String.sub p 0 slash_index) - |> List.sort_uniq String.compare - in - let rms = - List.filter - (fun s -> not (List.mem s active_paths)) - List.["vendors"; "contrib"] - |> List.map (fun x -> Opam.S x) - in - match rms with [] -> [] | _ :: _ -> Opam.S "rm" :: Opam.S "-r" :: rms - in - {Opam.command = rms; with_test = Never} :: build :: runtests + { + Opam.command = [S "rm"; S "-r"; S "vendors"; S "contrib"]; + with_test = Never; + } + :: build :: runtests in let licenses = match diff --git a/opam/kaitai-of-data-encoding.opam b/opam/kaitai-of-data-encoding.opam new file mode 100644 index 000000000000..67e175d24d39 --- /dev/null +++ b/opam/kaitai-of-data-encoding.opam @@ -0,0 +1,23 @@ +# This file was automatically generated, do not edit. +# Edit file manifest/main.ml instead. +opam-version: "2.0" +maintainer: "contact@tezos.com" +authors: ["Tezos devteam"] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "git+https://gitlab.com/tezos/tezos.git" +license: "MIT" +depends: [ + "dune" { >= "3.0" } + "ocaml" { >= "4.14" } + "yaml" { >= "3.1.0" } + "data-encoding" { >= "0.7.1" & < "1.0.0" } + "kaitai" + "ppx_expect" +] +build: [ + ["rm" "-r" "vendors" "contrib"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +] +synopsis: "Kaitai spec generator for data-encoding library" diff --git a/opam/kaitai.opam b/opam/kaitai.opam index e4d9db8ae76b..324d6c0fc7f1 100644 --- a/opam/kaitai.opam +++ b/opam/kaitai.opam @@ -12,10 +12,9 @@ depends: [ "ocaml" { >= "4.14" } "yaml" { >= "3.1.0" } "ppx_expect" - "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam index 3da0b4476d58..d24cde83aab9 100644 --- a/opam/octez-codec.opam +++ b/opam/octez-codec.opam @@ -14,7 +14,6 @@ depends: [ "octez-libs" "octez-shell-libs" "tezos-version" - "kaitai" ] depopts: [ "octez-protocol-005-PsBabyM1-libs" @@ -34,7 +33,7 @@ depopts: [ "octez-protocol-alpha-libs" ] build: [ - ["rm" "-r" "vendors"] + ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] diff --git a/contrib/bin_codec/additional_registrations.ml b/src/bin_codec/additional_registrations.ml similarity index 100% rename from contrib/bin_codec/additional_registrations.ml rename to src/bin_codec/additional_registrations.ml diff --git a/contrib/bin_codec/codec.ml b/src/bin_codec/codec.ml similarity index 100% rename from contrib/bin_codec/codec.ml rename to src/bin_codec/codec.ml diff --git a/contrib/bin_codec/commands.ml b/src/bin_codec/commands.ml similarity index 90% rename from contrib/bin_codec/commands.ml rename to src/bin_codec/commands.ml index cf3b3aa2c1e5..b92801a95bd3 100644 --- a/contrib/bin_codec/commands.ml +++ b/src/bin_codec/commands.ml @@ -27,12 +27,6 @@ open Tezos_clic let group = {name = "encoding"; title = "Commands to handle encodings"} -let raw_id_parameter = - parameter (fun (cctxt : #Client_context.printer) id -> - match Data_encoding.Registration.find id with - | Some _ -> Lwt.return_ok id - | None -> cctxt#error "Unknown encoding id: %s" id) - let id_parameter = parameter (fun (cctxt : #Client_context.printer) id -> match Data_encoding.Registration.find id with @@ -422,39 +416,4 @@ let commands () = | Ok slices -> let* () = cctxt#message "%a\n" (pp_slices format) slices in Lwt_result_syntax.return_unit); - command - ~group - ~desc:"Dump a Kaitai Struct specification of a given registered encoding." - no_options - (prefix "dump" @@ prefix "kaitai" @@ prefix "for" - @@ param ~name:"id" ~desc:"Encoding identifier" raw_id_parameter - @@ stop) - (fun () encoding_id cctxt -> - let open Lwt_syntax in - let introspectable = - Data_encoding.Registration.find_introspectable encoding_id - in - let* kaitai_spec = - match introspectable with - | None -> cctxt#error "Error retrieving introspectable" - | Some (Any encoding) -> - let escape_encoding_id id = - id |> String.split '.' |> String.concat "__" - in - return - @@ Kaitai_kaitai_of_data_encoding.Translate.from_data_encoding - ~encoding_name:(escape_encoding_id encoding_id) - encoding - in - let* () = - cctxt#answer - "%a" - (fun fmt s -> - if s.[String.length s - 1] = '\n' then - let w, _ = Format.pp_get_formatter_output_functions fmt () in - w s 0 (String.length s - 1) - else Format.pp_print_string fmt s) - (Kaitai_ast.Print.print kaitai_spec) - in - Lwt_result_syntax.return_unit); ] diff --git a/contrib/bin_codec/commands.mli b/src/bin_codec/commands.mli similarity index 100% rename from contrib/bin_codec/commands.mli rename to src/bin_codec/commands.mli diff --git a/contrib/bin_codec/dune b/src/bin_codec/dune similarity index 98% rename from contrib/bin_codec/dune rename to src/bin_codec/dune index eb57f9db2116..876fb3248f53 100644 --- a/contrib/bin_codec/dune +++ b/src/bin_codec/dune @@ -17,8 +17,6 @@ octez-libs.tezos-event-logging octez-shell-libs.tezos-signer-services tezos-version.value - kaitai.kaitai-of-data-encoding - kaitai.ast (select void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client from (octez-protocol-005-PsBabyM1-libs.tezos-client -> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty) (-> void_for_linking-octez-protocol-005-PsBabyM1-libs-tezos-client.empty)) @@ -96,5 +94,3 @@ (write-file void_for_linking-octez-protocol-017-PtNairob-libs-tezos-client.empty "") (write-file void_for_linking-octez-protocol-018-Proxford-libs-tezos-client.empty "") (write-file void_for_linking-octez-protocol-alpha-libs-tezos-client.empty "")))) - -(cram (deps codec.exe) (package octez-codec)) -- GitLab