Merge pull request #17488 from MinaProtocol/lyh/sig-kind-graphql-requests

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

Author: glyh

src/app/batch_txn_tool/batch_txn_tool.ml

@@ -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 ->
@@ -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
@@ -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
@@ -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

src/lib/testing/integration_test_lib/graphql_requests.ml

@@ -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
@@ -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)