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

Shell/test: add option to not enforce context hash in block header

Browse Source
This commit is contained in:
Grégoire Henry 2018-02-12 16:36:24 +01:00
parent 7643fa9b15
commit 77bd0af3d1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib_shell/state.ml
View File

@ -556,6 +556,11 @@ module Block = struct
~description: ~description:
"When commiting the context of a block, the announced context \ "When commiting the context of a block, the announced context \
hash was not the one computed at commit time." hash was not the one computed at commit time."
~pp: (fun ppf (got, exp) ->
Format.fprintf ppf
"@[<v 2>Inconsistant hash:@ got: %a@ expected: %a"
Context_hash.pp got
Context_hash.pp exp)
Data_encoding.(obj2 Data_encoding.(obj2
(req "wrong_context_hash" Context_hash.encoding) (req "wrong_context_hash" Context_hash.encoding)
(req "expected_context_hash" Context_hash.encoding)) (req "expected_context_hash" Context_hash.encoding))
@ -563,6 +568,7 @@ module Block = struct
(fun (got, exp) -> Inconsistent_hash (got, exp)) (fun (got, exp) -> Inconsistent_hash (got, exp))
let store let store
?(dont_enforce_context_hash = false)
net_state block_header operations net_state block_header operations
{ Updater.context ; message ; max_operations_ttl ; { Updater.context ; message ; max_operations_ttl ;
max_operation_data_length } = max_operation_data_length } =
@ -579,10 +585,16 @@ module Block = struct
Context.commit Context.commit
~time:block_header.shell.timestamp ?message context >>= fun commit -> ~time:block_header.shell.timestamp ?message context >>= fun commit ->
fail_unless fail_unless
(Context_hash.equal block_header.shell.context commit) (dont_enforce_context_hash
|| Context_hash.equal block_header.shell.context commit)
(Inconsistent_hash (commit, block_header.shell.context)) >>=? fun () -> (Inconsistent_hash (commit, block_header.shell.context)) >>=? fun () ->
let contents = { let contents = {
Store.Block.header = block_header ; Store.Block.header =
if dont_enforce_context_hash then
{ block_header
with shell = { block_header.shell with context = commit } }
else
block_header ;
message ; message ;
max_operations_ttl ; max_operations_ttl ;
max_operation_data_length ; max_operation_data_length ;

1
src/lib_shell/state.mli
View File

@ -108,6 +108,7 @@ module Block : sig
type error += Inconsistent_hash of Context_hash.t * Context_hash.t type error += Inconsistent_hash of Context_hash.t * Context_hash.t
val store: val store:
?dont_enforce_context_hash:bool ->
Net.t -> Net.t ->
Block_header.t -> Block_header.t ->
Operation.t list list -> Operation.t list list ->