balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rebase conflict.

Browse Source 
oups...
This commit is contained in:
Grégoire Henry 2018-04-17 15:24:23 +02:00
parent a491083586
commit 11ad8fa8ea
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_alpha/lib_protocol/src/delegate_services.ml
View File

@ -343,7 +343,7 @@ module S = struct
~query: RPC_query.empty ~query: RPC_query.empty
~input: Data_encoding.empty ~input: Data_encoding.empty
~output: frozen_balances_encoding ~output: frozen_balances_encoding
RPC_path.(open_root / "delegate" /: Ed25519.Public_key_hash.rpc_arg / "frozen_balances") RPC_path.(open_root / "delegate" /: Signature.Public_key_hash.rpc_arg / "frozen_balances")
end end
let () = let () =
let open Services_registration in let open Services_registration in

4
src/proto_alpha/lib_protocol/src/delegate_services.mli
View File

@ -9,7 +9,9 @@
open Alpha_context open Alpha_context
val frozen_balances : 'a #RPC_context.simple -> 'a -> Ed25519.Public_key_hash.t -> val frozen_balances:
'a #RPC_context.simple -> 'a ->
Signature.Public_key_hash.t ->
Delegate.frozen_balances shell_tzresult Lwt.t Delegate.frozen_balances shell_tzresult Lwt.t
module Baker : sig module Baker : sig

2
src/proto_alpha/lib_protocol/src/delegate_storage.mli
View File

@ -98,7 +98,7 @@ type frozen_balances = {
(** Returns the amount of frozen deposit, fees and rewards associated to a given key. *) (** Returns the amount of frozen deposit, fees and rewards associated to a given key. *)
val frozen_balances: val frozen_balances:
Raw_context.t -> Ed25519.Public_key_hash.t -> Raw_context.t -> Signature.Public_key_hash.t ->
frozen_balances tzresult Lwt.t frozen_balances tzresult Lwt.t
(** Returns the full 'balance' of the implicit contract associated to (** Returns the full 'balance' of the implicit contract associated to