Skip to content

Push sig kind out of integration test lib and batch txn tool #17488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 21, 2025
Merged

Push sig kind out of integration test lib and batch txn tool #17488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
741b43b
GraphQL requests: Mark must_sign_and_send_payment as unused
glyh Jul 8, 2025
f7bc3b0
Integration Test Lib: Push sig kind out of graphql_requests.sign_and_…
glyh Jul 8, 2025
2688cfd
Batch Txn Tool: push sig kind out of there_and_back_again
glyh Jul 8, 2025
8e00387
Integraiton Test Lib > GraphQL requests: remove `must_sign_and_send_p…
glyh Jul 16, 2025
0422c75
Merge branch 'compatible' into lyh/sig-kind-graphql-requests
glyh Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/app/batch_txn_tool/batch_txn_tool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ let get_nonce ~logger ~(ingress_uri : Uri.t) ~(pub_key : Account.key) =
let account_id = Account_id.create pub_key Mina_base.Token_id.default in
let%bind nonce =
let%bind querry_result =
Integration_test_lib.Graphql_requests.get_account_data ingress_uri ~logger
~account_id
Graphql_requests.get_account_data ingress_uri ~logger ~account_id
in
match querry_result with
| Ok res ->
Expand Down Expand Up @@ -154,7 +153,7 @@ let there_and_back_again ~num_txn_per_acct ~txns_per_block ~slot_time ~fill_rate
~origin_sender_secret_key_path
~(origin_sender_secret_key_pw_option : string option)
~returner_secret_key_path ~(returner_secret_key_pw_option : string option)
~graphql_target_node_option ~minimum_user_command_fee () =
~graphql_target_node_option ~minimum_user_command_fee ~signature_kind () =
let open Deferred.Let_syntax in
(* define the rate limiting function *)
let open Logger in
Expand Down Expand Up @@ -262,6 +261,7 @@ let there_and_back_again ~num_txn_per_acct ~txns_per_block ~slot_time ~fill_rate
~sender_keypair:sender_kp ~receiver_pub_key ~amount:base_send_amount
~fee:fee_amount ~nonce ~memo:""
~valid_until:Mina_numbers.Global_slot_since_genesis.max_value
~signature_kind
in
let%bind () =
match res with
Expand Down Expand Up @@ -406,7 +406,8 @@ let output_there_and_back_cmds =
~slot_time ~fill_rate ~rate_limit ~rate_limit_level ~rate_limit_interval
~origin_sender_secret_key_path ~origin_sender_secret_key_pw_option
~returner_secret_key_path ~returner_secret_key_pw_option
~graphql_target_node_option ~minimum_user_command_fee )
~graphql_target_node_option ~minimum_user_command_fee
~signature_kind:Mina_signature_kind.t_DEPRECATED )

let () =
Command.run
Expand Down
11 changes: 1 addition & 10 deletions src/lib/testing/integration_test_lib/graphql_requests.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,7 @@ let must_send_payment_with_raw_sig ~logger node_uri ~sender_pub_key

let sign_and_send_payment ~logger node_uri
~(sender_keypair : Import.Signature_keypair.t) ~receiver_pub_key ~amount
~fee ~nonce ~memo ~valid_until =
let signature_kind = Mina_signature_kind.t_DEPRECATED in
~fee ~nonce ~memo ~valid_until ~signature_kind =
let sender_pub_key =
sender_keypair.public_key |> Signature_lib.Public_key.compress
in
Expand All @@ -967,14 +966,6 @@ let sign_and_send_payment ~logger node_uri
send_payment_with_raw_sig ~logger node_uri ~sender_pub_key ~receiver_pub_key
~amount ~fee ~nonce ~memo ~valid_until ~raw_signature

let must_sign_and_send_payment ~logger node_uri
~(sender_keypair : Import.Signature_keypair.t) ~receiver_pub_key ~amount
~fee ~nonce ~memo ~valid_until =
sign_and_send_payment ~logger node_uri
~(sender_keypair : Import.Signature_keypair.t)
~receiver_pub_key ~amount ~fee ~nonce ~memo ~valid_until
|> Deferred.bind ~f:Malleable_error.or_hard_error

let send_test_payments ~(repeat_count : Unsigned.UInt32.t)
~(repeat_delay_ms : Unsigned.UInt32.t) ~logger node_uri
~(senders : Import.Private_key.t list) ~(receiver_pub_key : Account.key)
Expand Down