From 3c44f1dfba6008100efdd212d4143ff90a5982f6 Mon Sep 17 00:00:00 2001 From: Guillem Rieu Date: Fri, 14 Apr 2017 16:25:01 +0200 Subject: [PATCH] Proto/Alpha: replace Vote.`set`_current_proposal by `init`_current_proposal --- src/proto/alpha/amendment.ml | 2 +- src/proto/alpha/tezos_context.mli | 2 +- src/proto/alpha/vote_storage.ml | 2 +- src/proto/alpha/vote_storage.mli | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/proto/alpha/amendment.ml b/src/proto/alpha/amendment.ml index 82f7b9687..f44cc7e06 100644 --- a/src/proto/alpha/amendment.ml +++ b/src/proto/alpha/amendment.ml @@ -57,7 +57,7 @@ let start_new_voting_cycle ctxt = Vote.freeze_listings ctxt >>=? fun ctxt -> return ctxt | Some proposal -> - Vote.set_current_proposal ctxt proposal >>=? fun ctxt -> + Vote.init_current_proposal ctxt proposal >>=? fun ctxt -> Vote.freeze_listings ctxt >>=? fun ctxt -> Vote.set_current_period_kind ctxt Testing_vote >>=? fun ctxt -> return ctxt diff --git a/src/proto/alpha/tezos_context.mli b/src/proto/alpha/tezos_context.mli index 2884bcd3a..f7dc099e2 100644 --- a/src/proto/alpha/tezos_context.mli +++ b/src/proto/alpha/tezos_context.mli @@ -410,7 +410,7 @@ module Vote : sig val get_current_proposal: context -> proposal tzresult Lwt.t - val set_current_proposal: + val init_current_proposal: context -> proposal -> context tzresult Lwt.t val clear_current_proposal: context -> context tzresult Lwt.t diff --git a/src/proto/alpha/vote_storage.ml b/src/proto/alpha/vote_storage.ml index 885b02fd6..9daece03e 100644 --- a/src/proto/alpha/vote_storage.ml +++ b/src/proto/alpha/vote_storage.ml @@ -77,7 +77,7 @@ let get_current_quorum = Storage.Vote.Current_quorum.get let set_current_quorum = Storage.Vote.Current_quorum.set let get_current_proposal = Storage.Vote.Current_proposal.get -let set_current_proposal = Storage.Vote.Current_proposal.set +let init_current_proposal = Storage.Vote.Current_proposal.init let clear_current_proposal = Storage.Vote.Current_proposal.delete let init ctxt = diff --git a/src/proto/alpha/vote_storage.mli b/src/proto/alpha/vote_storage.mli index 4126275ef..49e847597 100644 --- a/src/proto/alpha/vote_storage.mli +++ b/src/proto/alpha/vote_storage.mli @@ -45,7 +45,7 @@ val set_current_period_kind: val get_current_proposal: Storage.t -> Protocol_hash.t tzresult Lwt.t -val set_current_proposal: +val init_current_proposal: Storage.t -> Protocol_hash.t -> Storage.t tzresult Lwt.t val clear_current_proposal: Storage.t -> Storage.t tzresult Lwt.t