From fff5487f571dcde33d7b50f7302dd94c63239e31 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 24 Sep 2024 15:07:01 +0200 Subject: [PATCH] format: run `dune fmt` in src/app I checked that running `DISABLE_CHECK_OPAM_SWITCH=true make reformat` does not make any addition changes. --- src/app/archive/cli/dune | 39 +-- src/app/archive/dune | 47 ++- src/app/archive/lib/dune | 160 +++++----- src/app/archive_blocks/dune | 49 +-- src/app/batch_txn_tool/dune | 63 ++-- src/app/benchmarks/benchmarks.ml | 4 +- src/app/benchmarks/dune | 15 +- src/app/best_tip_merger/dune | 98 +++--- src/app/cli/src/cli_entrypoint/dune | 155 +++++----- src/app/cli/src/dune | 18 +- src/app/cli/src/init/dune | 279 ++++++++++-------- src/app/delegation_verify/dune | 93 +++--- src/app/disk_caching_stats/dune | 52 +++- src/app/dump_blocks/dump_blocks.ml | 124 ++++---- src/app/dump_blocks/dune | 48 +-- src/app/dump_blocks/encoding.ml | 81 +++-- src/app/extract_blocks/dune | 96 +++--- src/app/generate_keypair/dune | 6 +- src/app/graphql_schema_dump/dune | 17 +- src/app/heap_usage/dune | 109 +++---- src/app/ledger_export_bench/dune | 20 +- src/app/logproc/dune | 35 +-- src/app/logproc/logproc.ml | 56 ++-- src/app/missing_blocks_auditor/dune | 37 +-- src/app/print_blockchain_snark_vk/dune | 16 +- src/app/reformat/dune | 9 +- src/app/reformat/reformat.ml | 19 +- src/app/replayer/dune | 134 +++++---- src/app/rosetta/dune | 53 +++- src/app/rosetta/lib/dune | 3 +- src/app/rosetta/ocaml-signer/dune | 139 +++++---- src/app/runtime_genesis_ledger/dune | 51 ++-- src/app/snark_work_debugger/dune | 65 ++-- src/app/validate_keypair/dune | 23 +- src/app/zkapp_limits/dune | 30 +- src/app/zkapp_test_transaction/dune | 52 ++-- src/app/zkapp_test_transaction/lib/dune | 121 ++++---- src/app/zkapps_examples/add_events/dune | 29 +- src/app/zkapps_examples/calls/dune | 57 ++-- src/app/zkapps_examples/dune | 63 ++-- src/app/zkapps_examples/empty_update/dune | 48 +-- src/app/zkapps_examples/initialize_state/dune | 50 ++-- src/app/zkapps_examples/test/actions/dune | 3 +- src/app/zkapps_examples/test/add_events/dune | 77 ++--- src/app/zkapps_examples/test/calls/dune | 91 +++--- .../zkapps_examples/test/empty_update/dune | 90 +++--- .../test/initialize_state/dune | 91 +++--- .../test/optional_custom_gates/dune | 83 +++--- src/app/zkapps_examples/test/tokens/dune | 93 +++--- src/app/zkapps_examples/tokens/dune | 70 +++-- 50 files changed, 1737 insertions(+), 1524 deletions(-) diff --git a/src/app/archive/cli/dune b/src/app/archive/cli/dune index 69f4c7aa20c..2a815358764 100644 --- a/src/app/archive/cli/dune +++ b/src/app/archive/cli/dune @@ -2,22 +2,23 @@ (name archive_cli) (public_name archive.cli) (libraries - ;;opam libraries - async_kernel - caqti - archive_lib - core - async - caqti-async - core_kernel - async.async_command - ;;local libraries - genesis_constants - mina_runtime_config - cli_lib - logger - block_time - mina_version - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_jane ppx_mina))) + ;;opam libraries + async_kernel + caqti + archive_lib + core + async + caqti-async + core_kernel + async.async_command + ;;local libraries + genesis_constants + mina_runtime_config + cli_lib + logger + block_time + mina_version) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane ppx_mina))) diff --git a/src/app/archive/dune b/src/app/archive/dune index 27c2526bfc1..29b24b628ab 100644 --- a/src/app/archive/dune +++ b/src/app/archive/dune @@ -4,9 +4,18 @@ (public_name archive) (modules archive) (modes native) - (libraries archive_cli async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package archive) @@ -14,9 +23,19 @@ (public_name archive-testnet) (modules archive_testnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.testnet async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + mina_signature_kind.testnet + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package archive) @@ -24,6 +43,16 @@ (public_name archive-mainnet) (modules archive_mainnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.mainnet async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + mina_signature_kind.mainnet + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/archive/lib/dune b/src/app/archive/lib/dune index b24273b9de8..3752fa03a60 100644 --- a/src/app/archive/lib/dune +++ b/src/app/archive/lib/dune @@ -2,80 +2,88 @@ (name archive_lib) (public_name archive_lib) (libraries - ;;opam libraries - sexplib0 - async_unix - base64 - async_rpc_kernel - base.caml - base.base_internalhash_types - bin_prot.shape - async_kernel - caqti-driver-postgresql - core - async - core_kernel - caqti - caqti-async - async.async_rpc - integers - ppx_inline_test.config - uri - ;;local libraries - bounded_types - mina_wire_types - kimchi_backend - child_processes - precomputed_values - coda_genesis_ledger - consensus.vrf - mina_runtime_config - sgn - mina_base.util - kimchi_pasta - kimchi_pasta.basic - pickles - random_oracle - pipe_lib - block_time - currency - staged_ledger - data_hash_lib - transition_frontier_base - genesis_ledger_helper - one_or_two - mina_caqti - mina_generators - zkapp_command_builder - mina_base - mina_ledger - mina_block - transition_frontier - logger - mina_metrics - signature_lib - mina_numbers - unsigned_extended - mina_state - pickles_types - pickles.backend - with_hash - mina_base.import - consensus - genesis_constants - genesis_ledger_helper.lib - verifier - quickcheck_lib - snark_params - mina_transaction - protocol_version - staged_ledger_diff - error_json - ppx_deriving_yojson.runtime - ppx_version.runtime - o1trace - ) - (inline_tests (flags -verbose -show-counts)) + ;;opam libraries + sexplib0 + async_unix + base64 + async_rpc_kernel + base.caml + base.base_internalhash_types + bin_prot.shape + async_kernel + caqti-driver-postgresql + core + async + core_kernel + caqti + caqti-async + async.async_rpc + integers + ppx_inline_test.config + uri + ;;local libraries + bounded_types + mina_wire_types + kimchi_backend + child_processes + precomputed_values + coda_genesis_ledger + consensus.vrf + mina_runtime_config + sgn + mina_base.util + kimchi_pasta + kimchi_pasta.basic + pickles + random_oracle + pipe_lib + block_time + currency + staged_ledger + data_hash_lib + transition_frontier_base + genesis_ledger_helper + one_or_two + mina_caqti + mina_generators + zkapp_command_builder + mina_base + mina_ledger + mina_block + transition_frontier + logger + mina_metrics + signature_lib + mina_numbers + unsigned_extended + mina_state + pickles_types + pickles.backend + with_hash + mina_base.import + consensus + genesis_constants + genesis_ledger_helper.lib + verifier + quickcheck_lib + snark_params + mina_transaction + protocol_version + staged_ledger_diff + error_json + ppx_deriving_yojson.runtime + ppx_version.runtime + o1trace) + (inline_tests + (flags -verbose -show-counts)) (modes native) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_jane ppx_custom_printf ppx_deriving_yojson h_list.ppx))) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_jane + ppx_custom_printf + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/archive_blocks/dune b/src/app/archive_blocks/dune index 48f0db5aabd..152986ce769 100644 --- a/src/app/archive_blocks/dune +++ b/src/app/archive_blocks/dune @@ -3,27 +3,28 @@ (name archive_blocks) (public_name archive_blocks) (libraries - ;; opam libraries - async_unix - core - result - async_kernel - uri - stdio - caqti-driver-postgresql - caqti - async - core_kernel - caqti-async - base - base.caml - async.async_command - ;; local libraries - logger - mina_block - bounded_types - genesis_constants - archive_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + async_unix + core + result + async_kernel + uri + stdio + caqti-driver-postgresql + caqti + async + core_kernel + caqti-async + base + base.caml + async.async_command + ;; local libraries + logger + mina_block + bounded_types + genesis_constants + archive_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) diff --git a/src/app/batch_txn_tool/dune b/src/app/batch_txn_tool/dune index f55ebfdf875..8b957922d9f 100644 --- a/src/app/batch_txn_tool/dune +++ b/src/app/batch_txn_tool/dune @@ -1,37 +1,34 @@ (executable (name batch_txn_tool) (libraries - ;; opam libraries - async.async_command - integers - base - uri - core_kernel - core - async - async_kernel - yojson - async_unix - ;; local libraries - currency - mina_base.import - graphql_lib - signature_lib - mina_base - secrets - mina_numbers - snark_params - unsigned_extended - mina_compile_config - mina_wire_types - integration_test_lib - logger - bounded_types - ) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + async.async_command + integers + base + uri + core_kernel + core + async + async_kernel + yojson + async_unix + ;; local libraries + currency + mina_base.import + graphql_lib + signature_lib + mina_base + secrets + mina_numbers + snark_params + unsigned_extended + mina_compile_config + mina_wire_types + integration_test_lib + logger + bounded_types) + (instrumentation + (backend bisect_ppx)) (preprocessor_deps ../../../graphql_schema.json) - (preprocess (pps - ppx_version - ppx_let - ppx_mina -))) + (preprocess + (pps ppx_version ppx_let ppx_mina))) diff --git a/src/app/benchmarks/benchmarks.ml b/src/app/benchmarks/benchmarks.ml index bc09c3c7b8f..0396bee99c6 100644 --- a/src/app/benchmarks/benchmarks.ml +++ b/src/app/benchmarks/benchmarks.ml @@ -3,11 +3,11 @@ (* you can control which libraries are benchmarked using the environment variable BENCHMARK_LIBRARIES, which is either "all" or a comma-delimited list of libraries; if the variable is not present, or empty, run benchmarks for all libraries - *) +*) open Core_kernel -let available_libraries = ["vrf_lib_tests"; "mina_base"] +let available_libraries = [ "vrf_lib_tests"; "mina_base" ] let run_benchmarks_in_lib libname = printf "Running inline tests in library \"%s\"\n%!" libname ; diff --git a/src/app/benchmarks/dune b/src/app/benchmarks/dune index 23918c24e7c..4052d497da6 100644 --- a/src/app/benchmarks/dune +++ b/src/app/benchmarks/dune @@ -3,8 +3,17 @@ (executable (name benchmarks) (public_name main) - (libraries core_bench.inline_benchmarks vrf_lib_tests mina_base core_kernel core base bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (libraries + core_bench.inline_benchmarks + vrf_lib_tests + mina_base + core_kernel + core + base + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (link_flags -linkall) (modes native)) diff --git a/src/app/best_tip_merger/dune b/src/app/best_tip_merger/dune index 2b8ab0c9e03..93c2ff1087b 100644 --- a/src/app/best_tip_merger/dune +++ b/src/app/best_tip_merger/dune @@ -1,50 +1,50 @@ (executable - (package best_tip_merger) - (name best_tip_merger) - (public_name best_tip_merger) - (modes native) - (libraries - ;; opam libraries - async.async_command - async_kernel - stdio - base.caml - yojson - lib - core_kernel - async - ppx_deriving_yojson.runtime - core - sexplib0 - result - base.base_internalhash_types - async_unix - ;; local libraries - visualization - mina_numbers - mina_state - transition_frontier_extensions - mina_base - logger.file_system - logger - cli_lib - transition_frontier - data_hash_lib - rose_tree - consensus - mina_wire_types - pickles.backend - snark_params - pickles - kimchi_pasta - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_jane - ppx_version - ppx_compare)) - ) + (package best_tip_merger) + (name best_tip_merger) + (public_name best_tip_merger) + (modes native) + (libraries + ;; opam libraries + async.async_command + async_kernel + stdio + base.caml + yojson + lib + core_kernel + async + ppx_deriving_yojson.runtime + core + sexplib0 + result + base.base_internalhash_types + async_unix + ;; local libraries + visualization + mina_numbers + mina_state + transition_frontier_extensions + mina_base + logger.file_system + logger + cli_lib + transition_frontier + data_hash_lib + rose_tree + consensus + mina_wire_types + pickles.backend + snark_params + pickles + kimchi_pasta + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_jane + ppx_version + ppx_compare))) diff --git a/src/app/cli/src/cli_entrypoint/dune b/src/app/cli/src/cli_entrypoint/dune index 9c321cf212c..cefa0dc0d61 100644 --- a/src/app/cli/src/cli_entrypoint/dune +++ b/src/app/cli/src/cli_entrypoint/dune @@ -5,77 +5,84 @@ (public_name cli.mina_cli_entrypoint) (modes native) (libraries - ;;opam libraries - stdio - async_kernel - async_unix - base - core_kernel - core - bin_prot - bin_prot.shape - init - async - core.daemon - base.caml - uri - async.async_command - result - sexplib0 - ;;local libraries - verifier - ledger_proof - snark_worker - mina_block - pipe_lib - gossip_net - data_hash_lib - mina_ledger - precomputed_values - mina_networking - cache_dir - parallel - secrets - logger - mina_lib - currency - signature_lib - mina_base - mina_base.import - error_json - genesis_ledger_helper - consensus - child_processes - node_addrs_and_ports - mina_plugins - logger.file_system - cli_lib - genesis_constants - blake2 - mina_metrics - transaction_witness - snark_work_lib - transaction_snark - mina_compile_config - node_error_service - mina_user_error - file_system - mina_version - mina_net2 - block_time - mina_runtime_config - trust_system - protocol_version - coda_genesis_proof - with_hash - block_producer - prover - blockchain_snark - snarky.backendless - o1trace - ppx_version.runtime - internal_tracing - itn_logger - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_here ppx_let ppx_sexp_conv ppx_deriving_yojson))) + ;;opam libraries + stdio + async_kernel + async_unix + base + core_kernel + core + bin_prot + bin_prot.shape + init + async + core.daemon + base.caml + uri + async.async_command + result + sexplib0 + ;;local libraries + verifier + ledger_proof + snark_worker + mina_block + pipe_lib + gossip_net + data_hash_lib + mina_ledger + precomputed_values + mina_networking + cache_dir + parallel + secrets + logger + mina_lib + currency + signature_lib + mina_base + mina_base.import + error_json + genesis_ledger_helper + consensus + child_processes + node_addrs_and_ports + mina_plugins + logger.file_system + cli_lib + genesis_constants + blake2 + mina_metrics + transaction_witness + snark_work_lib + transaction_snark + mina_compile_config + node_error_service + mina_user_error + file_system + mina_version + mina_net2 + block_time + mina_runtime_config + trust_system + protocol_version + coda_genesis_proof + with_hash + block_producer + prover + blockchain_snark + snarky.backendless + o1trace + ppx_version.runtime + internal_tracing + itn_logger) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_here + ppx_let + ppx_sexp_conv + ppx_deriving_yojson))) diff --git a/src/app/cli/src/dune b/src/app/cli/src/dune index ce6717a5cb4..d88c44698a4 100644 --- a/src/app/cli/src/dune +++ b/src/app/cli/src/dune @@ -7,8 +7,10 @@ (modules mina) (modes native) (libraries mina_cli_entrypoint) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) (executable @@ -18,8 +20,10 @@ (modules mina_testnet_signatures) (modes native) (libraries mina_cli_entrypoint mina_signature_kind.testnet) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) (executable @@ -29,6 +33,8 @@ (modules mina_mainnet_signatures) (modes native) (libraries mina_cli_entrypoint mina_signature_kind.mainnet) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) diff --git a/src/app/cli/src/init/dune b/src/app/cli/src/init/dune index aaa7df52dba..00a4dee6b0a 100644 --- a/src/app/cli/src/init/dune +++ b/src/app/cli/src/init/dune @@ -1,135 +1,158 @@ (rule (targets assets.ml) - (deps (source_tree assets)) - (action (run %{bin:ocaml-crunch} -m plain assets -o assets.ml))) + (deps + (source_tree assets)) + (action + (run %{bin:ocaml-crunch} -m plain assets -o assets.ml))) (library (name init) (public_name init) (libraries - ;;opam libraries - stdio - integers - astring - async_ssl - sexplib0 - async.async_rpc - result - graphql - async_kernel - async_unix - uri - core_kernel - core_kernel.uuid - core - core.uuid - base - async - cohttp - graphql_parser - async.async_command - async_rpc_kernel - base.caml - base.base_internalhash_types - graphql-cohttp - cohttp-async - graphql-async - mirage-crypto-ec - base_quickcheck - ;;local libraries - bounded_types - snark_profiler_lib - archive_lib - mina_wire_types - perf_histograms - one_or_two - block_time - child_processes - mina_net2 - snark_worker - allocation_functor - blockchain_snark - genesis_ledger_helper.lib - transaction_inclusion_status - error_json - network_pool - user_command_input - network_peer - logger - itn_logger - coda_genesis_proof - data_hash_lib - currency - genesis_constants - bash_colors - graphql_lib - o1trace_webkit_event - generated_graphql_queries - itn_crypto - mina_transaction - mina_generators - mina_user_error - mina_ledger - mina_block - mina_lib - mina_base - cli_lib - mina_graphql - mina_state - consensus - mina_version - o1trace - protocol_version - node_error_service - genesis_ledger_helper - signature_lib - mina_base.import - mina_numbers - precomputed_values - with_hash - transaction_snark - transaction_snark_tests - transaction_protocol_state - test_util - file_system - daemon_rpcs - trust_system - secrets - participating_state - staged_ledger - mina_commands - mina_runtime_config - coda_genesis_ledger - mina_networking - sgn - unsigned_extended - mina_metrics - group_map - snark_work_lib - mina_compile_config - mina_transaction_logic - verifier - parallel - random_oracle - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - pickles_types - pickles - pickles.backend - snark_params - mina_signature_kind - string_sign - zkapp_command_builder - internal_tracing - transaction_snark_scan_state - ) - (instrumentation (backend bisect_ppx)) - (preprocessor_deps ../../../../../graphql_schema.json - ../../../../graphql-ppx-config.inc) - (preprocess (pps ppx_deriving_yojson ppx_mina ppx_version - ppx_base ppx_assert ppx_bench ppx_bin_prot ppx_custom_printf - ppx_fields_conv ppx_fixed_literal ppx_here ppx_inline_test ppx_let - ppx_module_timer ppx_optional ppx_pipebang ppx_sexp_message - ppx_sexp_value ppx_string ppx_typerep_conv ppx_variants_conv - graphql_ppx -- %{read-lines:../../../../graphql-ppx-config.inc}))) + ;;opam libraries + stdio + integers + astring + async_ssl + sexplib0 + async.async_rpc + result + graphql + async_kernel + async_unix + uri + core_kernel + core_kernel.uuid + core + core.uuid + base + async + cohttp + graphql_parser + async.async_command + async_rpc_kernel + base.caml + base.base_internalhash_types + graphql-cohttp + cohttp-async + graphql-async + mirage-crypto-ec + base_quickcheck + ;;local libraries + bounded_types + snark_profiler_lib + archive_lib + mina_wire_types + perf_histograms + one_or_two + block_time + child_processes + mina_net2 + snark_worker + allocation_functor + blockchain_snark + genesis_ledger_helper.lib + transaction_inclusion_status + error_json + network_pool + user_command_input + network_peer + logger + itn_logger + coda_genesis_proof + data_hash_lib + currency + genesis_constants + bash_colors + graphql_lib + o1trace_webkit_event + generated_graphql_queries + itn_crypto + mina_transaction + mina_generators + mina_user_error + mina_ledger + mina_block + mina_lib + mina_base + cli_lib + mina_graphql + mina_state + consensus + mina_version + o1trace + protocol_version + node_error_service + genesis_ledger_helper + signature_lib + mina_base.import + mina_numbers + precomputed_values + with_hash + transaction_snark + transaction_snark_tests + transaction_protocol_state + test_util + file_system + daemon_rpcs + trust_system + secrets + participating_state + staged_ledger + mina_commands + mina_runtime_config + coda_genesis_ledger + mina_networking + sgn + unsigned_extended + mina_metrics + group_map + snark_work_lib + mina_compile_config + mina_transaction_logic + verifier + parallel + random_oracle + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + pickles_types + pickles + pickles.backend + snark_params + mina_signature_kind + string_sign + zkapp_command_builder + internal_tracing + transaction_snark_scan_state) + (instrumentation + (backend bisect_ppx)) + (preprocessor_deps + ../../../../../graphql_schema.json + ../../../../graphql-ppx-config.inc) + (preprocess + (pps + ppx_deriving_yojson + ppx_mina + ppx_version + ppx_base + ppx_assert + ppx_bench + ppx_bin_prot + ppx_custom_printf + ppx_fields_conv + ppx_fixed_literal + ppx_here + ppx_inline_test + ppx_let + ppx_module_timer + ppx_optional + ppx_pipebang + ppx_sexp_message + ppx_sexp_value + ppx_string + ppx_typerep_conv + ppx_variants_conv + graphql_ppx + -- + %{read-lines:../../../../graphql-ppx-config.inc}))) diff --git a/src/app/delegation_verify/dune b/src/app/delegation_verify/dune index af2363a72c9..90b52ac1f3a 100644 --- a/src/app/delegation_verify/dune +++ b/src/app/delegation_verify/dune @@ -1,49 +1,50 @@ (executable (name delegation_verify) (libraries - core_kernel - async - async_kernel - async_unix - core - stdio - base - base.caml - ppx_deriving_yojson.runtime - yojson - base64 - integers - async.async_command - sexplib0 - sexplib - hex - ; mina libs - signature_lib - mina_block - transaction_snark - blockchain_snark - mina_base - genesis_constants - uptime_service - currency - ledger_proof - mina_base.import - mina_state - mina_wire_types - consensus - data_hash_lib - mina_numbers - snark_params - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - pickles - pickles_types - pickles.backend - genesis_ledger_helper - mina_runtime_config - precomputed_values - logger - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_jane ppx_custom_printf h_list.ppx))) + core_kernel + async + async_kernel + async_unix + core + stdio + base + base.caml + ppx_deriving_yojson.runtime + yojson + base64 + integers + async.async_command + sexplib0 + sexplib + hex + ; mina libs + signature_lib + mina_block + transaction_snark + blockchain_snark + mina_base + genesis_constants + uptime_service + currency + ledger_proof + mina_base.import + mina_state + mina_wire_types + consensus + data_hash_lib + mina_numbers + snark_params + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + pickles + pickles_types + pickles.backend + genesis_ledger_helper + mina_runtime_config + precomputed_values + logger) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_jane ppx_custom_printf h_list.ppx))) diff --git a/src/app/disk_caching_stats/dune b/src/app/disk_caching_stats/dune index 57292875db8..6a8db8e8632 100644 --- a/src/app/disk_caching_stats/dune +++ b/src/app/disk_caching_stats/dune @@ -1,11 +1,45 @@ (executable (name disk_caching_stats) - (libraries pickles pickles_types pickles.backend snark_params crypto_params network_pool mina_base - signature_lib one_or_two currency ledger_proof mina_state mina_base.import mina_wire_types - mina_numbers random_oracle random_oracle_input kimchi_pasta.basic data_hash_lib with_hash - kimchi_pasta mina_ledger transaction_snark_scan_state mina_transaction_logic transaction_snark - sgn snark_profiler_lib genesis_constants digestif bigarray-compat - ; -- - core core_kernel base base.caml bin_prot splittable_random sexplib0) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_jane ppx_version))) + (libraries + pickles + pickles_types + pickles.backend + snark_params + crypto_params + network_pool + mina_base + signature_lib + one_or_two + currency + ledger_proof + mina_state + mina_base.import + mina_wire_types + mina_numbers + random_oracle + random_oracle_input + kimchi_pasta.basic + data_hash_lib + with_hash + kimchi_pasta + mina_ledger + transaction_snark_scan_state + mina_transaction_logic + transaction_snark + sgn + snark_profiler_lib + genesis_constants + digestif + bigarray-compat + ; -- + core + core_kernel + base + base.caml + bin_prot + splittable_random + sexplib0) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_jane ppx_version))) diff --git a/src/app/dump_blocks/dump_blocks.ml b/src/app/dump_blocks/dump_blocks.ml index f1ca08be9d4..8ecc364d923 100644 --- a/src/app/dump_blocks/dump_blocks.ml +++ b/src/app/dump_blocks/dump_blocks.ml @@ -8,10 +8,7 @@ open Full_frontier.For_tests Choice of the actual codec module depends on more than one CLI argument, which is why it must be delayed until all the CLI arguments are parsed. This choice is made by mk_io function below. *) -type 'a io = - { encoding : 'a - ; filename : string - } +type 'a io = { encoding : 'a; filename : string } type 'a codec = (module Encoding.S with type t = 'a) @@ -41,15 +38,20 @@ let encoded_block = Command.Arg_type.create (fun s -> match String.split ~on:':' s with | [ encoding; filename ] -> - { encoding= + { encoding = ( match String.lowercase encoding with - | "sexp" -> Encoding.Sexp - | "json" -> Json - | "bin" | "binary" -> Binary - | _ -> failwith "invalid encoding" ) + | "sexp" -> + Encoding.Sexp + | "json" -> + Json + | "bin" | "binary" -> + Binary + | _ -> + failwith "invalid encoding" ) ; filename } - | _ -> failwith "invalid format" ) + | _ -> + failwith "invalid format" ) let () = let open Core_kernel in @@ -62,18 +64,14 @@ let precomputed_values = Lazy.force Precomputed_values.for_unit_tests let constraint_constants = precomputed_values.constraint_constants -let output_block : type a. a -> a codec io -> unit - = fun content { encoding; filename } -> +let output_block : type a. a -> a codec io -> unit = + fun content { encoding; filename } -> let module Enc : Encoding.S with type t = a = (val encoding) in let channel = - match filename with - | "-" -> Out_channel.stdout - | s -> Out_channel.create s + match filename with "-" -> Out_channel.stdout | s -> Out_channel.create s in - fprintf channel "%s" (Enc.to_string content); - match filename with - | "-" -> () - | _ -> Out_channel.close channel + fprintf channel "%s" (Enc.to_string content) ; + match filename with "-" -> () | _ -> Out_channel.close channel (* This executable outputs random block to stderr in sexp and json The output is useful for src/lib/mina_block tests when the sexp/json representation changes. *) @@ -91,75 +89,67 @@ let f (type a) ?parent (outputs : a codec io list) make_breadcrumb = List.iter outputs ~f:(fun output -> let module Enc = (val output.encoding) in let content = - Enc.of_breadcrumb - ?with_parent_statehash:parent - breadcrumb + Enc.of_breadcrumb ?with_parent_statehash:parent breadcrumb in - eprintf !"Randomly generated block, %s: %s\n" + eprintf + !"Randomly generated block, %s: %s\n" Enc.name (match output.filename with "-" -> "" | s -> s) ; - output_block content output;); + output_block content output ) ; clean_up_persistent_root ~frontier ) let default_outputs = - [ { encoding= Encoding.Sexp; filename= "-" } - ; { encoding= Encoding.Json; filename= "-" } + [ { encoding = Encoding.Sexp; filename = "-" } + ; { encoding = Encoding.Json; filename = "-" } ] let command = Command.basic ~summary:"Transcribe between block formats or generate a random block" (let%map_open.Command outputs = - flag - "-o" - (listed encoded_block) - ~doc:"output :; formats are: sexp / json / bin; a dash (-) denotes stdout (example: -o json:-)" + flag "-o" (listed encoded_block) + ~doc: + "output :; formats are: sexp / json / bin; a dash (-) \ + denotes stdout (example: -o json:-)" and input = - flag - "-i" - (optional encoded_block) - ~doc:"input :; formats are: sexp / json / bin; a dash (-) denotes stdin (example: -i json:-)" + flag "-i" (optional encoded_block) + ~doc: + "input :; formats are: sexp / json / bin; a dash (-) \ + denotes stdin (example: -i json:-)" and full = - flag - "--full" - no_arg - ~doc:"use full blocks, not just precomputed values" + flag "--full" no_arg ~doc:"use full blocks, not just precomputed values" and parent = - flag - "--parent" - (optional string) - ~aliases:[ "--parent-statehash" ] + flag "--parent" (optional string) ~aliases:[ "--parent-statehash" ] ~doc:"statehash of the parent block" in - let outs = match outputs with - | [] -> default_outputs - | _ -> outputs - in + let outs = match outputs with [] -> default_outputs | _ -> outputs in let conf = if full then - Conf ( Option.map input ~f:(mk_io Block) - , List.map ~f:(mk_io Encoding.Block) outs) + Conf + ( Option.map input ~f:(mk_io Block) + , List.map ~f:(mk_io Encoding.Block) outs ) else - Conf ( Option.map input ~f:(mk_io Precomputed) - , List.map ~f:(mk_io Encoding.Precomputed) outs) + Conf + ( Option.map input ~f:(mk_io Precomputed) + , List.map ~f:(mk_io Encoding.Precomputed) outs ) in fun () -> - match conf with - | Conf (None, outs) -> - let verifier = verifier () in - Core_kernel.Quickcheck.test (gen_breadcrumb ~verifier ()) ~trials:1 ~f:(f ?parent outs) - | Conf (Some { encoding; filename }, outs)-> - let module Enc = (val encoding) in - let input = - match filename with - | "-" -> In_channel.stdin - | s -> In_channel.create s - in - let contents = - In_channel.input_all input - |> Enc.of_string - in - List.iter outs ~f:(output_block contents)) + match conf with + | Conf (None, outs) -> + let verifier = verifier () in + Core_kernel.Quickcheck.test + (gen_breadcrumb ~verifier ()) + ~trials:1 ~f:(f ?parent outs) + | Conf (Some { encoding; filename }, outs) -> + let module Enc = (val encoding) in + let input = + match filename with + | "-" -> + In_channel.stdin + | s -> + In_channel.create s + in + let contents = In_channel.input_all input |> Enc.of_string in + List.iter outs ~f:(output_block contents) ) let () = Command_unix.run command - diff --git a/src/app/dump_blocks/dune b/src/app/dump_blocks/dune index 1e499797f02..4c403c5a92d 100644 --- a/src/app/dump_blocks/dune +++ b/src/app/dump_blocks/dune @@ -2,27 +2,29 @@ (name dump_blocks) (public_name dump_blocks) (libraries - async - async_kernel - async_unix - base - block_time - bounded_types - core - core_kernel - core_unix.command_unix - logger - mina_base - mina_block - mina_state - mina_wire_types - ppx_inline_test.runner.lib - precomputed_values - sexplib0 - transition_frontier - transition_frontier_base - transition_frontier_full_frontier - yojson) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_custom_printf)) + async + async_kernel + async_unix + base + block_time + bounded_types + core + core_kernel + core_unix.command_unix + logger + mina_base + mina_block + mina_state + mina_wire_types + ppx_inline_test.runner.lib + precomputed_values + sexplib0 + transition_frontier + transition_frontier_base + transition_frontier_full_frontier + yojson) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_custom_printf)) (modes native)) diff --git a/src/app/dump_blocks/encoding.ml b/src/app/dump_blocks/encoding.ml index 1a246a1a2b9..dba55a5b52a 100644 --- a/src/app/dump_blocks/encoding.ml +++ b/src/app/dump_blocks/encoding.ml @@ -12,52 +12,49 @@ let block_of_breadcrumb ?with_parent_statehash breadcrumb = let open Mina_block in let block = Frontier_base.Breadcrumb.block breadcrumb in match with_parent_statehash with - | None -> - block - | Some hash -> - let previous_state_hash = Mina_base.State_hash.of_base58_check_exn hash in - let h = header block in - let state = Header.protocol_state h in - let header = - Header.create - ~protocol_state:{ state with previous_state_hash } - ~protocol_state_proof:(Header.protocol_state_proof h) - ~delta_block_chain_proof:(Header.delta_block_chain_proof h) - ?proposed_protocol_version_opt:(Header.proposed_protocol_version_opt h) - ~current_protocol_version:(Header.current_protocol_version h) - () - in - Mina_block.create ~header ~body:(body block) + | None -> + block + | Some hash -> + let previous_state_hash = Mina_base.State_hash.of_base58_check_exn hash in + let h = header block in + let state = Header.protocol_state h in + let header = + Header.create + ~protocol_state:{ state with previous_state_hash } + ~protocol_state_proof:(Header.protocol_state_proof h) + ~delta_block_chain_proof:(Header.delta_block_chain_proof h) + ?proposed_protocol_version_opt: + (Header.proposed_protocol_version_opt h) + ~current_protocol_version:(Header.current_protocol_version h) + () + in + Mina_block.create ~header ~body:(body block) module type S = sig type t val name : string - val of_breadcrumb : ?with_parent_statehash:string -> Frontier_base.Breadcrumb.t -> t + + val of_breadcrumb : + ?with_parent_statehash:string -> Frontier_base.Breadcrumb.t -> t val to_string : t -> string + val of_string : string -> t end -module Sexp_block : S with type t = Mina_block.t = struct +module Sexp_block : S with type t = Mina_block.t = struct type t = Mina_block.t let name = "sexp" let of_breadcrumb = block_of_breadcrumb + let to_string b = Mina_block.sexp_of_t b |> Sexp.to_string |> append_newline - let to_string b = - Mina_block.sexp_of_t b - |> Sexp.to_string - |> append_newline - - let of_string s = - Sexp.of_string s - |> Mina_block.t_of_sexp + let of_string s = Sexp.of_string s |> Mina_block.t_of_sexp end - module Binary_block : S with type t = Mina_block.t = struct type t = Mina_block.t @@ -84,16 +81,14 @@ let constraint_constants = precomputed_values.constraint_constants let precomputed_of_breadcrumb ?with_parent_statehash breadcrumb = let open Frontier_base in let block = block_of_breadcrumb ?with_parent_statehash breadcrumb in - let staged_ledger = - Transition_frontier.Breadcrumb.staged_ledger breadcrumb - in + let staged_ledger = Transition_frontier.Breadcrumb.staged_ledger breadcrumb in let scheduled_time = Mina_block.(Header.protocol_state @@ header block) |> Mina_state.Protocol_state.blockchain_state |> Mina_state.Blockchain_state.timestamp in - Mina_block.Precomputed.of_block ~logger ~constraint_constants - ~staged_ledger ~scheduled_time + Mina_block.Precomputed.of_block ~logger ~constraint_constants ~staged_ledger + ~scheduled_time (Breadcrumb.block_with_hash breadcrumb) module Sexp_precomputed : S with type t = Mina_block.Precomputed.t = struct @@ -104,16 +99,12 @@ module Sexp_precomputed : S with type t = Mina_block.Precomputed.t = struct let of_breadcrumb = precomputed_of_breadcrumb let to_string b = - Mina_block.Precomputed.sexp_of_t b - |> Sexp.to_string - |> append_newline + Mina_block.Precomputed.sexp_of_t b |> Sexp.to_string |> append_newline - let of_string s = - Sexp.of_string s - |> Mina_block.Precomputed.t_of_sexp + let of_string s = Sexp.of_string s |> Mina_block.Precomputed.t_of_sexp end -module Json_precomputed : S with type t = Mina_block.Precomputed.t = struct +module Json_precomputed : S with type t = Mina_block.Precomputed.t = struct type t = Mina_block.Precomputed.t let name = "json" @@ -122,12 +113,10 @@ module Json_precomputed : S with type t = Mina_block.Precomputed.t = struct let to_string b = Mina_block.Precomputed.to_yojson b - |> Yojson.Safe.to_string - |> append_newline + |> Yojson.Safe.to_string |> append_newline let of_string s = - Yojson.Safe.from_string s - |> Mina_block.Precomputed.of_yojson + Yojson.Safe.from_string s |> Mina_block.Precomputed.of_yojson |> Result.ok_or_failwith end @@ -138,9 +127,7 @@ module Binary_precomputed : S with type t = Mina_block.Precomputed.t = struct let of_breadcrumb = precomputed_of_breadcrumb - let to_string = - Binable.to_string (module Mina_block.Precomputed.Stable.Latest) + let to_string = Binable.to_string (module Mina_block.Precomputed.Stable.Latest) - let of_string = - Binable.of_string (module Mina_block.Precomputed.Stable.Latest) + let of_string = Binable.of_string (module Mina_block.Precomputed.Stable.Latest) end diff --git a/src/app/extract_blocks/dune b/src/app/extract_blocks/dune index a41ea72fc19..1b31d5f0471 100644 --- a/src/app/extract_blocks/dune +++ b/src/app/extract_blocks/dune @@ -3,47 +3,55 @@ (name extract_blocks) (public_name extract_blocks) (libraries - ;; opam libraries - async_unix - core - base - base64 - integers - caqti-async - caqti-driver-postgresql - async - core_kernel - caqti - async_kernel - uri - async.async_command - ;; local libraries - consensus.vrf - mina_wire_types - bounded_types - mina_base - mina_base.import - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - pickles - pickles_types - pickles.backend - archive_lib - data_hash_lib - signature_lib - logger - mina_caqti - block_time - mina_numbers - mina_transaction - protocol_version - snark_params - currency - unsigned_extended - sgn - with_hash - error_json - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv h_list.ppx))) + ;; opam libraries + async_unix + core + base + base64 + integers + caqti-async + caqti-driver-postgresql + async + core_kernel + caqti + async_kernel + uri + async.async_command + ;; local libraries + consensus.vrf + mina_wire_types + bounded_types + mina_base + mina_base.import + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + pickles + pickles_types + pickles.backend + archive_lib + data_hash_lib + signature_lib + logger + mina_caqti + block_time + mina_numbers + mina_transaction + protocol_version + snark_params + currency + unsigned_extended + sgn + with_hash + error_json) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_version + ppx_mina + ppx_let + ppx_hash + ppx_compare + ppx_sexp_conv + h_list.ppx))) diff --git a/src/app/generate_keypair/dune b/src/app/generate_keypair/dune index 1a987e63659..6ef13957692 100644 --- a/src/app/generate_keypair/dune +++ b/src/app/generate_keypair/dune @@ -4,6 +4,8 @@ (public_name generate_keypair) (modes native) (libraries cli_lib async core_kernel mina_version async_unix bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_sexp_conv)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) diff --git a/src/app/graphql_schema_dump/dune b/src/app/graphql_schema_dump/dune index 7116105997b..6294dcf3ae4 100644 --- a/src/app/graphql_schema_dump/dune +++ b/src/app/graphql_schema_dump/dune @@ -1,5 +1,16 @@ (executable (name graphql_schema_dump) - (libraries graphql_parser mina_version mina_graphql async async_unix graphql-async yojson bounded_types genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + graphql_parser + mina_version + mina_graphql + async + async_unix + graphql-async + yojson + bounded_types + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/heap_usage/dune b/src/app/heap_usage/dune index a74b285b81f..e9b41204cb6 100644 --- a/src/app/heap_usage/dune +++ b/src/app/heap_usage/dune @@ -3,57 +3,58 @@ (name heap_usage) (public_name heap_usage) (libraries - ;; opam libraries - async_unix - core - result - async_kernel - stdio - async - core_kernel - base - base.caml - base.base_internalhash_types - async.async_command - yojson - sexplib0 - ;; local libraries - mina_block ; temp - mina_base - mina_base.import - mina_numbers - currency - bounded_types - data_hash_lib - signature_lib - merkle_ledger - mina_compile_config - mina_ledger - mina_state - mina_transaction_logic - genesis_constants - staged_ledger_diff - parallel_scan - pickles - pickles.backend - pickles_types - transaction_snark - transaction_snark_scan_state - ledger_proof - blake2 - mina_generators - with_hash - random_oracle - snark_params - crypto_params - kimchi_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - zkapp_command_builder - transaction_snark_tests - snark_profiler_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + async_unix + core + result + async_kernel + stdio + async + core_kernel + base + base.caml + base.base_internalhash_types + async.async_command + yojson + sexplib0 + ;; local libraries + mina_block ; temp + mina_base + mina_base.import + mina_numbers + currency + bounded_types + data_hash_lib + signature_lib + merkle_ledger + mina_compile_config + mina_ledger + mina_state + mina_transaction_logic + genesis_constants + staged_ledger_diff + parallel_scan + pickles + pickles.backend + pickles_types + transaction_snark + transaction_snark_scan_state + ledger_proof + blake2 + mina_generators + with_hash + random_oracle + snark_params + crypto_params + kimchi_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + zkapp_command_builder + transaction_snark_tests + snark_profiler_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) diff --git a/src/app/ledger_export_bench/dune b/src/app/ledger_export_bench/dune index 2352ffd4130..6ee4c2a05c7 100644 --- a/src/app/ledger_export_bench/dune +++ b/src/app/ledger_export_bench/dune @@ -1,15 +1,17 @@ (executable (name ledger_export_benchmark) (libraries - base - core - core_bench - core_kernel - yojson - ; mina libraries - mina_runtime_config) + base + core + core_bench + core_kernel + yojson + ; mina libraries + mina_runtime_config) ; the -w list here should be the same as in src/dune (flags -short-paths -g -w @a-4-29-40-41-42-44-45-48-58-59-60) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane)) (modes native)) diff --git a/src/app/logproc/dune b/src/app/logproc/dune index 4d38e6278e4..77ac3b6d14e 100644 --- a/src/app/logproc/dune +++ b/src/app/logproc/dune @@ -3,20 +3,21 @@ (public_name logproc) (modules logproc) (libraries - ;;opam libraries - result - stdio - core - yojson - cmdliner - core_kernel - ppx_deriving_yojson.runtime - ;;local libraries - logger - logproc_lib - bounded_types - bash_colors - interpolator_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_jane ppx_deriving.std))) + ;;opam libraries + result + stdio + core + yojson + cmdliner + core_kernel + ppx_deriving_yojson.runtime + ;;local libraries + logger + logproc_lib + bounded_types + bash_colors + interpolator_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane ppx_deriving.std))) diff --git a/src/app/logproc/logproc.ml b/src/app/logproc/logproc.ml index 8c519b962f1..44a1f7d3fa9 100644 --- a/src/app/logproc/logproc.ml +++ b/src/app/logproc/logproc.ml @@ -81,8 +81,9 @@ let process_line ~timezone ~interpolation_config ~filter line = type parser_state = | Start_of_line - | Processable_line of {line_start_pos: int; previous_elements: string list} - | Unprocessable_line of {line_start_pos: int} + | Processable_line of + { line_start_pos : int; previous_elements : string list } + | Unprocessable_line of { line_start_pos : int } (* Iterates over lines prefixed by `prefix`, invoking `on_hit` for each * line. If a line does not start with `prefix`, `on_miss` is invoked, @@ -105,11 +106,11 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit match state with | Start_of_line -> failwith "cannot extract start of line state" - | Processable_line {line_start_pos; previous_elements} -> + | Processable_line { line_start_pos; previous_elements } -> let this_element = extract_input_string line_start_pos i in let elements = List.rev (this_element :: previous_elements) in on_hit (String.concat elements ~sep:"") - | Unprocessable_line {line_start_pos} -> + | Unprocessable_line { line_start_pos } -> forward_input line_start_pos i ; Out_channel.output_char output_channel '\n' in @@ -117,14 +118,15 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit match state with | Start_of_line -> Start_of_line - | Processable_line {line_start_pos; previous_elements} -> + | Processable_line { line_start_pos; previous_elements } -> let this_element = extract_input_string line_start_pos buf_len in Processable_line - { line_start_pos= 0 - ; previous_elements= this_element :: previous_elements } - | Unprocessable_line {line_start_pos} -> + { line_start_pos = 0 + ; previous_elements = this_element :: previous_elements + } + | Unprocessable_line { line_start_pos } -> forward_input line_start_pos buf_len ; - Unprocessable_line {line_start_pos= 0} + Unprocessable_line { line_start_pos = 0 } in let parse_char ~buf_len i state = if i >= buf_len then `Stop (carryover_state ~buf_len state) @@ -133,10 +135,10 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit | Start_of_line -> let next_state = if Char.equal (Bytes.unsafe_get input_buffer i) prefix then - Processable_line {line_start_pos= i; previous_elements= []} + Processable_line { line_start_pos = i; previous_elements = [] } else ( on_miss () ; - Unprocessable_line {line_start_pos= i} ) + Unprocessable_line { line_start_pos = i } ) in `Continue next_state | Processable_line _ | Unprocessable_line _ -> @@ -209,9 +211,9 @@ let () = Arg.( value & opt - (enum [("hidden", Hidden); ("inline", Inline); ("after", After)]) + (enum [ ("hidden", Hidden); ("inline", Inline); ("after", After) ]) Inline - & info ["i"; "interpolation-mode"] ~docv:"MODE" ~doc) + & info [ "i"; "interpolation-mode" ] ~docv:"MODE" ~doc) in let max_interpolation_length = let doc = @@ -221,16 +223,17 @@ let () = Arg.( value & opt int 25 & info - ["m"; "max-interpolation-length"] + [ "m"; "max-interpolation-length" ] ~docv:"MAX_INTERPOLATION_LENGTH" ~doc) in let pretty_print = let doc = "Pretty print json values." in - Arg.(value & flag & info ["p"; "pretty-print"] ~docv:"PRETTY_PRINT" ~doc) + Arg.( + value & flag & info [ "p"; "pretty-print" ] ~docv:"PRETTY_PRINT" ~doc) in let lift_interpolation_config mode max_interpolation_length pretty_print = let open Interpolator in - {mode; max_interpolation_length; pretty_print} + { mode; max_interpolation_length; pretty_print } in Term.( const lift_interpolation_config @@ -240,23 +243,23 @@ let () = let doc = "Timezone to display timestamps in. Defaults to the system's timezone." in - Arg.(value & opt string "" & info ["z"; "zone"] ~docv:"TIMEZONE" ~doc) + Arg.(value & opt string "" & info [ "z"; "zone" ] ~docv:"TIMEZONE" ~doc) in let filter = let doc = "Filter displayed log lines. The filter language has similar syntax to \ - javascript, with a few notable differences. Similar to \"jq\", doing \ - an anymous access like \"[\"a\"]\" or \".a\" will refer to that key on \ - the javascript object being processed, which in the context of \ - logproc, is the json log entry itself. Basic literals (such as strings \ - and integers) are supported, as is structural equality (\"==\") and \ - boolean operations (\"!\", \"&&\", \"||\"). There is also support for \ - the \"in\" operator for checking existence in arrays (works like \ + javascript, with a few notable differences. Similar to \"jq\", doing an \ + anymous access like \"[\"a\"]\" or \".a\" will refer to that key on the \ + javascript object being processed, which in the context of logproc, is \ + the json log entry itself. Basic literals (such as strings and \ + integers) are supported, as is structural equality (\"==\") and boolean \ + operations (\"!\", \"&&\", \"||\"). There is also support for the \ + \"in\" operator for checking existence in arrays (works like \ javascript, not like jq). Regexes can also be expressed \ (\"/some_regex/\") and can be matched on using a special \"match\" \ operator. See examples for more information." in - Arg.(value & opt string "" & info ["f"; "filter"] ~docv:"FILTER" ~doc) + Arg.(value & opt string "" & info [ "f"; "filter" ] ~docv:"FILTER" ~doc) in let main_term = Term.(const main $ timezone $ interpolation_config $ filter) @@ -289,7 +292,8 @@ let () = ; `I ( "a complex filter:" , {|logproc -f '.message match /broadcast/ && .metadata.peer.host == "182.9.63.3" || .metadata.peer.discover_port == 8302|} - ) ] + ) + ] in Term.info ~version:"0.1" ~doc ~exits:Term.default_exits ~man "logproc" in diff --git a/src/app/missing_blocks_auditor/dune b/src/app/missing_blocks_auditor/dune index 49e9020bc1c..a08801fafa2 100644 --- a/src/app/missing_blocks_auditor/dune +++ b/src/app/missing_blocks_auditor/dune @@ -3,21 +3,22 @@ (name missing_blocks_auditor) (public_name missing_blocks_auditor) (libraries - ;; opam libraries - core - async_kernel - uri - caqti-driver-postgresql - caqti - async - core_kernel - caqti-async - base - async_unix - async.async_command - ;; local libraries - logger - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let))) + ;; opam libraries + core + async_kernel + uri + caqti-driver-postgresql + caqti + async + core_kernel + caqti-async + base + async_unix + async.async_command + ;; local libraries + logger + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_let))) diff --git a/src/app/print_blockchain_snark_vk/dune b/src/app/print_blockchain_snark_vk/dune index 28872e1df1e..ad5287fc4fd 100644 --- a/src/app/print_blockchain_snark_vk/dune +++ b/src/app/print_blockchain_snark_vk/dune @@ -1,19 +1,23 @@ (executable (name print_blockchain_snark_vk) - (libraries - blockchain_snark genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries blockchain_snark genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (rule (deps print_blockchain_snark_vk.exe) (targets blockchain_snark_vk.json.computed) (action - (with-stdout-to %{targets} + (with-stdout-to + %{targets} (run %{deps})))) (rule - (deps (:orig blockchain_snark_vk.json) (:computed blockchain_snark_vk.json.computed)) + (deps + (:orig blockchain_snark_vk.json) + (:computed blockchain_snark_vk.json.computed)) (alias runtest) (action (diff %{orig} %{computed}))) diff --git a/src/app/reformat/dune b/src/app/reformat/dune index e069e49a5da..c0fbc0fa245 100644 --- a/src/app/reformat/dune +++ b/src/app/reformat/dune @@ -1,7 +1,14 @@ (executable (name reformat) (public_name reformat) - (libraries core async async_kernel async_unix core_kernel sexplib0 async.async_command) + (libraries + core + async + async_kernel + async_unix + core_kernel + sexplib0 + async.async_command) (preprocess (pps ppx_jane)) ; the -w list here should be the same as in src/dune diff --git a/src/app/reformat/reformat.ml b/src/app/reformat/reformat.ml index 0ea294650e1..e71dad30c28 100644 --- a/src/app/reformat/reformat.ml +++ b/src/app/reformat/reformat.ml @@ -19,7 +19,8 @@ let dirs_trustlist = ; "snarky" ; "_opam" ; "opam_switches" - ; ".direnv" ] + ; ".direnv" + ] let rec fold_over_files ~path ~process_path ~init ~f = let%bind all = Sys.ls_dir path in @@ -42,11 +43,11 @@ let main dry_run check path = | `Dir -> not (List.exists dirs_trustlist ~f:(fun s -> - String.is_suffix ~suffix:s path )) + String.is_suffix ~suffix:s path ) ) | `File -> (not (List.exists trustlist ~f:(fun s -> - String.is_suffix ~suffix:s path ))) + String.is_suffix ~suffix:s path ) ) ) && ( String.is_suffix ~suffix:".ml" path || String.is_suffix ~suffix:".mli" path ) ) ~f:(fun () file -> @@ -55,7 +56,7 @@ let main dry_run check path = return () in if check then - let prog, args = ("ocamlformat", ["--doc-comments=before"; file]) in + let prog, args = ("ocamlformat", [ "--doc-comments=before"; file ]) in let%bind formatted = Process.run_exn ~prog ~args () in let%bind raw = Reader.file_contents file in if not (String.equal formatted raw) then ( @@ -64,7 +65,7 @@ let main dry_run check path = else return () else let prog, args = - ("ocamlformat", ["--doc-comments=before"; "-i"; file]) + ("ocamlformat", [ "--doc-comments=before"; "-i"; file ]) in if dry_run then dump prog args else @@ -77,16 +78,16 @@ let _cli = let open Command.Let_syntax in Command.async ~summary:"Format all ml and mli files" (let%map_open path = - flag "--path" ~aliases:["path"] ~doc:"Path to traverse" + flag "--path" ~aliases:[ "path" ] ~doc:"Path to traverse" (required string) - and dry_run = flag "--dry-run" ~aliases:["dry-run"] no_arg ~doc:"Dry run" + and dry_run = flag "--dry-run" ~aliases:[ "dry-run" ] no_arg ~doc:"Dry run" and check = - flag "--check" ~aliases:["check"] no_arg + flag "--check" ~aliases:[ "check" ] no_arg ~doc: "Return with an error code if there exists an ml file that was \ formatted improperly" in - fun () -> main dry_run check path) + fun () -> main dry_run check path ) |> Command.run let () = never_returns (Scheduler.go ()) diff --git a/src/app/replayer/dune b/src/app/replayer/dune index 394d304b180..8cd2e071d22 100644 --- a/src/app/replayer/dune +++ b/src/app/replayer/dune @@ -3,66 +3,74 @@ (name replayer) (public_name replayer) (libraries - ;; opam libraries - stdio - sexplib0 - result - async.async_command - async - base.caml - bin_prot.shape - caqti-async - core_kernel - archive_lib - caqti-driver-postgresql - async_kernel - core - yojson - caqti - base - base.base_internalhash_types - uri - integers - async_unix - ;; local libraries - mina_wire_types - with_hash - snark_params - crypto_params - pickles_types - mina_numbers - coda_genesis_ledger - currency - pickles.backend - signature_lib - genesis_ledger_helper.lib - genesis_ledger_helper - mina_state - mina_ledger - mina_base - bounded_types - mina_base.import - mina_transaction - mina_transaction_logic - mina_caqti - genesis_constants - mina_runtime_config - logger - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - kimchi_backend_common - block_time - data_hash_lib - pickles - sgn - unsigned_extended - random_oracle - codable - ppx_version.runtime - cli_lib - mina_version - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx))) + ;; opam libraries + stdio + sexplib0 + result + async.async_command + async + base.caml + bin_prot.shape + caqti-async + core_kernel + archive_lib + caqti-driver-postgresql + async_kernel + core + yojson + caqti + base + base.base_internalhash_types + uri + integers + async_unix + ;; local libraries + mina_wire_types + with_hash + snark_params + crypto_params + pickles_types + mina_numbers + coda_genesis_ledger + currency + pickles.backend + signature_lib + genesis_ledger_helper.lib + genesis_ledger_helper + mina_state + mina_ledger + mina_base + bounded_types + mina_base.import + mina_transaction + mina_transaction_logic + mina_caqti + genesis_constants + mina_runtime_config + logger + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + kimchi_backend_common + block_time + data_hash_lib + pickles + sgn + unsigned_extended + random_oracle + codable + ppx_version.runtime + cli_lib + mina_version) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/rosetta/dune b/src/app/rosetta/dune index 83be7c2bc27..d1120e13d02 100644 --- a/src/app/rosetta/dune +++ b/src/app/rosetta/dune @@ -4,10 +4,19 @@ (public_name rosetta) (modules rosetta) (modes native) - (libraries lib async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package rosetta) @@ -15,10 +24,20 @@ (public_name rosetta-testnet) (modules rosetta_testnet_signatures) (modes native) - (libraries lib mina_signature_kind.testnet async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + mina_signature_kind.testnet + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package rosetta) @@ -26,7 +45,17 @@ (public_name rosetta-mainnet) (modules rosetta_mainnet_signatures) (modes native) - (libraries lib mina_signature_kind.mainnet async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + mina_signature_kind.mainnet + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/rosetta/lib/dune b/src/app/rosetta/lib/dune index 9c6bf25cd02..7515da8d47c 100644 --- a/src/app/rosetta/lib/dune +++ b/src/app/rosetta/lib/dune @@ -51,8 +51,7 @@ hex mina_numbers mina_transaction - mina_version - ) + mina_version) (preprocessor_deps ../../../graphql-ppx-config.inc ../../../../graphql_schema.json) diff --git a/src/app/rosetta/ocaml-signer/dune b/src/app/rosetta/ocaml-signer/dune index f72365e98d9..f4ac9458523 100644 --- a/src/app/rosetta/ocaml-signer/dune +++ b/src/app/rosetta/ocaml-signer/dune @@ -3,40 +3,39 @@ (public_name signer.cli) (modules signer_cli) (libraries - ;;opam libraries - async_kernel - core - core_kernel - async - base - lib - async_unix - async.async_command - ;;local libraries - kimchi_pasta - kimchi_pasta.basic - pickles - rosetta_coding - rosetta_lib - string_sign - signature_lib - mina_base - snark_params - pickles.backend - secrets - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + ;;opam libraries + async_kernel + core + core_kernel + async + base + lib + async_unix + async.async_command + ;;local libraries + kimchi_pasta + kimchi_pasta.basic + pickles + rosetta_coding + rosetta_lib + string_sign + signature_lib + mina_base + snark_params + pickles.backend + secrets) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -45,18 +44,18 @@ (modes native) (modules signer) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -65,18 +64,18 @@ (modes native) (modules signer_testnet_signatures) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -85,15 +84,15 @@ (modes native) (modules signer_mainnet_signatures) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) diff --git a/src/app/runtime_genesis_ledger/dune b/src/app/runtime_genesis_ledger/dune index 0a1191a086d..a6dba29e46b 100644 --- a/src/app/runtime_genesis_ledger/dune +++ b/src/app/runtime_genesis_ledger/dune @@ -2,28 +2,29 @@ (name runtime_genesis_ledger) (public_name runtime_genesis_ledger) (libraries - ;;opam libraries - base - core_kernel - async_kernel - async - core - result - async.async_command - yojson - async_unix - ;;local libraries - genesis_constants - mina_runtime_config - mina_ledger - genesis_ledger_helper - bounded_types - logger - cache_dir - precomputed_values - coda_genesis_ledger - consensus - mina_base - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let ppx_deriving_yojson))) + ;;opam libraries + base + core_kernel + async_kernel + async + core + result + async.async_command + yojson + async_unix + ;;local libraries + genesis_constants + mina_runtime_config + mina_ledger + genesis_ledger_helper + bounded_types + logger + cache_dir + precomputed_values + coda_genesis_ledger + consensus + mina_base) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_let ppx_deriving_yojson))) diff --git a/src/app/snark_work_debugger/dune b/src/app/snark_work_debugger/dune index 0f8b91aaea9..9eda39a4279 100644 --- a/src/app/snark_work_debugger/dune +++ b/src/app/snark_work_debugger/dune @@ -4,33 +4,40 @@ (public_name snark_work_debugger) (modes native) (libraries - ;; opam libraries - base - async - async_kernel - async_unix - unix - core - core_kernel - sexplib0 - ;; local libraries - mina_base - snark_worker - bounded_types - snark_work_lib - transaction_witness - transaction_snark - genesis_constants - logger - error_json - transaction_protocol_state - mina_state - currency - mina_ledger - signature_lib - mina_base.import - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_here ppx_custom_printf ppx_version ppx_mina ppx_let ppx_deriving_yojson ppx_sexp_conv)) + ;; opam libraries + base + async + async_kernel + async_unix + unix + core + core_kernel + sexplib0 + ;; local libraries + mina_base + snark_worker + bounded_types + snark_work_lib + transaction_witness + transaction_snark + genesis_constants + logger + error_json + transaction_protocol_state + mina_state + currency + mina_ledger + signature_lib + mina_base.import) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_here + ppx_custom_printf + ppx_version + ppx_mina + ppx_let + ppx_deriving_yojson + ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) - diff --git a/src/app/validate_keypair/dune b/src/app/validate_keypair/dune index 78e187b0fa9..4346b5856f5 100644 --- a/src/app/validate_keypair/dune +++ b/src/app/validate_keypair/dune @@ -4,15 +4,16 @@ (public_name validate_keypair) (modes native) (libraries - ;; opam libraries - core_kernel - async - async_unix - ;; local libraries - mina_version - bounded_types - cli_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_sexp_conv)) + ;; opam libraries + core_kernel + async + async_unix + ;; local libraries + mina_version + bounded_types + cli_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) diff --git a/src/app/zkapp_limits/dune b/src/app/zkapp_limits/dune index 6cb781b71b2..2c50a3c87ac 100644 --- a/src/app/zkapp_limits/dune +++ b/src/app/zkapp_limits/dune @@ -3,14 +3,22 @@ (name zkapp_limits) (public_name zkapp_limits) (libraries - ;; opam libraries - base - base.caml - core_kernel - ;; local libraries - mina_base - genesis_constants - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_custom_printf ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + base + base.caml + core_kernel + ;; local libraries + mina_base + genesis_constants + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_version + ppx_mina + ppx_custom_printf + ppx_let + ppx_hash + ppx_compare + ppx_sexp_conv))) diff --git a/src/app/zkapp_test_transaction/dune b/src/app/zkapp_test_transaction/dune index ca1edcbdd3c..c81e6d48a82 100644 --- a/src/app/zkapp_test_transaction/dune +++ b/src/app/zkapp_test_transaction/dune @@ -3,24 +3,34 @@ (name zkapp_test_transaction) (public_name zkapp_test_transaction) (libraries - ;;opam libraries - async.async_command - base - core_kernel - core - async_kernel - zkapp_test_transaction_lib - async - async_unix - ;;local libraries - mina_graphql - mina_numbers - currency - bounded_types - cli_lib - mina_base - signature_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_custom_printf ppx_mina ppx_assert ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx))) + ;;opam libraries + async.async_command + base + core_kernel + core + async_kernel + zkapp_test_transaction_lib + async + async_unix + ;;local libraries + mina_graphql + mina_numbers + currency + bounded_types + cli_lib + mina_base + signature_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_custom_printf + ppx_mina + ppx_assert + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/zkapp_test_transaction/lib/dune b/src/app/zkapp_test_transaction/lib/dune index 3b0f5a18ded..81420ca2622 100644 --- a/src/app/zkapp_test_transaction/lib/dune +++ b/src/app/zkapp_test_transaction/lib/dune @@ -2,58 +2,69 @@ (name zkapp_test_transaction_lib) (public_name zkapp_test_transaction_lib) (libraries - ;;opam libraries - async_unix - graphql_parser - splittable_random - result - async - async_kernel - core - core_kernel - base - sexplib0 - base_quickcheck - ppx_inline_test.config - graphql-async - ;;local libraries - pickles - kimchi_pasta - kimchi_pasta.basic - bounded_types - random_oracle - mina_runtime_config - transaction_witness - transaction_protocol_state - coda_genesis_ledger - pickles_types - mina_numbers - random_oracle_input - genesis_ledger_helper - mina_state - mina_generators - mina_base - currency - mina_ledger - mina_graphql - genesis_constants - secrets - transaction_snark - signature_lib - data_hash_lib - consensus - with_hash - genesis_ledger_helper.lib - snark_params - pickles.backend - kimchi_backend - mina_base.import - mina_transaction_logic - mina_transaction - staged_ledger_diff - mina_wire_types - ) - (inline_tests (flags -verbose -show-counts)) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_custom_printf ppx_mina ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx ppx_inline_test))) + ;;opam libraries + async_unix + graphql_parser + splittable_random + result + async + async_kernel + core + core_kernel + base + sexplib0 + base_quickcheck + ppx_inline_test.config + graphql-async + ;;local libraries + pickles + kimchi_pasta + kimchi_pasta.basic + bounded_types + random_oracle + mina_runtime_config + transaction_witness + transaction_protocol_state + coda_genesis_ledger + pickles_types + mina_numbers + random_oracle_input + genesis_ledger_helper + mina_state + mina_generators + mina_base + currency + mina_ledger + mina_graphql + genesis_constants + secrets + transaction_snark + signature_lib + data_hash_lib + consensus + with_hash + genesis_ledger_helper.lib + snark_params + pickles.backend + kimchi_backend + mina_base.import + mina_transaction_logic + mina_transaction + staged_ledger_diff + mina_wire_types) + (inline_tests + (flags -verbose -show-counts)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_custom_printf + ppx_mina + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx + ppx_inline_test))) diff --git a/src/app/zkapps_examples/add_events/dune b/src/app/zkapps_examples/add_events/dune index 618100a98a1..d8b70325b92 100644 --- a/src/app/zkapps_examples/add_events/dune +++ b/src/app/zkapps_examples/add_events/dune @@ -1,19 +1,20 @@ (library (name zkapps_add_events) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - mina_base - pickles - pickles_types - snarky.backendless - snark_params - signature_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + mina_base + pickles + pickles_types + snarky.backendless + snark_params + signature_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess (pps ppx_version))) diff --git a/src/app/zkapps_examples/calls/dune b/src/app/zkapps_examples/calls/dune index eaaa1d87239..0bf875a0810 100644 --- a/src/app/zkapps_examples/calls/dune +++ b/src/app/zkapps_examples/calls/dune @@ -1,33 +1,32 @@ (library (name zkapps_calls) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - mina_base.import - pickles - pickles.backend - pickles_types - random_oracle - random_oracle_input - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - with_hash - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + mina_base.import + pickles + pickles.backend + pickles_types + random_oracle + random_oracle_input + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + with_hash + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version - h_list.ppx))) + (pps ppx_version h_list.ppx))) diff --git a/src/app/zkapps_examples/dune b/src/app/zkapps_examples/dune index 1db21807142..393112daabf 100644 --- a/src/app/zkapps_examples/dune +++ b/src/app/zkapps_examples/dune @@ -2,36 +2,35 @@ (name zkapps_examples) (public_name zkapps_examples) (libraries - ;; opam libraries - base - async_kernel - core_kernel - ;; local libraries - mina_numbers - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - mina_base.import - mina_ledger - pickles - pickles.backend - pickles_types - random_oracle - random_oracle_input - snarky.backendless - snark_params - bounded_types - sgn - signature_lib - tuple_lib - with_hash) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + async_kernel + core_kernel + ;; local libraries + mina_numbers + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + mina_base.import + mina_ledger + pickles + pickles.backend + pickles_types + random_oracle + random_oracle_input + snarky.backendless + snark_params + bounded_types + sgn + signature_lib + tuple_lib + with_hash) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_let - ppx_version))) + (pps ppx_let ppx_version))) diff --git a/src/app/zkapps_examples/empty_update/dune b/src/app/zkapps_examples/empty_update/dune index 10790066528..11e0c98a278 100644 --- a/src/app/zkapps_examples/empty_update/dune +++ b/src/app/zkapps_examples/empty_update/dune @@ -1,28 +1,28 @@ (library (name zkapps_empty_update) (libraries - ;; opam libraries - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - pickles - pickles.backend - pickles_types - random_oracle - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + pickles + pickles.backend + pickles_types + random_oracle + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version))) + (pps ppx_version))) diff --git a/src/app/zkapps_examples/initialize_state/dune b/src/app/zkapps_examples/initialize_state/dune index 5dc9bcf172f..63590bd026c 100644 --- a/src/app/zkapps_examples/initialize_state/dune +++ b/src/app/zkapps_examples/initialize_state/dune @@ -1,29 +1,29 @@ (library (name zkapps_initialize_state) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - pickles - pickles.backend - pickles_types - random_oracle - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + pickles + pickles.backend + pickles_types + random_oracle + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version))) + (pps ppx_version))) diff --git a/src/app/zkapps_examples/test/actions/dune b/src/app/zkapps_examples/test/actions/dune index baa85f43623..3c02027061c 100644 --- a/src/app/zkapps_examples/test/actions/dune +++ b/src/app/zkapps_examples/test/actions/dune @@ -40,7 +40,8 @@ zkapps_examples yojson mina_wire_types) - (inline_tests (flags -verbose -show-counts)) + (inline_tests + (flags -verbose -show-counts)) (preprocess (pps ppx_version ppx_jane)) (instrumentation diff --git a/src/app/zkapps_examples/test/add_events/dune b/src/app/zkapps_examples/test/add_events/dune index 583a5c247c7..e86b6cad48e 100644 --- a/src/app/zkapps_examples/test/add_events/dune +++ b/src/app/zkapps_examples/test/add_events/dune @@ -1,41 +1,42 @@ (library (name add_events) (libraries - ;; opam libraries - async - async_kernel - async_unix - core - core_kernel - ppx_inline_test.config - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - merkle_list_verifier - mina_base - mina_base.import - mina_ledger - mina_numbers - pickles - pickles.backend - pickles_types - random_oracle_input - random_oracle - signature_lib - snark_params - transaction_snark - transaction_snark_tests - with_hash - zkapps_add_events - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + core + core_kernel + ppx_inline_test.config + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + merkle_list_verifier + mina_base + mina_base.import + mina_ledger + mina_numbers + pickles + pickles.backend + pickles_types + random_oracle_input + random_oracle + signature_lib + snark_params + transaction_snark + transaction_snark_tests + with_hash + zkapps_add_events + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/calls/dune b/src/app/zkapps_examples/test/calls/dune index 25706b15533..d1ed0f79578 100644 --- a/src/app/zkapps_examples/test/calls/dune +++ b/src/app/zkapps_examples/test/calls/dune @@ -1,48 +1,49 @@ (library (name calls) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - mina_base - mina_base.import - mina_ledger - mina_numbers - mina_state - mina_transaction_logic - pickles - pickles.backend - pickles_types - random_oracle_input - random_oracle - sgn - signature_lib - snark_params - snarky.backendless - transaction_protocol_state - transaction_snark - transaction_snark_tests - with_hash - zkapps_calls - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + mina_base + mina_base.import + mina_ledger + mina_numbers + mina_state + mina_transaction_logic + pickles + pickles.backend + pickles_types + random_oracle_input + random_oracle + sgn + signature_lib + snark_params + snarky.backendless + transaction_protocol_state + transaction_snark + transaction_snark_tests + with_hash + zkapps_calls + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/empty_update/dune b/src/app/zkapps_examples/test/empty_update/dune index 534cf6ac7b1..c36a8be7eff 100644 --- a/src/app/zkapps_examples/test/empty_update/dune +++ b/src/app/zkapps_examples/test/empty_update/dune @@ -1,51 +1,51 @@ (executable (name empty_update) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - mina_base - mina_base.import - mina_ledger - mina_numbers - mina_state - mina_transaction_logic - pickles - pickles.backend - pickles_base - pickles_types - random_oracle_input - random_oracle - sgn - signature_lib - snark_params - snarky.backendless - transaction_protocol_state - transaction_snark - transaction_snark_tests - with_hash - zkapps_empty_update - zkapps_examples - bounded_types - ) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + mina_base + mina_base.import + mina_ledger + mina_numbers + mina_state + mina_transaction_logic + pickles + pickles.backend + pickles_base + pickles_types + random_oracle_input + random_oracle + sgn + signature_lib + snark_params + snarky.backendless + transaction_protocol_state + transaction_snark + transaction_snark_tests + with_hash + zkapps_empty_update + zkapps_examples + bounded_types) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) (rule (alias runtest) diff --git a/src/app/zkapps_examples/test/initialize_state/dune b/src/app/zkapps_examples/test/initialize_state/dune index eac8a441070..e5693dee970 100644 --- a/src/app/zkapps_examples/test/initialize_state/dune +++ b/src/app/zkapps_examples/test/initialize_state/dune @@ -1,48 +1,49 @@ (library (name initialize_state) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - mina_base - mina_base.import - mina_ledger - mina_numbers - mina_state - mina_transaction_logic - pickles - pickles.backend - pickles_types - random_oracle_input - random_oracle - sgn - signature_lib - snark_params - snarky.backendless - transaction_protocol_state - transaction_snark - transaction_snark_tests - with_hash - zkapps_initialize_state - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + mina_base + mina_base.import + mina_ledger + mina_numbers + mina_state + mina_transaction_logic + pickles + pickles.backend + pickles_types + random_oracle_input + random_oracle + sgn + signature_lib + snark_params + snarky.backendless + transaction_protocol_state + transaction_snark + transaction_snark_tests + with_hash + zkapps_initialize_state + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/optional_custom_gates/dune b/src/app/zkapps_examples/test/optional_custom_gates/dune index ecf9f3905ac..573edf08c77 100644 --- a/src/app/zkapps_examples/test/optional_custom_gates/dune +++ b/src/app/zkapps_examples/test/optional_custom_gates/dune @@ -1,43 +1,44 @@ (library - (name zkapp_optional_custom_gates_tests) + (name zkapp_optional_custom_gates_tests) (libraries - ;; opam libraries - ppx_inline_test.config - async - async_kernel - async_unix - core - core_kernel - result - base - base.caml - sexplib0 - integers - ;; local libraries - mina_base.import - transaction_snark - mina_ledger - mina_base - mina_generators - currency - pickles - pickles_types - mina_numbers - zkapp_command_builder - signature_lib - genesis_constants - sgn - transaction_snark_tests - test_util - mina_transaction_logic - zkapps_examples - pickles_optional_custom_gates_circuits - snark_keys_header - snark_params - data_hash_lib - ) - (library_flags -linkall) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane ppx_mina)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + ppx_inline_test.config + async + async_kernel + async_unix + core + core_kernel + result + base + base.caml + sexplib0 + integers + ;; local libraries + mina_base.import + transaction_snark + mina_ledger + mina_base + mina_generators + currency + pickles + pickles_types + mina_numbers + zkapp_command_builder + signature_lib + genesis_constants + sgn + transaction_snark_tests + test_util + mina_transaction_logic + zkapps_examples + pickles_optional_custom_gates_circuits + snark_keys_header + snark_params + data_hash_lib) + (library_flags -linkall) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane ppx_mina)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/tokens/dune b/src/app/zkapps_examples/test/tokens/dune index 48ecefc7bbe..05877f35fdf 100644 --- a/src/app/zkapps_examples/test/tokens/dune +++ b/src/app/zkapps_examples/test/tokens/dune @@ -1,49 +1,50 @@ (library (name tokens) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - mina_base - mina_base.import - mina_ledger - mina_numbers - mina_state - mina_transaction_logic - pickles - pickles.backend - pickles_types - random_oracle_input - random_oracle - sgn - signature_lib - snark_params - snarky.backendless - transaction_protocol_state - transaction_snark - transaction_snark_tests - with_hash - zkapps_tokens - zkapps_examples - bounded_types - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + mina_base + mina_base.import + mina_ledger + mina_numbers + mina_state + mina_transaction_logic + pickles + pickles.backend + pickles_types + random_oracle_input + random_oracle + sgn + signature_lib + snark_params + snarky.backendless + transaction_protocol_state + transaction_snark + transaction_snark_tests + with_hash + zkapps_tokens + zkapps_examples + bounded_types) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/tokens/dune b/src/app/zkapps_examples/tokens/dune index 1e82e848990..d9f359830bd 100644 --- a/src/app/zkapps_examples/tokens/dune +++ b/src/app/zkapps_examples/tokens/dune @@ -1,40 +1,38 @@ (library (name zkapps_tokens) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core_kernel - ;; local libraries - cache_dir - crypto_params - currency - genesis_constants - kimchi_backend - kimchi_backend_common - kimchi_pasta - mina_base - mina_base.import - pasta_bindings - pickles - pickles.backend - pickles_base - pickles_types - random_oracle - random_oracle_input - sgn - signature_lib - snark_params - snarky.backendless - tuple_lib - with_hash - yojson - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + async + async_kernel + async_unix + base + core_kernel + ;; local libraries + cache_dir + crypto_params + currency + genesis_constants + kimchi_backend + kimchi_backend_common + kimchi_pasta + mina_base + mina_base.import + pasta_bindings + pickles + pickles.backend + pickles_base + pickles_types + random_oracle + random_oracle_input + sgn + signature_lib + snark_params + snarky.backendless + tuple_lib + with_hash + yojson + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version - h_list.ppx - ppx_let))) + (pps ppx_version h_list.ppx ppx_let)))