Promote kimchi_backend_common and kimchi_pasta

Promote these two sublibraries to be packages of their own. This allows to remove three-layered sublibrary names. More importantly, it removes some package-to-package circular dependencies and overall makes things a bit cleaner.
MinaProtocol · Jun 18, 2024 · 9707f9c · 9707f9c
1 parent 0c823fe
commit 9707f9c
Show file tree

Hide file tree

Showing 124 changed files with 256 additions and 254 deletions.
diff --git a/src/app/archive/lib/dune b/src/app/archive/lib/dune
@@ -32,8 +32,8 @@
    mina_runtime_config
    sgn
    mina_base.util
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pickles
    random_oracle
    pipe_lib

diff --git a/src/app/best_tip_merger/dune b/src/app/best_tip_merger/dune
@@ -36,7 +36,7 @@
    pickles.backend
    snark_params
    pickles
-   kimchi_backend.pasta
+   kimchi_pasta
    bounded_types
     )
  (instrumentation (backend bisect_ppx))

diff --git a/src/app/cli/src/init/dune b/src/app/cli/src/init/dune
@@ -112,8 +112,8 @@
    parallel
    random_oracle
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pickles_types
    pickles
    pickles.backend

diff --git a/src/app/delegation_verify/dune b/src/app/delegation_verify/dune
@@ -34,8 +34,8 @@
    data_hash_lib
    mina_numbers
    snark_params
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pasta_bindings
    pickles
    pickles_types

diff --git a/src/app/extract_blocks/dune b/src/app/extract_blocks/dune
@@ -23,8 +23,8 @@
    bounded_types
    mina_base
    mina_base.import
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pasta_bindings
    pickles
    pickles_types

diff --git a/src/app/heap_usage/dune b/src/app/heap_usage/dune
@@ -48,8 +48,8 @@
    crypto_params
    kimchi_bindings
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pasta_bindings
    zkapp_command_builder
    transaction_snark_tests

diff --git a/src/app/receipt_chain_hash_to_b58/dune b/src/app/receipt_chain_hash_to_b58/dune
@@ -8,8 +8,8 @@
    ;; local libraries
    mina_base
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pickles
    pickles.backend
    pickles_types

diff --git a/src/app/replayer/dune b/src/app/replayer/dune
@@ -49,9 +49,9 @@
    mina_runtime_config
    logger
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
-   kimchi_backend.common
+   kimchi_pasta
+   kimchi_pasta.basic
+   kimchi_backend_common
    block_time
    data_hash_lib
    pickles

diff --git a/src/app/rosetta/lib/dune b/src/app/rosetta/lib/dune
@@ -28,8 +28,8 @@
   mina_base.import
   graphql_lib
   interpolator_lib
-  kimchi_backend.pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta
+  kimchi_pasta.basic
   pickles
   random_oracle_input
   unsigned_extended

diff --git a/src/app/rosetta/ocaml-signer/dune b/src/app/rosetta/ocaml-signer/dune
@@ -13,8 +13,8 @@
    async_unix
    async.async_command
    ;;local libraries
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    pickles
    rosetta_coding
    rosetta_lib

diff --git a/src/app/test_executive/dune b/src/app/test_executive/dune
@@ -21,8 +21,8 @@
   with_hash
   data_hash_lib
   kimchi_backend
-  kimchi_backend.pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta
+  kimchi_pasta.basic
   pickles
   pickles_types
   random_oracle_input

diff --git a/src/app/zkapp_test_transaction/lib/dune b/src/app/zkapp_test_transaction/lib/dune
@@ -18,8 +18,8 @@
    graphql-async
    ;;local libraries
    pickles
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    bounded_types
    random_oracle
    mina_runtime_config

diff --git a/src/app/zkapps_examples/big_circuit/dune b/src/app/zkapps_examples/big_circuit/dune
@@ -10,8 +10,8 @@
   kimchi_backend
   kimchi_backend_common
   kimchi_pasta
-  kimchi_backend.pasta.basic
-  kimchi_backend.pasta.constraint_system
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
   mina_base
   pickles
   pickles.backend

diff --git a/src/app/zkapps_examples/calls/dune b/src/app/zkapps_examples/calls/dune
@@ -11,7 +11,7 @@
    kimchi_backend
    kimchi_backend_common
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    mina_base
    mina_base.import
    pickles

diff --git a/src/app/zkapps_examples/dune b/src/app/zkapps_examples/dune
@@ -14,7 +14,7 @@
    kimchi_backend
    kimchi_backend_common
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    mina_base
    mina_base.import
    mina_ledger

diff --git a/src/app/zkapps_examples/empty_update/dune b/src/app/zkapps_examples/empty_update/dune
@@ -10,7 +10,7 @@
    kimchi_backend
    kimchi_backend_common
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    mina_base
    pickles
    pickles.backend

diff --git a/src/app/zkapps_examples/initialize_state/dune b/src/app/zkapps_examples/initialize_state/dune
@@ -11,7 +11,7 @@
    kimchi_backend
    kimchi_backend_common
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    mina_base
    pickles
    pickles.backend

diff --git a/src/app/zkapps_examples/test/actions/dune b/src/app/zkapps_examples/test/actions/dune
@@ -16,7 +16,7 @@
   genesis_constants
   kimchi_backend
   kimchi_pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta.basic
   merkle_ledger
   merkle_list_verifier
   mina_base

diff --git a/src/app/zkapps_examples/test/add_events/dune b/src/app/zkapps_examples/test/add_events/dune
@@ -15,7 +15,7 @@
    genesis_constants
    kimchi_backend
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    merkle_ledger
    merkle_list_verifier
    mina_base

diff --git a/src/app/zkapps_examples/test/big_circuit/dune b/src/app/zkapps_examples/test/big_circuit/dune
@@ -18,7 +18,7 @@
   pasta_bindings
   kimchi_backend
   kimchi_pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta.basic
   mina_base
   mina_base.import
   mina_ledger

diff --git a/src/app/zkapps_examples/test/calls/dune b/src/app/zkapps_examples/test/calls/dune
@@ -18,7 +18,7 @@
    pasta_bindings
    kimchi_backend
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    merkle_ledger
    mina_base
    mina_base.import

diff --git a/src/app/zkapps_examples/test/empty_update/dune b/src/app/zkapps_examples/test/empty_update/dune
@@ -18,7 +18,7 @@
    pasta_bindings
    kimchi_backend
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    mina_base
    mina_base.import
    mina_ledger

diff --git a/src/app/zkapps_examples/test/initialize_state/dune b/src/app/zkapps_examples/test/initialize_state/dune
@@ -18,7 +18,7 @@
    pasta_bindings
    kimchi_backend
    kimchi_pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta.basic
    merkle_ledger
    mina_base
    mina_base.import

diff --git a/src/app/zkapps_examples/test/tokens/dune b/src/app/zkapps_examples/test/tokens/dune
@@ -17,8 +17,8 @@
    genesis_constants
    pasta_bindings
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    merkle_ledger
    mina_base
    mina_base.import

diff --git a/src/dune-project b/src/dune-project
@@ -83,7 +83,9 @@
 (package (name keys_lib))
 (package (name key_value_database))
 (package (name kimchi_backend))
+(package (name kimchi_backend_common))
 (package (name kimchi_bindings))
+(package (name kimchi_pasta))
 (package (name kimchi_types))
 (package (name last_vrf_output_to_b64))
 (package (name ledger_catchup))

diff --git a/src/lib/best_tip_prover/dune b/src/lib/best_tip_prover/dune
@@ -30,6 +30,6 @@
    pickles.backend
    snark_params
    pickles
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
 ))
diff --git a/src/lib/block_producer/dune b/src/lib/block_producer/dune
@@ -65,8 +65,8 @@
    pickles
    snark_params
    kimchi_backend
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    internal_tracing
    mina_networking
    runtime_config

diff --git a/src/lib/blockchain_snark/dune b/src/lib/blockchain_snark/dune
@@ -32,8 +32,8 @@
    currency
    sgn
    random_oracle
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    data_hash_lib
    ppx_version.runtime
    snark_keys_header

diff --git a/src/lib/bootstrap_controller/dune b/src/lib/bootstrap_controller/dune
@@ -61,7 +61,7 @@
    sgn_type
    sgn
    currency
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    mina_wire_types
    ))
diff --git a/src/lib/cli_lib/dune b/src/lib/cli_lib/dune
@@ -42,8 +42,8 @@
   pickles.backend
   consensus.vrf
   error_json
-  kimchi_backend.pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta
+  kimchi_pasta.basic
   ppx_version.runtime
   gossip_net)
  (preprocess

diff --git a/src/lib/consensus/dune b/src/lib/consensus/dune
@@ -28,8 +28,8 @@
    mina_base.util
    bounded_types
    unsigned_extended
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    fold_lib
    random_oracle_input
    outside_hash_image

diff --git a/src/lib/consensus/vrf/dune b/src/lib/consensus/vrf/dune
@@ -17,8 +17,8 @@
    ;; local libraries
    mina_wire_types
    mina_base.util
-   kimchi_backend.pasta
-   kimchi_backend.pasta.basic
+   kimchi_pasta
+   kimchi_pasta.basic
    genesis_constants
    bounded_types
    crypto_params

diff --git a/src/lib/crypto/kimchi_backend/common/dune b/src/lib/crypto/kimchi_backend/common/dune
@@ -1,7 +1,7 @@
 (library
  (inline_tests (flags -verbose -show-counts))
  (name kimchi_backend_common)
- (public_name kimchi_backend.common)
+ (public_name kimchi_backend_common)
  (flags -warn-error -27)
  (instrumentation
   (backend bisect_ppx))

diff --git a/src/lib/crypto/kimchi_backend/common/tests/dune b/src/lib/crypto/kimchi_backend/common/tests/dune
@@ -13,10 +13,10 @@
   kimchi_bindings
   kimchi_types
   pasta_bindings
-  kimchi_backend.pasta
-  kimchi_backend.pasta.basic
+  kimchi_pasta
+  kimchi_pasta.basic
   kimchi_backend.gadgets_test_runner
-  kimchi_backend.pasta.constraint_system
+  kimchi_pasta.constraint_system
   bitstring_lib
   snarky.intf
   snarky.backendless
@@ -34,5 +34,5 @@
   snark_keys_header
   tuple_lib
   promise
-  kimchi_backend.common
+  kimchi_backend_common
   ppx_version.runtime))
diff --git a/src/lib/crypto/kimchi_backend/dune b/src/lib/crypto/kimchi_backend/dune
@@ -23,10 +23,10 @@
   snarky.backendless
   key_cache
   hex
-  kimchi_backend.common
-  kimchi_backend.pasta
-  kimchi_backend.pasta.basic
-  kimchi_backend.pasta.constraint_system
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
   pickles_types
   sponge
   snarky.intf))
diff --git a/src/lib/crypto/kimchi_backend/gadgets/dune b/src/lib/crypto/kimchi_backend/gadgets/dune
@@ -12,8 +12,8 @@
   ppx_inline_test.config
   zarith
   ;; local libraries
-  kimchi_backend.common
-  kimchi_backend.pasta
+  kimchi_backend_common
+  kimchi_pasta
   kimchi_gadgets_test_runner
   mina_stdlib
   snarky.backendless))