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

Client/Baking: use wallet lock

Browse Source
This commit is contained in:
Mathias 2018-05-22 15:25:41 +02:00 committed by Grégoire Henry
parent c0a47a5b6f
commit c4549650b5
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/proto_alpha/lib_baking/client_baking_nonces.ml
View File

@ -10,7 +10,6 @@
open Proto_alpha open Proto_alpha
open Alpha_context open Alpha_context
(* TODO locking... *)
type t = (Block_hash.t * Nonce.t) list type t = (Block_hash.t * Nonce.t) list
@ -28,29 +27,36 @@ let load (wallet : #Client_context.wallet) =
wallet#load ~default:[] name encoding wallet#load ~default:[] name encoding
let save (wallet : #Client_context.wallet) list = let save (wallet : #Client_context.wallet) list =
wallet#write name list encoding wallet#with_lock (fun () ->
wallet#write name list encoding)
let mem (wallet : #Client_context.wallet) block_hash = let mem (wallet : #Client_context.wallet) block_hash =
load wallet >>|? fun data -> wallet#with_lock (fun () ->
List.mem_assoc block_hash data load wallet >>|? fun data ->
List.mem_assoc block_hash data)
let find wallet block_hash = let find (wallet : #Client_context.wallet) block_hash =
load wallet >>|? fun data -> wallet#with_lock ( fun () ->
try Some (List.assoc block_hash data) load wallet >>|? fun data ->
with Not_found -> None try Some (List.assoc block_hash data)
with Not_found -> None)
let add wallet block_hash nonce =
let add (wallet : #Client_context.wallet) block_hash nonce =
wallet#with_lock ( fun () ->
load wallet >>=? fun data -> load wallet >>=? fun data ->
save wallet ((block_hash, nonce) :: save wallet ((block_hash, nonce) ::
List.remove_assoc block_hash data) List.remove_assoc block_hash data))
let del wallet block_hash = let del (wallet : #Client_context.wallet) block_hash =
load wallet >>=? fun data -> wallet#with_lock ( fun () ->
save wallet (List.remove_assoc block_hash data) load wallet >>=? fun data ->
save wallet (List.remove_assoc block_hash data))
let dels wallet hashes = let dels (wallet : #Client_context.wallet) hashes =
wallet#with_lock ( fun () ->
load wallet >>=? fun data -> load wallet >>=? fun data ->
save wallet @@ save wallet @@
List.fold_left List.fold_left
(fun data hash -> List.remove_assoc hash data) (fun data hash -> List.remove_assoc hash data)
data hashes data hashes)