diff --git a/tezt/lib_tezos/RPC.ml b/tezt/lib_tezos/RPC.ml index 30f29039b186aba5be21a7abcbf6edea70b6e2a2..902d1b4f5a6c9ddece97fccad150e9e4940edc58 100644 --- a/tezt/lib_tezos/RPC.ml +++ b/tezt/lib_tezos/RPC.ml @@ -745,4 +745,247 @@ let get_chain_block_context_sc_rollup_staker_staked_on_commitment ] Fun.id +let get_chain_block_context_delegates ?(chain = "main") ?(block = "head") () = + make + GET + ["chains"; chain; "blocks"; block; "context"; "delegates"] + (fun contracts -> JSON.as_list contracts |> List.map JSON.as_string) + +let get_chain_block_context_delegate ?(chain = "main") ?(block = "head") pkh = + make + GET + ["chains"; chain; "blocks"; block; "context"; "delegates"; pkh] + Fun.id + +let get_chain_block_context_delegate_current_frozen_deposits ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "current_frozen_deposits"; + ] + Fun.id + +let get_chain_block_context_delegate_deactivated ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "deactivated"; + ] + Fun.id + +let get_chain_block_context_delegate_delegated_balance ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "delegated_balance"; + ] + Fun.id + +let get_chain_block_context_delegate_delegated_contracts ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "delegated_contracts"; + ] + Fun.id + +let get_chain_block_context_delegate_frozen_deposits ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "frozen_deposits"; + ] + Fun.id + +let get_chain_block_context_delegate_frozen_deposits_limit ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "frozen_deposits_limit"; + ] + Fun.id + +let get_chain_block_context_delegate_full_balance ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "full_balance"; + ] + Fun.id + +let get_chain_block_context_delegate_grace_period ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "grace_period"; + ] + Fun.id + +let get_chain_block_context_delegate_participation ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "participation"; + ] + Fun.id + +let get_chain_block_context_delegate_frozen_balance ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "frozen_balance"; + ] + Fun.id + +let get_chain_block_context_delegate_frozen_balance_by_cycle ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "frozen_balance_by_cycle"; + ] + Fun.id + +let get_chain_block_context_delegate_staking_balance ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "staking_balance"; + ] + Fun.id + +let get_chain_block_context_delegate_balance ?(chain = "main") ?(block = "head") + pkh = + make + GET + ["chains"; chain; "blocks"; block; "context"; "delegates"; pkh; "balance"] + Fun.id + +let get_chain_block_context_delegate_voting_info ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "voting_info"; + ] + Fun.id + +let get_chain_block_context_delegate_voting_power ?(chain = "main") + ?(block = "head") pkh = + make + GET + [ + "chains"; + chain; + "blocks"; + block; + "context"; + "delegates"; + pkh; + "voting_power"; + ] + Fun.id + let make = RPC_core.make diff --git a/tezt/lib_tezos/RPC.mli b/tezt/lib_tezos/RPC.mli index 03ceec67b60f38ee69fe61f040aa7ab5d7290211..774f70d6e26dd98479445956ea7b0268af2178ba 100644 --- a/tezt/lib_tezos/RPC.mli +++ b/tezt/lib_tezos/RPC.mli @@ -724,3 +724,124 @@ val get_chain_block_context_sc_rollup_last_cemented_commitment_hash_with_level : (** Call RPC /chains/[chain]/blocks/[block]/context/sc_rollup/[rollup_hash]/staker/[staker]/staked_on_commitment *) val get_chain_block_context_sc_rollup_staker_staked_on_commitment : ?chain:string -> ?block:string -> sc_rollup:string -> string -> JSON.t t + +(** {2 Delegates RPC module } *) + +(** RPC: [GET /chains//blocks//context/delegates] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegates : + ?chain:string -> ?block:string -> unit -> string list t + +(** RPC: [GET /chains//blocks//context/delegates/] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//current_frozen_deposits] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_current_frozen_deposits : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//deactivated] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_deactivated : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//frozen_balance] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_frozen_balance : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//frozen_balance_by_cycle] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_frozen_balance_by_cycle : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//delegated_balance] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_delegated_balance : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//delegated_contracts] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_delegated_contracts : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//frozen_deposits] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_frozen_deposits : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//frozen_deposits_limit] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_frozen_deposits_limit : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//full_balance] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_full_balance : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//grace_period] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_grace_period : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//participation] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_participation : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//balance] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_balance : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//staking_balance] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_staking_balance : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//voting_info] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_voting_info : + ?chain:string -> ?block:string -> string -> JSON.t t + +(** RPC: [GET /chains//blocks//context/delegates//voting_power] + + [chain] defaults to ["main"]. + [block] defaults to ["head"]. *) +val get_chain_block_context_delegate_voting_power : + ?chain:string -> ?block:string -> string -> JSON.t t diff --git a/tezt/lib_tezos/RPC_legacy.ml b/tezt/lib_tezos/RPC_legacy.ml index ed400f3ebf1d69c5a944576a0d0b0fc65f068c9c..718376b8529ca47b8062be7ad39a1856d6278e39 100644 --- a/tezt/lib_tezos/RPC_legacy.ml +++ b/tezt/lib_tezos/RPC_legacy.ml @@ -26,144 +26,6 @@ type ctxt_type = Bytes | Json -module Delegates = struct - let spawn_get_all ?endpoint ?hooks ?(chain = "main") ?(block = "head") client - = - let path = ["chains"; chain; "blocks"; block; "context"; "delegates"] in - Client.spawn_rpc ?endpoint ?hooks GET path client - - let get_all ?endpoint ?hooks ?(chain = "main") ?(block = "head") client = - let path = ["chains"; chain; "blocks"; block; "context"; "delegates"] in - let* contracts = Client.rpc ?endpoint ?hooks GET path client in - return (JSON.as_list contracts |> List.map JSON.as_string) - - let spawn_get ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh client - = - let path = - ["chains"; chain; "blocks"; block; "context"; "delegates"; pkh] - in - Client.spawn_rpc ?endpoint ?hooks GET path client - - let get ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh client = - let path = - ["chains"; chain; "blocks"; block; "context"; "delegates"; pkh] - in - Client.rpc ?endpoint ?hooks GET path client - - let sub_path ~chain ~block ~pkh field = - ["chains"; chain; "blocks"; block; "context"; "delegates"; pkh; field] - - let spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh field client = - let path = sub_path ~chain ~block ~pkh field in - Client.spawn_rpc ?endpoint ?hooks GET path client - - let get_sub ?endpoint ?hooks ~chain ~block ~pkh field client = - let path = sub_path ~chain ~block ~pkh field in - Client.rpc ?endpoint ?hooks GET path client - - let spawn_get_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "balance" client - - let get_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh - client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "balance" client - - let spawn_get_full_balance ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "full_balance" client - - let get_full_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh - client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "full_balance" client - - let spawn_get_frozen_deposits ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "frozen_deposits" client - - let get_frozen_deposits ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "frozen_deposits" client - - let spawn_get_deactivated ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "deactivated" client - - let get_deactivated ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh - client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "deactivated" client - - let spawn_get_delegated_balance ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "delegated_balance" client - - let get_delegated_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "delegated_balance" client - - let spawn_get_delegated_contracts ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub - ?endpoint - ?hooks - ~chain - ~block - ~pkh - "delegated_contracts" - client - - let get_delegated_contracts ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "delegated_contracts" client - - let spawn_get_frozen_balance ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "frozen_balance" client - - let get_frozen_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "frozen_balance" client - - let spawn_get_frozen_balance_by_cycle ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub - ?endpoint - ?hooks - ~chain - ~block - ~pkh - "frozen_balance_by_cycle" - client - - let get_frozen_balance_by_cycle ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "frozen_balance_by_cycle" client - - let spawn_get_grace_period ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "grace_period" client - - let get_grace_period ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh - client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "grace_period" client - - let spawn_get_staking_balance ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "staking_balance" client - - let get_staking_balance ?endpoint ?hooks ?(chain = "main") ?(block = "head") - ~pkh client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "staking_balance" client - - let spawn_get_voting_power ?endpoint ?hooks ?(chain = "main") - ?(block = "head") ~pkh client = - spawn_get_sub ?endpoint ?hooks ~chain ~block ~pkh "voting_power" client - - let get_voting_power ?endpoint ?hooks ?(chain = "main") ?(block = "head") ~pkh - client = - get_sub ?endpoint ?hooks ~chain ~block ~pkh "voting_power" client -end - module Seed = struct let get_seed ?endpoint ?hooks ?(chain = "main") ?(block = "head") client = let path = ["chains"; chain; "blocks"; block; "context"; "seed"] in diff --git a/tezt/lib_tezos/RPC_legacy.mli b/tezt/lib_tezos/RPC_legacy.mli index e7a9407e3e69f3b1225c53ed5c54c61161059bd0..bdbf7724bcad1d6185bba5b1d0b94d2b1cd0876c 100644 --- a/tezt/lib_tezos/RPC_legacy.mli +++ b/tezt/lib_tezos/RPC_legacy.mli @@ -36,268 +36,6 @@ type ctxt_type = Bytes | Json -module Delegates : sig - (** Common protocol RPSs for delegates (i.e. under [/delegates]). *) - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates *) - val get_all : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - Client.t -> - string list Lwt.t - - (** Same as [get_all], but do not wait for the process to exit. *) - val spawn_get_all : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh] *) - val get : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get], but do not wait for the process to exit. *) - val spawn_get : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/balance *) - val get_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_balance], but do not wait for the process to exit. *) - val spawn_get_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/full_balance *) - val get_full_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_full_balance], but do not wait for the process to exit. *) - val spawn_get_full_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/frozen_deposits *) - val get_frozen_deposits : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_frozen_deposits], but do not wait for the process to exit. *) - val spawn_get_frozen_deposits : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/deactivated *) - val get_deactivated : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_deactivated], but do not wait for the process to exit. *) - val spawn_get_deactivated : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/delegated_balance *) - val get_delegated_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_delegated_balance], but do not wait for the process to exit. *) - val spawn_get_delegated_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/delegated_contracts *) - val get_delegated_contracts : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_delegated_contracts], but do not wait for the process to exit. *) - val spawn_get_delegated_contracts : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/frozen_balance *) - val get_frozen_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_frozen_balance], but do not wait for the process to exit. *) - val spawn_get_frozen_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/frozen_balance_by_cycle *) - val get_frozen_balance_by_cycle : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_frozen_balance_by_cycle], but do not wait for the process to exit. *) - val spawn_get_frozen_balance_by_cycle : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/grace_period *) - val get_grace_period : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_grace_period], but do not wait for the process to exit. *) - val spawn_get_grace_period : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/staking_balance *) - val get_staking_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_staking_balance], but do not wait for the process to exit. *) - val spawn_get_staking_balance : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t - - (** Call RPC /chain/[chain]/blocks/[block]/context/delegates/[pkh]/voting_power *) - val get_voting_power : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - JSON.t Lwt.t - - (** Same as [get_voting_power], but do not wait for the process to exit. *) - val spawn_get_voting_power : - ?endpoint:Client.endpoint -> - ?hooks:Process.hooks -> - ?chain:string -> - ?block:string -> - pkh:string -> - Client.t -> - Process.t -end - module Seed : sig val get_seed : ?endpoint:Client.endpoint -> diff --git a/tezt/tests/RPC_test.ml b/tezt/tests/RPC_test.ml index 4709eff77ea0c8b9a4a4755804be8b7370e0f68c..be67980b73be15ce8dc2cc6f084bc699ca1dcd33 100644 --- a/tezt/tests/RPC_test.ml +++ b/tezt/tests/RPC_test.ml @@ -167,7 +167,10 @@ let test_contracts _test_mode_tag _protocol ?endpoint client = RPC.Client.call ?endpoint ~hooks client @@ RPC.get_chain_block_context_contracts () in - let* contracts = RPC.Delegates.get_all ?endpoint ~hooks client in + let* contracts = + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegates () + in Log.info "Test implicit baker contract" ; let bootstrap = List.hd contracts in let* () = test_implicit_contract bootstrap in @@ -361,30 +364,41 @@ let test_delegates_on_registered_alpha ~contracts ?endpoint client = Log.info "Test implicit baker contract" ; let bootstrap = List.hd contracts in - let* _ = RPC.Delegates.get ?endpoint ~hooks ~pkh:bootstrap client in let* _ = - RPC.Delegates.get_full_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint client ~hooks + @@ RPC.get_chain_block_context_delegate bootstrap in let* _ = - RPC.Delegates.get_frozen_deposits ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_full_balance bootstrap in let* _ = - RPC.Delegates.get_deactivated ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_frozen_deposits bootstrap in let* _ = - RPC.Delegates.get_delegated_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_deactivated bootstrap in let* _ = - RPC.Delegates.get_delegated_contracts ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_delegated_balance bootstrap in let* _ = - RPC.Delegates.get_grace_period ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_delegated_contracts bootstrap in let* _ = - RPC.Delegates.get_staking_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_grace_period bootstrap in let* _ = - RPC.Delegates.get_voting_power ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_staking_balance bootstrap + in + let* _ = + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_voting_power bootstrap in unit @@ -393,35 +407,54 @@ let test_delegates_on_registered_hangzhou ~contracts ?endpoint client = Log.info "Test implicit baker contract" ; let bootstrap = List.hd contracts in - let* _ = RPC.Delegates.get ?endpoint ~hooks ~pkh:bootstrap client in - let* _ = RPC.Delegates.get_balance ?endpoint ~hooks ~pkh:bootstrap client in let* _ = - RPC.Delegates.get_frozen_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate bootstrap in + let* _ = - RPC.Delegates.get_frozen_balance_by_cycle - ?endpoint - ~hooks - ~pkh:bootstrap - client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_balance bootstrap + in + + let* _ = + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_frozen_balance bootstrap + in + + let* _ = + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_frozen_balance_by_cycle bootstrap in + let* _ = - RPC.Delegates.get_staking_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_staking_balance bootstrap in + let* _ = - RPC.Delegates.get_delegated_contracts ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_delegated_contracts bootstrap in + let* _ = - RPC.Delegates.get_delegated_balance ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_delegated_balance bootstrap in + let* _ = - RPC.Delegates.get_deactivated ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_deactivated bootstrap in + let* _ = - RPC.Delegates.get_grace_period ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_grace_period bootstrap in + let* _ = - RPC.Delegates.get_voting_power ?endpoint ~hooks ~pkh:bootstrap client + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegate_voting_power bootstrap in unit @@ -432,73 +465,45 @@ let test_delegates_on_unregistered_alpha ~contracts ?endpoint client = let unregistered_baker = "tz1c5BVkpwCiaPHJBzyjg7UHpJEMPTYA1bHG" in assert (not @@ List.mem unregistered_baker contracts) ; - let* _ = - RPC.Delegates.spawn_get ?endpoint ~hooks ~pkh:unregistered_baker client - |> Process.check ~expect_failure:true + let check_failure rpc = + let*? process = RPC.Client.spawn ?endpoint ~hooks client @@ rpc in + Process.check ~expect_failure:true process in - let* _ = - RPC.Delegates.spawn_get_full_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure @@ RPC.get_chain_block_context_delegate unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_frozen_deposits - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_full_balance unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_deactivated - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_frozen_deposits unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_delegated_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_deactivated unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_delegated_contracts - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_delegated_balance unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_grace_period - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_delegated_contracts + unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_staking_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_grace_period unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_voting_power - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_staking_balance unregistered_baker + in + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_voting_power unregistered_baker in unit @@ -509,81 +514,52 @@ let test_delegates_on_unregistered_hangzhou ~contracts ?endpoint client = let unregistered_baker = "tz1c5BVkpwCiaPHJBzyjg7UHpJEMPTYA1bHG" in assert (not @@ List.mem unregistered_baker contracts) ; - let* _ = - RPC.Delegates.spawn_get ?endpoint ~hooks ~pkh:unregistered_baker client - |> Process.check ~expect_failure:true + let check_failure rpc = + let*? process = RPC.Client.spawn ?endpoint ~hooks client @@ rpc in + Process.check ~expect_failure:true process in - let* _ = - RPC.Delegates.spawn_get_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + + let* () = + check_failure @@ RPC.get_chain_block_context_delegate unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_deactivated - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_balance unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_delegated_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_deactivated unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_delegated_contracts - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_delegated_balance unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_frozen_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_delegated_contracts + unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_frozen_balance_by_cycle - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_frozen_balance unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_grace_period - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_frozen_balance_by_cycle + unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_staking_balance - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_grace_period unregistered_baker in - let* _ = - RPC.Delegates.spawn_get_voting_power - ?endpoint - ~hooks - ~pkh:unregistered_baker - client - |> Process.check ~expect_failure:true + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_staking_balance unregistered_baker + in + let* () = + check_failure + @@ RPC.get_chain_block_context_delegate_voting_power unregistered_baker in unit @@ -592,7 +568,10 @@ let get_contracts ?endpoint client = RPC.Client.call ?endpoint ~hooks client @@ RPC.get_chain_block_context_contracts () in - let* contracts = RPC.Delegates.get_all ?endpoint ~hooks client in + let* contracts = + RPC.Client.call ?endpoint ~hooks client + @@ RPC.get_chain_block_context_delegates () + in Lwt.return contracts diff --git a/tezt/tests/consensus_key.ml b/tezt/tests/consensus_key.ml index 4cea03dad31a99584ce1e2a627c39a36c07cf2e6..6a8e8c670af173df498d20fbc125457401181cf3 100644 --- a/tezt/tests/consensus_key.ml +++ b/tezt/tests/consensus_key.ml @@ -441,11 +441,20 @@ let update_consensus_key ?(expect_failure = false) ~pk:consensus_key.alias client in - let* _ = RPC.Delegates.get ~hooks ~pkh:src.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate src.public_key_hash + in let* () = Client.bake_for_and_wait ~keys:[baker] client in - let* _ = RPC.Delegates.get ~hooks ~pkh:src.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate src.public_key_hash + in let* () = bake_n_cycles (preserved_cycles + 1) client in - let* _ = RPC.Delegates.get ~hooks ~pkh:src.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate src.public_key_hash + in unit let test_consensus_key_update ?(expect_failure = false) @@ -488,14 +497,20 @@ let register_key_as_delegate ?(expect_failure = false) client in let* () = Client.bake_for_and_wait ~keys:[baker] client in - let* _ = RPC.Delegates.get ~hooks ~pkh:owner.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate owner.public_key_hash + in let* _ = RPC.Client.call ~hooks client @@ RPC.get_chain_block_context_contract ~id:consensus_key.public_key_hash () in (* Wait for consensus key to be active *) let* () = bake_n_cycles (preserved_cycles + 1) client in - let* _ = RPC.Delegates.get ~hooks ~pkh:owner.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate owner.public_key_hash + in unit let transfer ?hooks ?(expect_failure = false) @@ -597,7 +612,10 @@ let test_drain_delegate_1 ?(baker = Constant.bootstrap1.alias) let* () = update_consensus_key ~baker ~src:delegate ~consensus_key:consensus client in - let* _ = RPC.Delegates.get ~hooks ~pkh:delegate.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate delegate.public_key_hash + in let* _ = RPC.Client.call ~hooks client @@ RPC.get_chain_block_context_contract_balance @@ -626,7 +644,10 @@ let test_drain_delegate_1 ?(baker = Constant.bootstrap1.alias) (* In case delegate = baker, use the consensus key updated above *) client in - let* _ = RPC.Delegates.get ~hooks ~pkh:delegate.public_key_hash client in + let* _ = + RPC.Client.call ~hooks client + @@ RPC.get_chain_block_context_delegate delegate.public_key_hash + in let* _ = RPC.Client.call ~hooks client @@ RPC.get_chain_block_context_contract_balance