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

some review request

Browse Source
This commit is contained in:
Lesenechal Remi 2019-11-22 16:02:53 +01:00
parent cd94fd850b
commit 6555c39c9d
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/contracts/multisig-v2.ligo
View File

@ -1,7 +1,7 @@
// storage type
type threshold_t is nat
type addr_set_t is set(address)
type message_store_t is map(bytes,addr_set_t)
type message_store_t is big_map(bytes,addr_set_t)
type storage_t is record
threshold : threshold_t ;
@ -19,28 +19,24 @@ type entry_point_t is
| Send of send_pt
function send (const param : send_pt; const s : storage_t) : contract_return_t is block {
if not set_mem(sender,s.auth) then failwith("Unauthorized address") else skip ;
var message : message_t := param ;
const packed_msg : bytes = bytes_pack(message) ;
var ret_ops : list(operation) := (nil : list(operation)) ;
if set_mem(source,s.auth) then block {
const packed_msg : bytes = bytes_pack(message) ;
var store_patch : addr_set_t := set_empty ;
var new_store : addr_set_t :=
case map_get(packed_msg, s.message_store) of
| Some(voters) ->
if set_mem(source,voters) then failwith("Already accounted message")
else store_patch := set_add(source,voters)
| None -> store_patch := set source end
end;
| Some(voters) -> set_add(sender,voters)
| None -> (set_empty : addr_set_t) end
;
if size(store_patch) >= s.threshold then block {
remove packed_msg from map s.message_store ;
ret_ops := message(unit) ;
} else
patch s.message_store with map [packed_msg -> store_patch]
}
else
failwith("Unauthorized address");
if size(new_store) >= s.threshold then block {
remove packed_msg from map s.message_store ;
ret_ops := message(unit) ;
} else
s.message_store[packed_msg] := new_store
} with ( ret_ops , s)

23
src/test/multisig_v2_tests.ml
View File

@ -43,7 +43,7 @@ let storage threshold id_list store_list = e_ez_record [
("auth" , e_typed_set
(List.fold_left (fun acc el -> (e_address @@ addr el)::acc) [] id_list)
t_address) ;
("message_store" , e_typed_map store_list t_bytes (t_set t_address))
("message_store" , e_typed_big_map store_list t_bytes (t_set t_address))
]
(* sender not stored in the authorized set *)
@ -51,8 +51,8 @@ let wrong_addr () =
let%bind program,_ = get_program () in
let init_storage = storage 1 [1;2] [] in
let amount = Memory_proto_alpha.Protocol.Alpha_context.Tez.zero in
let payer = contract 3 in
let options = Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~payer () in
let source = contract 3 in
let options = Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~source () in
let%bind () =
let exp_failwith = "Unauthorized address" in
expect_string_failwith ~options program "main"
@ -64,17 +64,14 @@ let already_accounted () =
let%bind program,_ = get_program () in
let%bind packed_payload = pack_payload program empty_message in
let%bind bytes = e_bytes_ofbytes packed_payload in
let init_storage = storage 1 [1;2]
let init_storage = storage 2 [1;2]
[(bytes, e_set [e_address@@ addr 1])] in
let%bind () =
let options =
let amount = Memory_proto_alpha.Protocol.Alpha_context.Tez.zero in
let payer = contract 1 in
Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~payer () in
let exp_failwith = "Already accounted message" in
expect_string_failwith ~options program "main"
(e_pair param init_storage) exp_failwith in
ok ()
let source = contract 1 in
Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~source () in
expect_eq ~options program "main"
(e_pair param init_storage) (e_pair empty_op_list init_storage)
(* successful storing in the message store *)
let succeeded_storing () =
@ -83,8 +80,8 @@ let succeeded_storing () =
let%bind bytes = e_bytes_ofbytes packed_payload in
let options =
let amount = Memory_proto_alpha.Protocol.Alpha_context.Tez.zero in
let payer = contract 1 in
Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~payer () in
let source = contract 1 in
Proto_alpha_utils.Memory_proto_alpha.make_options ~amount ~source () in
let%bind () = expect_eq_n_trace_aux ~options [1;2] program "main"
(fun th ->
let init_storage = storage th [1;2;3]