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

Economic = economique

Browse Source 
Economical = econome
This commit is contained in:
Arthur Breitman 2017-03-15 08:00:53 -07:00
parent 826f2ea4ba
commit 76fad5a3db
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -48,7 +48,7 @@ This should produce three binaries:
* `tezos-node`: the tezos daemon itself;
* `tezos-client`: a minimal command-line client;
* `tezos-protocol-compiler`: a protocol compiler used for developing new version of the economical protocol.
* `tezos-protocol-compiler`: a protocol compiler used for developing new version of the economic protocol.
Currently Tezos is being developed for Linux only. It should work on mac OS,
but it has not been tested recently. A Windows port is in progress.
@ -291,7 +291,7 @@ Shell:
```
To get API attached to the "genesis" block, including the remote procedures
provided by the associated economical protocol version:
provided by the associated economic protocol version:
```
./tezos-client rpc list /blocks/genesis/

2
src/node/main/node_run_command.ml
View File

@ -212,7 +212,7 @@ module Term = struct
let open Cmdliner in
let doc =
"Run the daemon in sandbox mode. P2P is disabled, and constants of \
the economical protocol can be altered with an optional JSON file. \
the economic protocol can be altered with an optional JSON file. \
$(b,IMPORTANT): Using sandbox mode affects the node state and \
subsequent runs of Tezos node must also use sandbox mode. \
In order to run the node in normal mode afterwards, a full reset \

2
src/node/shell/state.ml
View File

@ -1234,7 +1234,7 @@ let () =
~id: "invalidBlock"
~title: "Invalid block"
~description:
"The economical protocol refused to validate the block."
"The economic protocol refused to validate the block."
~pp:(fun ppf block_hash ->
Format.fprintf ppf "Cannot validate the block %a"
Block_hash.pp_short block_hash)

4
src/node/updater/register.ml
View File

@ -18,10 +18,10 @@ module Make(Proto : Protocol.PACKED_PROTOCOL) = struct
Error_monad.register_wrapped_error_kind
(fun ecoerrors -> Proto.classify_errors ecoerrors)
~id ~title:"Error returned by the protocol"
~description:"Wrapped error for the economical protocol."
~description:"Wrapped error for the economic protocol."
~pp:(fun ppf ->
Format.fprintf ppf
"@[<v 2>Economical error:@ %a@]"
"@[<v 2>Economic error:@ %a@]"
(Format.pp_print_list Proto.pp))
Data_encoding.(obj1 (req "ecoproto" (list Proto.error_encoding)))
(function Ecoproto_error ecoerrors -> Some ecoerrors

2
src/proto/environment/error_monad.mli
View File

@ -9,7 +9,7 @@ type error_category =
| `Permanent (** Errors that will happen no matter the context *)
]
(** Custom error handling for economical protocols. *)
(** Custom error handling for economic protocols. *)
type error = ..

2
src/utils/base58.mli
View File

@ -86,7 +86,7 @@ val register_resolver: 'a encoding -> (string -> 'a list Lwt.t) -> unit
value provides at least [n/2] bytes of a prefix of the original value. *)
val complete: ?alphabet:Alphabet.t -> string -> string list Lwt.t
(** {1 Low-level: distinct registering function for economical protocol} *)
(** {1 Low-level: distinct registering function for economic protocol} *)
(** See [src/proto/environment/base48.mli]} for an inlined
documentation. *)