diff --git a/src/app/client_sdk/client_sdk.ml b/src/app/client_sdk/client_sdk.ml index 7585aae4e5d..8911a0ebc3c 100644 --- a/src/app/client_sdk/client_sdk.ml +++ b/src/app/client_sdk/client_sdk.ml @@ -9,12 +9,11 @@ [%%endif] open Js_of_ocaml -open Signature_lib_nonconsensus -open Mina_base_nonconsensus -open Rosetta_lib_nonconsensus -open Rosetta_coding_nonconsensus +open Signature_lib +open Mina_base +open Rosetta_lib +open Rosetta_coding open Js_util -module String_sign = String_sign_nonconsensus.String_sign let _ = Js.export "minaSDK" @@ -77,18 +76,14 @@ let _ = Public_key.Compressed.of_base58_check_exn pk_base58_check |> Public_key.decompress_exn in - let dummy_payload = - Mina_base_nonconsensus.Signed_command_payload.dummy - in + let dummy_payload = Mina_base.Signed_command_payload.dummy in let signature = - Mina_base_nonconsensus.Signed_command.sign_payload sk dummy_payload - in - let message = - Mina_base_nonconsensus.Signed_command.to_input dummy_payload + Mina_base.Signed_command.sign_payload sk dummy_payload in + let message = Mina_base.Signed_command.to_input dummy_payload in let verified = Schnorr.verify signature - (Snark_params_nonconsensus.Inner_curve.of_affine pk) + (Snark_params.Tick.Inner_curve.of_affine pk) message in if verified then Js._true @@ -266,8 +261,8 @@ let _ = let make_signed_transaction command nonce = let payload_or_err = command - |> Rosetta_lib_nonconsensus.User_command_info.Partial - .to_user_command_payload ~nonce + |> Rosetta_lib.User_command_info.Partial.to_user_command_payload + ~nonce in match payload_or_err with | Ok payload -> ( @@ -281,9 +276,9 @@ let _ = let json' = `Assoc [ ("data", json) ] in Js.string (Yojson.Safe.to_string json') | Error errs -> - make_error (Rosetta_lib_nonconsensus.Errors.show errs) ) + make_error (Rosetta_lib.Errors.show errs) ) | Error errs -> - make_error (Rosetta_lib_nonconsensus.Errors.show errs) + make_error (Rosetta_lib.Errors.show errs) in match Transaction.Unsigned.Rendered.of_yojson unsigned_txn_json with | Ok diff --git a/src/app/client_sdk/js_util.ml b/src/app/client_sdk/js_util.ml index dbe98b37202..8a6de4626f9 100644 --- a/src/app/client_sdk/js_util.ml +++ b/src/app/client_sdk/js_util.ml @@ -1,13 +1,10 @@ (* js_util.ml -- types and transformers for Javascript *) open Js_of_ocaml -open Snark_params_nonconsensus -open Mina_base_nonconsensus -module Currency = Currency_nonconsensus.Currency -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Global_slot = Mina_numbers_nonconsensus.Global_slot +open Snark_params.Tick +open Mina_base +module Global_slot = Mina_numbers.Global_slot module Memo = Signed_command_memo -module Signature_lib = Signature_lib_nonconsensus let raise_js_error s = Js.raise_js_error (new%js Js.error_constr (Js.string s)) diff --git a/src/app/client_sdk/tests/test_signatures.ml b/src/app/client_sdk/tests/test_signatures.ml index 5f0ca5179fc..36b5f8bed7f 100644 --- a/src/app/client_sdk/tests/test_signatures.ml +++ b/src/app/client_sdk/tests/test_signatures.ml @@ -2,24 +2,8 @@ for comparison against signatures generated in client SDK *) -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick - -[%%else] - -open Snark_params_nonconsensus -module Mina_base = Mina_base_nonconsensus -module Signature_lib = Signature_lib_nonconsensus -module Currency = Currency_nonconsensus.Currency -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers - -[%%endif] - open Mina_base open Signature_lib diff --git a/src/lib/currency/currency.ml b/src/lib/currency/currency.ml index 54eda93b1da..0e9085aac84 100644 --- a/src/lib/currency/currency.ml +++ b/src/lib/currency/currency.ml @@ -1,20 +1,15 @@ [%%import "/src/config.mlh"] open Core_kernel +open Snark_bits [%%ifdef consensus_mechanism] -open Snark_bits open Bitstring_lib open Snark_params open Tick open Let_syntax -[%%else] - -open Snark_bits_nonconsensus -module Unsigned_extended = Unsigned_extended_nonconsensus.Unsigned_extended - [%%endif] open Intf diff --git a/src/lib/currency/intf.ml b/src/lib/currency/intf.ml index 0bad8b26a74..02463ba1e2a 100644 --- a/src/lib/currency/intf.ml +++ b/src/lib/currency/intf.ml @@ -1,18 +1,12 @@ [%%import "/src/config.mlh"] open Core_kernel +open Snark_bits [%%ifdef consensus_mechanism] -open Snark_bits open Snark_params.Tick -[%%else] - -open Snark_bits_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Sgn = Sgn_nonconsensus.Sgn - [%%endif] type uint64 = Unsigned.uint64 diff --git a/src/lib/data_hash_lib/data_hash.ml b/src/lib/data_hash_lib/data_hash.ml index 71c53a82872..eeb8d22b457 100644 --- a/src/lib/data_hash_lib/data_hash.ml +++ b/src/lib/data_hash_lib/data_hash.ml @@ -3,17 +3,12 @@ [%%import "/src/config.mlh"] open Core_kernel +open Snark_params.Tick [%%ifdef consensus_mechanism] -open Snark_params.Tick open Bitstring_lib -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - [%%endif] module type Full_size = Data_hash_intf.Full_size diff --git a/src/lib/data_hash_lib/data_hash_intf.ml b/src/lib/data_hash_lib/data_hash_intf.ml index e9e4de398b6..38e0c7a4722 100644 --- a/src/lib/data_hash_lib/data_hash_intf.ml +++ b/src/lib/data_hash_lib/data_hash_intf.ml @@ -1,17 +1,12 @@ [%%import "/src/config.mlh"] open Core_kernel +open Snark_params.Tick [%%ifdef consensus_mechanism] -open Snark_params.Tick open Snark_bits -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - [%%endif] module type Data_hash_descriptor = sig diff --git a/src/lib/data_hash_lib/state_hash.ml b/src/lib/data_hash_lib/state_hash.ml index d495e5efce1..814870a523a 100644 --- a/src/lib/data_hash_lib/state_hash.ml +++ b/src/lib/data_hash_lib/state_hash.ml @@ -3,19 +3,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifndef consensus_mechanism] - -module Outside_hash_image = Outside_hash_image_nonconsensus.Outside_hash_image -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -open Snark_params_nonconsensus - -[%%else] - open Snark_params.Tick -[%%endif] - include Data_hash.Make_full_size (struct let version_byte = Base58_check.Version_bytes.state_hash @@ -33,7 +22,7 @@ let zero = dummy (* in the nonconsensus world, we don't have the Pedersen machinery available, so just inline the value for zero *) -let zero = Snark_params_nonconsensus.Field.of_string "0" +let zero = Field.of_string "0" [%%endif] diff --git a/src/lib/data_hash_lib/state_hash.mli b/src/lib/data_hash_lib/state_hash.mli index 56f3547263b..7f35a09d250 100644 --- a/src/lib/data_hash_lib/state_hash.mli +++ b/src/lib/data_hash_lib/state_hash.mli @@ -1,19 +1,8 @@ (* state_hash.mli *) -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - include Data_hash.Full_size include Codable.Base58_check_intf with type t := t diff --git a/src/lib/hash_prefix_states/dune b/src/lib/hash_prefix_states/dune index a922fea62e7..9d3b9382017 100644 --- a/src/lib/hash_prefix_states/dune +++ b/src/lib/hash_prefix_states/dune @@ -6,6 +6,6 @@ (libraries snark_params mina_compile_config random_oracle mina_signature_kind) (preprocessor_deps ../../config.mlh) (preprocess - (pps ppx_custom_printf ppx_snarky ppx_version ppx_optcomp ppx_inline_test ppx_compare ppx_deriving_yojson)) + (pps ppx_custom_printf ppx_snarky ppx_version ppx_inline_test ppx_compare ppx_deriving_yojson)) (instrumentation (backend bisect_ppx)) (synopsis "Values corresponding to the internal state of the Pedersen hash function on the prefixes used in Coda")) diff --git a/src/lib/hash_prefix_states/hash_prefix_states.ml b/src/lib/hash_prefix_states/hash_prefix_states.ml index 16dc4642c89..a921276e69f 100644 --- a/src/lib/hash_prefix_states/hash_prefix_states.ml +++ b/src/lib/hash_prefix_states/hash_prefix_states.ml @@ -1,15 +1,3 @@ -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - -[%%else] - -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Mina_compile_config = - Mina_compile_config_nonconsensus.Mina_compile_config - -[%%endif] - open Core_kernel open Hash_prefixes diff --git a/src/lib/hash_prefix_states/hash_prefix_states.mli b/src/lib/hash_prefix_states/hash_prefix_states.mli index 654598e2824..ed213f2863d 100644 --- a/src/lib/hash_prefix_states/hash_prefix_states.mli +++ b/src/lib/hash_prefix_states/hash_prefix_states.mli @@ -1,17 +1,5 @@ -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - open Snark_params open Tick - -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - open Random_oracle val signature : Field.t State.t diff --git a/src/lib/mina_base/account.ml b/src/lib/mina_base/account.ml index e6ce04349b5..8f882e140c2 100644 --- a/src/lib/mina_base/account.ml +++ b/src/lib/mina_base/account.ml @@ -9,14 +9,6 @@ open Core_kernel open Snark_params open Tick -[%%else] - -module Currency = Currency_nonconsensus.Currency -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Mina_compile_config = - Mina_compile_config_nonconsensus.Mina_compile_config - [%%endif] open Currency diff --git a/src/lib/mina_base/account_id.mli b/src/lib/mina_base/account_id.mli index 8f02ffc4ac8..0d51f233b43 100644 --- a/src/lib/mina_base/account_id.mli +++ b/src/lib/mina_base/account_id.mli @@ -2,17 +2,8 @@ open Core_kernel open Import - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - [%%versioned: module Stable : sig module V1 : sig diff --git a/src/lib/mina_base/account_timing.ml b/src/lib/mina_base/account_timing.ml index 13322af5242..8507728ac31 100644 --- a/src/lib/mina_base/account_timing.ml +++ b/src/lib/mina_base/account_timing.ml @@ -7,14 +7,6 @@ open Core_kernel open Snark_params open Tick -[%%else] - -module Currency = Currency_nonconsensus.Currency -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Mina_compile_config = - Mina_compile_config_nonconsensus.Mina_compile_config - [%%endif] open Currency diff --git a/src/lib/mina_base/data_hash.ml b/src/lib/mina_base/data_hash.ml index cbea18b6fb6..bbe83b00141 100644 --- a/src/lib/mina_base/data_hash.ml +++ b/src/lib/mina_base/data_hash.ml @@ -1,13 +1,3 @@ (* data_hash.ml *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - include Data_hash_lib.Data_hash - -[%%else] - -include Data_hash_lib_nonconsensus.Data_hash - -[%%endif] diff --git a/src/lib/mina_base/hash_prefix.ml b/src/lib/mina_base/hash_prefix.ml index f8776658466..9b727d09146 100644 --- a/src/lib/mina_base/hash_prefix.ml +++ b/src/lib/mina_base/hash_prefix.ml @@ -1,13 +1,3 @@ (* hash_prefix.ml *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - include Hash_prefix_states - -[%%else] - -include Hash_prefix_states_nonconsensus.Hash_prefix_states - -[%%endif] diff --git a/src/lib/mina_base/import.ml b/src/lib/mina_base/import.ml index b41cffa8fe4..19e3264d7d7 100644 --- a/src/lib/mina_base/import.ml +++ b/src/lib/mina_base/import.ml @@ -2,20 +2,6 @@ [%%import "/src/config.mlh"] -[%%ifndef consensus_mechanism] - -module Signature_lib = Signature_lib_nonconsensus -module Mina_compile_config = - Mina_compile_config_nonconsensus.Mina_compile_config -module Sgn = Sgn_nonconsensus.Sgn -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Mina_numbers = Mina_numbers_nonconsensus -module Unsigned_extended = Unsigned_extended_nonconsensus.Unsigned_extended -module Hash_prefix_states = Hash_prefix_states_nonconsensus.Hash_prefix_states - -[%%endif] - module Public_key = Signature_lib.Public_key module Private_key = Signature_lib.Private_key module Signature_keypair = Signature_lib.Keypair diff --git a/src/lib/mina_base/ledger_hash0.ml b/src/lib/mina_base/ledger_hash0.ml index 2e92220da52..3f2b8cff3cd 100644 --- a/src/lib/mina_base/ledger_hash0.ml +++ b/src/lib/mina_base/ledger_hash0.ml @@ -1,17 +1,6 @@ -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - include Data_hash.Make_full_size (struct let description = "Ledger hash" diff --git a/src/lib/mina_base/other_fee_payer.ml b/src/lib/mina_base/other_fee_payer.ml index fec2cea71bc..ad822ab2a97 100644 --- a/src/lib/mina_base/other_fee_payer.ml +++ b/src/lib/mina_base/other_fee_payer.ml @@ -1,17 +1,5 @@ -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Signature_lib - -[%%else] - -open Signature_lib_nonconsensus - -[%%endif] - module Impl = Pickles.Impls.Step module Payload = struct diff --git a/src/lib/mina_base/payment_payload.ml b/src/lib/mina_base/payment_payload.ml index 55cba502bd8..6afc760e991 100644 --- a/src/lib/mina_base/payment_payload.ml +++ b/src/lib/mina_base/payment_payload.ml @@ -7,15 +7,10 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -open Signature_lib - -[%%else] - -module Currency = Currency_nonconsensus.Currency -open Signature_lib_nonconsensus [%%endif] +open Signature_lib module Amount = Currency.Amount module Fee = Currency.Fee diff --git a/src/lib/mina_base/permissions.ml b/src/lib/mina_base/permissions.ml index 72d342f0059..862c516bab0 100644 --- a/src/lib/mina_base/permissions.ml +++ b/src/lib/mina_base/permissions.ml @@ -5,13 +5,6 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -module Mina_numbers = Mina_numbers - -[%%else] - -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] diff --git a/src/lib/mina_base/protocol_constants_checked.ml b/src/lib/mina_base/protocol_constants_checked.ml index ebf909b7112..e9762effcaf 100644 --- a/src/lib/mina_base/protocol_constants_checked.ml +++ b/src/lib/mina_base/protocol_constants_checked.ml @@ -1,18 +1,7 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick - -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - module T = Mina_numbers.Length (*constants actually required for blockchain snark*) diff --git a/src/lib/mina_base/receipt.ml b/src/lib/mina_base/receipt.ml index 7db04f7f388..2f9a80fc086 100644 --- a/src/lib/mina_base/receipt.ml +++ b/src/lib/mina_base/receipt.ml @@ -4,18 +4,8 @@ open Core_kernel module B58_lib = Base58_check - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - module Elt = struct type t = | Signed_command of Signed_command.Payload.t diff --git a/src/lib/mina_base/receipt.mli b/src/lib/mina_base/receipt.mli index 0091766edb9..4233095fe44 100644 --- a/src/lib/mina_base/receipt.mli +++ b/src/lib/mina_base/receipt.mli @@ -3,18 +3,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - module Elt : sig type t = | Signed_command of Signed_command.Payload.t diff --git a/src/lib/mina_base/side_loaded_verification_key.ml b/src/lib/mina_base/side_loaded_verification_key.ml index f601a277286..ef8194deed5 100644 --- a/src/lib/mina_base/side_loaded_verification_key.ml +++ b/src/lib/mina_base/side_loaded_verification_key.ml @@ -9,7 +9,7 @@ include Pickles.Side_loaded.Verification_key open Core_kernel module G = struct - open Snark_params_nonconsensus + open Snark_params.Tick [%%versioned module Stable = struct diff --git a/src/lib/mina_base/signature.ml b/src/lib/mina_base/signature.ml index 061a9d89ac0..3c1a31cf909 100644 --- a/src/lib/mina_base/signature.ml +++ b/src/lib/mina_base/signature.ml @@ -1,19 +1,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus -module Hex = Hex_nonconsensus.Hex -module Rosetta_coding = Rosetta_coding_nonconsensus - -[%%endif] - module Arg = struct type t = (Field.t, Inner_curve.Scalar.t) Signature_poly.Stable.Latest.t [@@deriving bin_io_unversioned] diff --git a/src/lib/mina_base/signature.mli b/src/lib/mina_base/signature.mli index b7c466b39ff..f55321584d3 100644 --- a/src/lib/mina_base/signature.mli +++ b/src/lib/mina_base/signature.mli @@ -1,17 +1,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - [%%versioned: module Stable : sig module V1 : sig diff --git a/src/lib/mina_base/signed_command.ml b/src/lib/mina_base/signed_command.ml index ea066821ae6..a0a0382c561 100644 --- a/src/lib/mina_base/signed_command.ml +++ b/src/lib/mina_base/signed_command.ml @@ -2,15 +2,6 @@ open Core_kernel open Import - -[%%ifndef consensus_mechanism] - -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Quickcheck_lib = Quickcheck_lib_nonconsensus.Quickcheck_lib - -[%%endif] - open Mina_numbers module Fee = Currency.Fee module Payload = Signed_command_payload @@ -370,22 +361,11 @@ module Base58_check = Codable.Make_base58_check (Stable.Latest) [%%define_locally Base58_check.(to_base58_check, of_base58_check, of_base58_check_exn)] -[%%ifdef consensus_mechanism] - let check_signature ?signature_kind ({ payload; signer; signature } : t) = Signature_lib.Schnorr.verify ?signature_kind signature (Snark_params.Tick.Inner_curve.of_affine signer) (to_input payload) -[%%else] - -let check_signature ?signature_kind ({ payload; signer; signature } : t) = - Signature_lib_nonconsensus.Schnorr.verify ?signature_kind signature - (Snark_params_nonconsensus.Inner_curve.of_affine signer) - (to_input payload) - -[%%endif] - let check_valid_keys t = let fee_payer = fee_payer_pk t in let source = source_pk t in diff --git a/src/lib/mina_base/signed_command_intf.ml b/src/lib/mina_base/signed_command_intf.ml index 5f0ef1716e9..169936ab5f7 100644 --- a/src/lib/mina_base/signed_command_intf.ml +++ b/src/lib/mina_base/signed_command_intf.ml @@ -4,19 +4,8 @@ open Import open Core_kernel - -[%%ifdef consensus_mechanism] - -open Mina_numbers open Snark_params.Tick - -[%%else] - -open Mina_numbers_nonconsensus.Mina_numbers -open Snark_params_nonconsensus -module Currency = Currency_nonconsensus.Currency - -[%%endif] +open Mina_numbers module type Gen_intf = sig type t diff --git a/src/lib/mina_base/signed_command_payload.ml b/src/lib/mina_base/signed_command_payload.ml index 44e476df03e..eca1688696a 100644 --- a/src/lib/mina_base/signed_command_payload.ml +++ b/src/lib/mina_base/signed_command_payload.ml @@ -7,18 +7,10 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -open Signature_lib -module Mina_numbers = Mina_numbers - -[%%else] - -open Signature_lib_nonconsensus -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] +open Signature_lib module Memo = Signed_command_memo module Account_nonce = Mina_numbers.Account_nonce module Global_slot = Mina_numbers.Global_slot diff --git a/src/lib/mina_base/signed_command_payload.mli b/src/lib/mina_base/signed_command_payload.mli index c499d9c26df..5ab452b26f8 100644 --- a/src/lib/mina_base/signed_command_payload.mli +++ b/src/lib/mina_base/signed_command_payload.mli @@ -2,20 +2,8 @@ open Core_kernel open Import - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus -module Currency = Currency_nonconsensus.Currency -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - module Body : sig type t = | Payment of Payment_payload.t diff --git a/src/lib/mina_base/snapp_account.ml b/src/lib/mina_base/snapp_account.ml index 5ad665f7cd6..8c3370fec8b 100644 --- a/src/lib/mina_base/snapp_account.ml +++ b/src/lib/mina_base/snapp_account.ml @@ -5,15 +5,6 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -module Mina_numbers = Mina_numbers -module Hash_prefix_states = Hash_prefix_states - -[%%else] - -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -module Hash_prefix_states = Hash_prefix_states_nonconsensus.Hash_prefix_states [%%endif] diff --git a/src/lib/mina_base/snapp_basic.ml b/src/lib/mina_base/snapp_basic.ml index 1f84b477ea1..71cf9903e58 100644 --- a/src/lib/mina_base/snapp_basic.ml +++ b/src/lib/mina_base/snapp_basic.ml @@ -311,6 +311,6 @@ let invalid_public_key : Public_key.Compressed.t Lazy.t = [%%else] -module F = Snark_params_nonconsensus.Field +module F = Snark_params.Tick.Field [%%endif] diff --git a/src/lib/mina_base/snapp_command.ml b/src/lib/mina_base/snapp_command.ml index 11e5f83b441..c58e5582feb 100644 --- a/src/lib/mina_base/snapp_command.ml +++ b/src/lib/mina_base/snapp_command.ml @@ -5,18 +5,10 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -open Signature_lib -module Mina_numbers = Mina_numbers - -[%%else] - -open Signature_lib_nonconsensus -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] +open Signature_lib module Impl = Pickles.Impls.Step open Mina_numbers open Currency diff --git a/src/lib/mina_base/snapp_predicate.ml b/src/lib/mina_base/snapp_predicate.ml index abef7903dd5..9e3bb7bc523 100644 --- a/src/lib/mina_base/snapp_predicate.ml +++ b/src/lib/mina_base/snapp_predicate.ml @@ -5,18 +5,10 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -open Signature_lib -module Mina_numbers = Mina_numbers - -[%%else] - -open Signature_lib_nonconsensus -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Currency = Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] +open Signature_lib module A = Account open Mina_numbers open Currency diff --git a/src/lib/mina_base/snapp_statement.ml b/src/lib/mina_base/snapp_statement.ml index f6bf2e28995..cc837b20b89 100644 --- a/src/lib/mina_base/snapp_statement.ml +++ b/src/lib/mina_base/snapp_statement.ml @@ -5,12 +5,6 @@ open Core_kernel [%%ifdef consensus_mechanism] open Snark_params.Tick -module Mina_numbers = Mina_numbers - -[%%else] - -module Mina_numbers = Mina_numbers_nonconsensus.Mina_numbers -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] diff --git a/src/lib/mina_base/stake_delegation.ml b/src/lib/mina_base/stake_delegation.ml index c12fc4729bb..4db303e3562 100644 --- a/src/lib/mina_base/stake_delegation.ml +++ b/src/lib/mina_base/stake_delegation.ml @@ -1,20 +1,8 @@ (* stake_delegation.ml *) -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Signature_lib -[%%else] - -open Signature_lib_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - [%%versioned module Stable = struct module V1 = struct diff --git a/src/lib/mina_base/state_body_hash.ml b/src/lib/mina_base/state_body_hash.ml index 2d213ec99f4..dcd6594b7be 100644 --- a/src/lib/mina_base/state_body_hash.ml +++ b/src/lib/mina_base/state_body_hash.ml @@ -1,18 +1,6 @@ -[%%import "/src/config.mlh"] - open Core - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - include Data_hash.Make_full_size (struct let description = "State body hash" diff --git a/src/lib/mina_base/state_body_hash.mli b/src/lib/mina_base/state_body_hash.mli index b71c4fcbd95..e70b3a6b160 100644 --- a/src/lib/mina_base/state_body_hash.mli +++ b/src/lib/mina_base/state_body_hash.mli @@ -1,17 +1,6 @@ -[%%import "/src/config.mlh"] - open Core - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - include Data_hash.Full_size [%%versioned: diff --git a/src/lib/mina_base/state_hash.ml b/src/lib/mina_base/state_hash.ml index 04ce93839d4..57955aade89 100644 --- a/src/lib/mina_base/state_hash.ml +++ b/src/lib/mina_base/state_hash.ml @@ -1,13 +1,3 @@ (* state_hash.ml *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - include Data_hash_lib.State_hash - -[%%else] - -include Data_hash_lib_nonconsensus.State_hash - -[%%endif] diff --git a/src/lib/mina_base/token_id.mli b/src/lib/mina_base/token_id.mli index a9655f25e29..2b0ee0258a6 100644 --- a/src/lib/mina_base/token_id.mli +++ b/src/lib/mina_base/token_id.mli @@ -1,15 +1,11 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params open Tick -[%%else] +[%%ifndef consensus_mechanism] -open Snark_params_nonconsensus open Import [%%endif] diff --git a/src/lib/mina_base/transaction_union_payload.ml b/src/lib/mina_base/transaction_union_payload.ml index 574935e6862..28d45d27271 100644 --- a/src/lib/mina_base/transaction_union_payload.ml +++ b/src/lib/mina_base/transaction_union_payload.ml @@ -3,22 +3,15 @@ [%%import "/src/config.mlh"] open Core_kernel +open Currency [%%ifdef consensus_mechanism] open Snark_params.Tick -open Signature_lib -open Currency - -[%%else] - -open Signature_lib_nonconsensus -module Currency = Currency_nonconsensus.Currency -open Currency_nonconsensus.Currency -module Random_oracle = Random_oracle_nonconsensus.Random_oracle [%%endif] +open Signature_lib module Tag = Transaction_union_tag module Body = struct diff --git a/src/lib/mina_compile_config/mina_compile_config.ml b/src/lib/mina_compile_config/mina_compile_config.ml index 4244c1d7690..0fd03ab90ad 100644 --- a/src/lib/mina_compile_config/mina_compile_config.ml +++ b/src/lib/mina_compile_config/mina_compile_config.ml @@ -1,11 +1,5 @@ [%%import "/src/config.mlh"] -[%%ifndef consensus_mechanism] - -module Currency = Currency_nonconsensus.Currency - -[%%endif] - (** This file consists of compile-time constants that are not in Genesis_constants. This file includes all of the constants defined at compile-time for both diff --git a/src/lib/mina_numbers/intf.ml b/src/lib/mina_numbers/intf.ml index 2b3555a9078..a4024a9400c 100644 --- a/src/lib/mina_numbers/intf.ml +++ b/src/lib/mina_numbers/intf.ml @@ -4,19 +4,8 @@ open Core_kernel open Fold_lib open Tuple_lib open Unsigned - -[%%ifdef consensus_mechanism] - open Snark_bits -[%%else] - -open Snark_bits_nonconsensus -module Unsigned_extended = Unsigned_extended_nonconsensus.Unsigned_extended -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - module type S_unchecked = sig type t [@@deriving sexp, compare, hash, yojson] diff --git a/src/lib/mina_numbers/nat.ml b/src/lib/mina_numbers/nat.ml index 4d86f8ad652..b3fda75cca5 100644 --- a/src/lib/mina_numbers/nat.ml +++ b/src/lib/mina_numbers/nat.ml @@ -4,11 +4,10 @@ open Core_kernel open Fold_lib include Intf module Intf = Intf +open Snark_bits [%%ifdef consensus_mechanism] -open Snark_bits - let zero_checked = Snarky_integer.Integer.constant ~m:Snark_params.Tick.m Bigint.zero @@ -113,10 +112,6 @@ struct let zero = zero_checked end -[%%else] - -open Snark_bits_nonconsensus - [%%endif] module Make (N : sig diff --git a/src/lib/non_zero_curve_point/non_zero_curve_point.ml b/src/lib/non_zero_curve_point/non_zero_curve_point.ml index 9f07c10c7de..e145c466f8d 100644 --- a/src/lib/non_zero_curve_point/non_zero_curve_point.ml +++ b/src/lib/non_zero_curve_point/non_zero_curve_point.ml @@ -1,21 +1,16 @@ [%%import "/src/config.mlh"] open Core_kernel +open Snark_params.Tick [%%ifdef consensus_mechanism] -open Snark_params.Tick - let parity y = Bigint.(test_bit (of_field y) 0) [%%else] -open Snark_params_nonconsensus - let parity y = Field.parity y -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - [%%endif] let gen_uncompressed = diff --git a/src/lib/outside_hash_image/dune b/src/lib/outside_hash_image/dune index d8aa20cec42..108229a7e99 100644 --- a/src/lib/outside_hash_image/dune +++ b/src/lib/outside_hash_image/dune @@ -3,6 +3,5 @@ (public_name outside_hash_image) (libraries snark_params) (preprocessor_deps ../../config.mlh) - (preprocess - (pps ppx_version ppx_optcomp)) + (preprocess (pps ppx_version)) (instrumentation (backend bisect_ppx))) diff --git a/src/lib/outside_hash_image/outside_hash_image.ml b/src/lib/outside_hash_image/outside_hash_image.ml index 271f62af22c..ed9aceb4f0d 100644 --- a/src/lib/outside_hash_image/outside_hash_image.ml +++ b/src/lib/outside_hash_image/outside_hash_image.ml @@ -1,13 +1,3 @@ (* outside_hash_image.ml *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - let t = Snark_params.Tick.Field.zero - -[%%else] - -let t = Snark_params_nonconsensus.Field.zero - -[%%endif] diff --git a/src/lib/quickcheck_lib/dune b/src/lib/quickcheck_lib/dune index 4fdb34dbfde..123b3f92473 100644 --- a/src/lib/quickcheck_lib/dune +++ b/src/lib/quickcheck_lib/dune @@ -5,4 +5,4 @@ (inline_tests) (preprocessor_deps ../../config.mlh) (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_optcomp ppx_let ppx_inline_test ppx_custom_printf))) + (preprocess (pps ppx_version ppx_let ppx_inline_test ppx_custom_printf))) diff --git a/src/lib/quickcheck_lib/quickcheck_lib.ml b/src/lib/quickcheck_lib/quickcheck_lib.ml index 8674cea008f..5e1761802aa 100644 --- a/src/lib/quickcheck_lib/quickcheck_lib.ml +++ b/src/lib/quickcheck_lib/quickcheck_lib.ml @@ -1,17 +1,9 @@ (* quickcheck_lib.ml *) -[%%import "/src/config.mlh"] - open Core_kernel open Quickcheck.Generator open Quickcheck.Let_syntax -[%%ifndef consensus_mechanism] - -module Currency = Currency_nonconsensus.Currency - -[%%endif] - let of_array array = Quickcheck.Generator.of_list @@ Array.to_list array let rec map_gens ls ~f = diff --git a/src/lib/quickcheck_lib/quickcheck_lib.mli b/src/lib/quickcheck_lib/quickcheck_lib.mli index eea029f3362..01e6463a0e6 100644 --- a/src/lib/quickcheck_lib/quickcheck_lib.mli +++ b/src/lib/quickcheck_lib/quickcheck_lib.mli @@ -1,16 +1,8 @@ (* quickcheck_lib.mli *) -[%%import "/src/config.mlh"] - open Core_kernel open Quickcheck -[%%ifndef consensus_mechanism] - -module Currency = Currency_nonconsensus.Currency - -[%%endif] - (** [of_array array] selects a random element from [array] to select an element *) val of_array : 'a array -> 'a Generator.t diff --git a/src/lib/random_oracle/random_oracle.ml b/src/lib/random_oracle/random_oracle.ml index 2aafe942861..3343c7f3685 100644 --- a/src/lib/random_oracle/random_oracle.ml +++ b/src/lib/random_oracle/random_oracle.ml @@ -8,7 +8,7 @@ open Pickles.Impls.Step.Internal_Basic [%%else] -open Snark_params_nonconsensus +open Snark_params.Tick [%%endif] diff --git a/src/lib/random_oracle/random_oracle.mli b/src/lib/random_oracle/random_oracle.mli index a7d9dd0597b..d2bb3996b63 100644 --- a/src/lib/random_oracle/random_oracle.mli +++ b/src/lib/random_oracle/random_oracle.mli @@ -6,7 +6,7 @@ open Pickles.Impls.Step.Internal_Basic [%%else] -open Snark_params_nonconsensus +open Snark_params.Tick [%%endif] diff --git a/src/lib/rosetta_coding/coding.ml b/src/lib/rosetta_coding/coding.ml index e4a94953ea7..d69a54e0737 100644 --- a/src/lib/rosetta_coding/coding.ml +++ b/src/lib/rosetta_coding/coding.ml @@ -3,21 +3,10 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - module Field = Snark_params.Tick.Field module Scalar = Snark_params.Tick.Inner_curve.Scalar open Signature_lib -[%%else] - -module Field = Snark_params_nonconsensus.Field -module Scalar = Snark_params_nonconsensus.Inner_curve.Scalar -open Signature_lib_nonconsensus - -[%%endif] - (* see RFC 0038, section "marshal-keys" for a specification *) let hex_char_to_bits4 = function diff --git a/src/lib/rosetta_lib/dune b/src/lib/rosetta_lib/dune index 08b8bc7a482..cb904501747 100644 --- a/src/lib/rosetta_lib/dune +++ b/src/lib/rosetta_lib/dune @@ -7,7 +7,7 @@ currency) (preprocessor_deps ../../config.mlh) (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_coda ppx_version ppx_optcomp ppx_assert ppx_let ppx_sexp_conv + (preprocess (pps ppx_coda ppx_version ppx_assert ppx_let ppx_sexp_conv ppx_compare ppx_deriving.std ppx_custom_printf ppx_deriving_yojson ppx_inline_test)) (synopsis "Rosetta-related support code")) diff --git a/src/lib/rosetta_lib/errors.ml b/src/lib/rosetta_lib/errors.ml index c6f3cf01c6a..7c3c7eacdb1 100644 --- a/src/lib/rosetta_lib/errors.ml +++ b/src/lib/rosetta_lib/errors.ml @@ -1,16 +1,6 @@ -[%%import "/src/config.mlh"] - open Core_kernel open Async_kernel -[%%ifndef consensus_mechanism] - -module Currency = Currency_nonconsensus.Currency -module Mina_compile_config = - Mina_compile_config_nonconsensus.Mina_compile_config - -[%%endif] - module Partial_reason = struct type t = | Length_mismatch diff --git a/src/lib/rosetta_lib/test/test_encodings.ml b/src/lib/rosetta_lib/test/test_encodings.ml index 5e18864d42e..11e959153b2 100644 --- a/src/lib/rosetta_lib/test/test_encodings.ml +++ b/src/lib/rosetta_lib/test/test_encodings.ml @@ -1,21 +1,9 @@ (* test_encodings.ml -- print out Rosetta encodings *) -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - open Signature_lib open Rosetta_coding -[%%else] - -open Signature_lib_nonconsensus -open Rosetta_coding_nonconsensus - -[%%endif] - let pk1 = Public_key.Compressed.of_base58_check_exn "B62qrcFstkpqXww1EkSGrqMCwCNho86kuqBd4FrAAUsPxNKdiPzAUsy" diff --git a/src/lib/rosetta_lib/transaction.ml b/src/lib/rosetta_lib/transaction.ml index de76473c37f..cf07692969d 100644 --- a/src/lib/rosetta_lib/transaction.ml +++ b/src/lib/rosetta_lib/transaction.ml @@ -1,21 +1,5 @@ -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifdef consensus_mechanism] - module Field = Snark_params.Tick.Field - -[%%else] - -module Field = Snark_params_nonconsensus.Field -module Mina_base = Mina_base_nonconsensus -module Hex = Hex_nonconsensus.Hex -module Unsigned_extended = Unsigned_extended_nonconsensus.Unsigned_extended -module Signature_lib = Signature_lib_nonconsensus - -[%%endif] - module Token_id = Mina_base.Token_id module Unsigned = struct diff --git a/src/lib/rosetta_lib/user_command_info.ml b/src/lib/rosetta_lib/user_command_info.ml index 91ebc80af79..bbc58094e48 100644 --- a/src/lib/rosetta_lib/user_command_info.ml +++ b/src/lib/rosetta_lib/user_command_info.ml @@ -1,17 +1,4 @@ -[%%import "/src/config.mlh"] - open Core_kernel - -[%%ifndef consensus_mechanism] - -module Mina_base = Mina_base_nonconsensus -module Currency = Currency_nonconsensus.Currency -module Signature_lib = Signature_lib_nonconsensus -module Unsigned_extended = Unsigned_extended_nonconsensus.Unsigned_extended -module Mina_numbers = Mina_numbers_nonconsensus - -[%%endif] - module Fee_currency = Currency.Fee module Amount_currency = Currency.Amount open Rosetta_models diff --git a/src/lib/sgn/sgn.ml b/src/lib/sgn/sgn.ml index 87843562f95..d20d4661b47 100644 --- a/src/lib/sgn/sgn.ml +++ b/src/lib/sgn/sgn.ml @@ -1,17 +1,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - [%%versioned module Stable = struct module V1 = struct diff --git a/src/lib/sgn/sgn.mli b/src/lib/sgn/sgn.mli index 22192463230..a8ebf72af14 100644 --- a/src/lib/sgn/sgn.mli +++ b/src/lib/sgn/sgn.mli @@ -1,17 +1,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - [%%versioned: module Stable : sig module V1 : sig diff --git a/src/lib/signature_lib/private_key.ml b/src/lib/signature_lib/private_key.ml index a89f3fd1016..4bd67f05b9f 100644 --- a/src/lib/signature_lib/private_key.ml +++ b/src/lib/signature_lib/private_key.ml @@ -1,17 +1,8 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params.Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - [%%versioned_asserted module Stable = struct module V1 = struct diff --git a/src/lib/signature_lib/public_key.ml b/src/lib/signature_lib/public_key.ml index ad41a2ee171..d128c4adb08 100644 --- a/src/lib/signature_lib/public_key.ml +++ b/src/lib/signature_lib/public_key.ml @@ -1,20 +1,6 @@ (* public_key.ml *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - include Non_zero_curve_point module Inner_curve = Snark_params.Tick.Inner_curve let of_private_key_exn p = of_inner_curve_exn Inner_curve.(scale one p) - -[%%else] - -include Non_zero_curve_point_nonconsensus.Non_zero_curve_point - -module Inner_curve = Snark_params_nonconsensus.Inner_curve - -let of_private_key_exn p = of_inner_curve_exn Inner_curve.(scale one p) - -[%%endif] diff --git a/src/lib/signature_lib/public_key.mli b/src/lib/signature_lib/public_key.mli index d1a0df35b8e..b438a76bab0 100644 --- a/src/lib/signature_lib/public_key.mli +++ b/src/lib/signature_lib/public_key.mli @@ -1,19 +1,9 @@ [%%import "/src/config.mlh"] open Core_kernel - -[%%ifdef consensus_mechanism] - open Snark_params open Tick -[%%else] - -open Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle - -[%%endif] - type t = Field.t * Field.t [@@deriving sexp, hash] include Codable.S with type t := t diff --git a/src/lib/signature_lib/schnorr.ml b/src/lib/signature_lib/schnorr.ml index 677b3792814..1ff6f568f5f 100644 --- a/src/lib/signature_lib/schnorr.ml +++ b/src/lib/signature_lib/schnorr.ml @@ -331,8 +331,6 @@ module Make end end -open Snark_params - [%%else] (* nonconsensus version of the functor; yes, there's some repeated code, @@ -340,7 +338,7 @@ open Snark_params *) module type S = sig - open Snark_params_nonconsensus + open Snark_params.Tick type curve @@ -379,7 +377,7 @@ module type S = sig end module Make - (Impl : module type of Snark_params_nonconsensus) (Curve : sig + (Impl : module type of Snark_params.Tick) (Curve : sig open Impl module Scalar : sig @@ -487,12 +485,10 @@ module Make false end -module Tick = Snark_params_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -open Hash_prefix_states_nonconsensus - [%%endif] +open Snark_params + module Message = struct open Tick diff --git a/src/lib/string_sign/string_sign.ml b/src/lib/string_sign/string_sign.ml index 205d2e6d455..d98aae67b2e 100644 --- a/src/lib/string_sign/string_sign.ml +++ b/src/lib/string_sign/string_sign.ml @@ -1,21 +1,8 @@ (* string_sign.ml -- signatures for strings *) -[%%import "/src/config.mlh"] - -[%%ifdef consensus_mechanism] - module Inner_curve = Snark_params.Tick.Inner_curve open Signature_lib -[%%else] - -module Inner_curve = Snark_params_nonconsensus.Inner_curve -module Signature_lib = Signature_lib_nonconsensus -module Random_oracle = Random_oracle_nonconsensus.Random_oracle -open Signature_lib - -[%%endif] - let nybble_bits = function | 0x0 -> [ false; false; false; false ] diff --git a/src/lib/unsigned_extended/dune b/src/lib/unsigned_extended/dune index 8311a498521..5768e6f6ca3 100644 --- a/src/lib/unsigned_extended/dune +++ b/src/lib/unsigned_extended/dune @@ -6,6 +6,6 @@ (libraries core_kernel integers snark_params ppx_dhall_type ppx_version.runtime) (preprocessor_deps ../../config.mlh) (preprocess - (pps ppx_coda ppx_version ppx_optcomp ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash ppx_inline_test ppx_deriving.std ppx_deriving_yojson)) + (pps ppx_coda ppx_version ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash ppx_inline_test ppx_deriving.std ppx_deriving_yojson)) (instrumentation (backend bisect_ppx)) (synopsis "Unsigned integer functions")) diff --git a/src/lib/unsigned_extended/unsigned_extended.ml b/src/lib/unsigned_extended/unsigned_extended.ml index e8a69527610..814bc7bdce3 100644 --- a/src/lib/unsigned_extended/unsigned_extended.ml +++ b/src/lib/unsigned_extended/unsigned_extended.ml @@ -1,21 +1,10 @@ (* unsigned_extended.ml *) -[%%import "/src/config.mlh"] - open Core_kernel include Intf - -[%%ifdef consensus_mechanism] - open Snark_params open Tick -[%%else] - -open Snark_params_nonconsensus - -[%%endif] - module type Unsigned_intf = Unsigned.S module Extend diff --git a/src/nonconsensus/currency/dune b/src/nonconsensus/currency/dune index 5c74005be3d..19f4304ac4e 100644 --- a/src/nonconsensus/currency/dune +++ b/src/nonconsensus/currency/dune @@ -1,5 +1,5 @@ (library - (name currency_nonconsensus) + (name currency) (public_name currency_nonconsensus) (library_flags -linkall) (inline_tests) diff --git a/src/nonconsensus/data_hash_lib/dune b/src/nonconsensus/data_hash_lib/dune index ae15a92150f..4c2dd86dcfd 100644 --- a/src/nonconsensus/data_hash_lib/dune +++ b/src/nonconsensus/data_hash_lib/dune @@ -1,5 +1,5 @@ (library - (name data_hash_lib_nonconsensus) + (name data_hash_lib) (public_name data_hash_lib_nonconsensus) (inline_tests) (library_flags -linkall) diff --git a/src/nonconsensus/hash_prefix_states/dune b/src/nonconsensus/hash_prefix_states/dune index bc9d9484bdf..2b0dd8e7b01 100644 --- a/src/nonconsensus/hash_prefix_states/dune +++ b/src/nonconsensus/hash_prefix_states/dune @@ -1,5 +1,5 @@ (library - (name hash_prefix_states_nonconsensus) + (name hash_prefix_states) (public_name hash_prefix_states_nonconsensus) (library_flags -linkall) (inline_tests) diff --git a/src/nonconsensus/hex/dune b/src/nonconsensus/hex/dune index edad9740d0a..44cbf134f12 100644 --- a/src/nonconsensus/hex/dune +++ b/src/nonconsensus/hex/dune @@ -1,5 +1,5 @@ (library - (name hex_nonconsensus) + (name hex) (public_name hex_nonconsensus) (inline_tests) (instrumentation (backend bisect_ppx)) diff --git a/src/nonconsensus/mina_base/dune b/src/nonconsensus/mina_base/dune index c6901905e22..313d37c2e33 100644 --- a/src/nonconsensus/mina_base/dune +++ b/src/nonconsensus/mina_base/dune @@ -1,5 +1,5 @@ (library - (name mina_base_nonconsensus) + (name mina_base) (public_name mina_base_nonconsensus) (inline_tests) (library_flags -linkall) diff --git a/src/nonconsensus/mina_compile_config/dune b/src/nonconsensus/mina_compile_config/dune index ba53117b6fb..a0e44f4c48a 100644 --- a/src/nonconsensus/mina_compile_config/dune +++ b/src/nonconsensus/mina_compile_config/dune @@ -1,5 +1,5 @@ (library - (name mina_compile_config_nonconsensus) + (name mina_compile_config) (public_name mina_compile_config_nonconsensus) (libraries currency_nonconsensus) (preprocessor_deps ../../config.mlh) diff --git a/src/nonconsensus/mina_numbers/dune b/src/nonconsensus/mina_numbers/dune index b290cc2a3f5..39fe9ae036b 100644 --- a/src/nonconsensus/mina_numbers/dune +++ b/src/nonconsensus/mina_numbers/dune @@ -1,5 +1,5 @@ (library - (name mina_numbers_nonconsensus) + (name mina_numbers) (public_name mina_numbers_nonconsensus) (inline_tests) (library_flags -linkall) diff --git a/src/nonconsensus/non_zero_curve_point/dune b/src/nonconsensus/non_zero_curve_point/dune index 18ff00adb75..a56b44fec25 100644 --- a/src/nonconsensus/non_zero_curve_point/dune +++ b/src/nonconsensus/non_zero_curve_point/dune @@ -1,5 +1,5 @@ (library - (name non_zero_curve_point_nonconsensus) + (name non_zero_curve_point) (public_name non_zero_curve_point_nonconsensus) (flags :standard -short-paths) (inline_tests) diff --git a/src/nonconsensus/outside_hash_image/dune b/src/nonconsensus/outside_hash_image/dune index be8dc6084d1..dd048f077db 100644 --- a/src/nonconsensus/outside_hash_image/dune +++ b/src/nonconsensus/outside_hash_image/dune @@ -1,5 +1,5 @@ (library - (name outside_hash_image_nonconsensus) + (name outside_hash_image) (public_name outside_hash_image_nonconsensus) (libraries snark_params_nonconsensus) (preprocessor_deps ../../config.mlh) diff --git a/src/nonconsensus/quickcheck_lib/dune b/src/nonconsensus/quickcheck_lib/dune index 23e71f6f40e..4b9015801e9 100644 --- a/src/nonconsensus/quickcheck_lib/dune +++ b/src/nonconsensus/quickcheck_lib/dune @@ -1,5 +1,5 @@ (library - (name quickcheck_lib_nonconsensus) + (name quickcheck_lib) (public_name quickcheck_lib_nonconsensus) (libraries core_kernel currency_nonconsensus rose_tree) (inline_tests) diff --git a/src/nonconsensus/random_oracle/dune b/src/nonconsensus/random_oracle/dune index 870de7ad2da..2a9b80456c5 100644 --- a/src/nonconsensus/random_oracle/dune +++ b/src/nonconsensus/random_oracle/dune @@ -1,5 +1,5 @@ (library - (name random_oracle_nonconsensus) + (name random_oracle) (public_name random_oracle_nonconsensus) (preprocessor_deps ../../config.mlh) (instrumentation (backend bisect_ppx)) diff --git a/src/nonconsensus/rosetta_coding/dune b/src/nonconsensus/rosetta_coding/dune index 3b2c80a4dfe..951472ac456 100644 --- a/src/nonconsensus/rosetta_coding/dune +++ b/src/nonconsensus/rosetta_coding/dune @@ -1,5 +1,5 @@ (library - (name rosetta_coding_nonconsensus) + (name rosetta_coding) (public_name rosetta_coding_nonconsensus) (library_flags -linkall) (inline_tests) diff --git a/src/nonconsensus/rosetta_lib/dune b/src/nonconsensus/rosetta_lib/dune index 6116205389c..0a93b2553af 100644 --- a/src/nonconsensus/rosetta_lib/dune +++ b/src/nonconsensus/rosetta_lib/dune @@ -1,5 +1,5 @@ (library - (name rosetta_lib_nonconsensus) + (name rosetta_lib) (public_name rosetta_lib_nonconsensus) (library_flags -linkall) (inline_tests) diff --git a/src/nonconsensus/sgn/dune b/src/nonconsensus/sgn/dune index b2291dd1969..f4241b85fc4 100644 --- a/src/nonconsensus/sgn/dune +++ b/src/nonconsensus/sgn/dune @@ -1,5 +1,5 @@ (library - (name sgn_nonconsensus) + (name sgn) (public_name sgn_nonconsensus) (library_flags -linkall) (libraries sgn_type snark_params_nonconsensus core_kernel ppx_deriving_yojson.runtime diff --git a/src/nonconsensus/signature_lib/dune b/src/nonconsensus/signature_lib/dune index 223e8de8567..548117c7a4c 100644 --- a/src/nonconsensus/signature_lib/dune +++ b/src/nonconsensus/signature_lib/dune @@ -1,5 +1,5 @@ (library - (name signature_lib_nonconsensus) + (name signature_lib) (public_name signature_lib_nonconsensus) (library_flags -linkall) (inline_tests) diff --git a/src/nonconsensus/snark_bits/dune b/src/nonconsensus/snark_bits/dune index abd3f899e45..b4079260e67 100644 --- a/src/nonconsensus/snark_bits/dune +++ b/src/nonconsensus/snark_bits/dune @@ -1,5 +1,5 @@ (library - (name snark_bits_nonconsensus) + (name snark_bits) (public_name snark_bits_nonconsensus) (library_flags -linkall) (libraries fold_lib bitstring_lib core_kernel integers) diff --git a/src/nonconsensus/snark_params/dune b/src/nonconsensus/snark_params/dune index df15e4134bc..3ce8415d1b1 100644 --- a/src/nonconsensus/snark_params/dune +++ b/src/nonconsensus/snark_params/dune @@ -1,5 +1,5 @@ (library - (name snark_params_nonconsensus) + (name snark_params) (public_name snark_params_nonconsensus) (library_flags -linkall) (libraries core_kernel bignum_bigint snarkette) diff --git a/src/nonconsensus/snark_params/snark_params_nonconsensus.ml b/src/nonconsensus/snark_params/tick.ml similarity index 100% rename from src/nonconsensus/snark_params/snark_params_nonconsensus.ml rename to src/nonconsensus/snark_params/tick.ml diff --git a/src/nonconsensus/string_sign/dune b/src/nonconsensus/string_sign/dune index e653fdf9425..c5ef18ecc53 100644 --- a/src/nonconsensus/string_sign/dune +++ b/src/nonconsensus/string_sign/dune @@ -1,5 +1,5 @@ (library - (name string_sign_nonconsensus) + (name string_sign) (public_name string_sign_nonconsensus) (inline_tests) (library_flags -linkall) diff --git a/src/nonconsensus/unsigned_extended/dune b/src/nonconsensus/unsigned_extended/dune index c01c38d1aaa..63820474d93 100644 --- a/src/nonconsensus/unsigned_extended/dune +++ b/src/nonconsensus/unsigned_extended/dune @@ -1,5 +1,5 @@ (library - (name unsigned_extended_nonconsensus) + (name unsigned_extended) (public_name unsigned_extended_nonconsensus) (library_flags -linkall) (inline_tests)