Merge branch 'develop' into dev/isolate_cli_tests

This commit is contained in:
Christopher Goes 2018-07-04 21:21:40 +02:00 committed by GitHub
commit 0efa89ff2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -189,7 +189,7 @@ docs](https://godoc.org/github.com/cosmos/cosmos-sdk/types#Context) for more det
### Result ### Result
Handler takes a Context and Msg and returns a Result. Handler takes a Context and Msg and returns a Result.
Result is motivated by the corresponding [ABCI result](https://github.com/tendermint/tendermint/abci/blob/master/types/types.proto#L165). Result is motivated by the corresponding [ABCI result](https://github.com/tendermint/tendermint/blob/master/abci/types/types.proto#L165).
It contains return values, error information, logs, and meta data about the transaction: It contains return values, error information, logs, and meta data about the transaction:
```go ```go
@ -409,7 +409,7 @@ func txDecoder(txBytes []byte) (sdk.Tx, sdk.Error) {
Finally, we stitch it all together using the `BaseApp`. Finally, we stitch it all together using the `BaseApp`.
The BaseApp is an abstraction over the [Tendermint The BaseApp is an abstraction over the [Tendermint
ABCI](https://github.com/tendermint/tendermint/abci) that ABCI](https://github.com/tendermint/tendermint/tree/master/abci) that
simplifies application development by handling common low-level concerns. simplifies application development by handling common low-level concerns.
It serves as the mediator between the two key components of an SDK app: the store It serves as the mediator between the two key components of an SDK app: the store
and the message handlers. The BaseApp implements the and the message handlers. The BaseApp implements the
@ -473,7 +473,7 @@ Tendermint consensus engine. It would be initialized by a Genesis file, and it
would be driven by blocks of transactions committed by the underlying Tendermint would be driven by blocks of transactions committed by the underlying Tendermint
consensus. We'll talk more about ABCI and how this all works a bit later, but consensus. We'll talk more about ABCI and how this all works a bit later, but
feel free to check the feel free to check the
[specification](https://github.com/tendermint/tendermint/abci/blob/master/specification.md). [specification](https://github.com/tendermint/tendermint/blob/master/docs/abci-spec.md).
We'll also see how to connect our app to a complete suite of components We'll also see how to connect our app to a complete suite of components
for running and using a live blockchain application. for running and using a live blockchain application.

View File

@ -16,7 +16,7 @@ here we will introduce the other ABCI requests sent by Tendermint, and
how we can use them to build more advanced applications. For a more complete how we can use them to build more advanced applications. For a more complete
depiction of the ABCI and how its used, see depiction of the ABCI and how its used, see
[the [the
specification](https://github.com/tendermint/tendermint/abci/blob/master/specification.md) specification](https://github.com/tendermint/tendermint/blob/master/docs/abci-spec.md)
## InitChain ## InitChain

View File

@ -6,7 +6,7 @@ Tendermint blocks can include
[Evidence](https://github.com/tendermint/tendermint/blob/develop/docs/spec/blockchain/blockchain.md#evidence), which indicates that a validator [Evidence](https://github.com/tendermint/tendermint/blob/develop/docs/spec/blockchain/blockchain.md#evidence), which indicates that a validator
committed malicious behaviour. The relevant information is forwarded to the committed malicious behaviour. The relevant information is forwarded to the
application as [ABCI application as [ABCI
Evidence](https://github.com/tendermint/tendermint/abci/blob/develop/types/types.proto#L259), so the validator an be accordingly punished. Evidence](https://github.com/tendermint/tendermint/blob/develop/abci/types/types.proto#L259), so the validator an be accordingly punished.
For some `evidence` to be valid, it must satisfy: For some `evidence` to be valid, it must satisfy:

View File

@ -256,7 +256,7 @@ Accounts are serialized and stored in a Merkle tree under the key
Typically, the address of the account is the 20-byte ``RIPEMD160`` hash Typically, the address of the account is the 20-byte ``RIPEMD160`` hash
of the public key, but other formats are acceptable as well, as defined of the public key, but other formats are acceptable as well, as defined
in the `Tendermint crypto in the `Tendermint crypto
library <https://github.com/tendermint/tendermint/crypto>`__. The Merkle tree library <https://github.com/tendermint/tendermint/tree/master/crypto>`__. The Merkle tree
used in Basecoin is a balanced, binary search tree, which we call an used in Basecoin is a balanced, binary search tree, which we call an
`IAVL tree <https://github.com/tendermint/iavl>`__. `IAVL tree <https://github.com/tendermint/iavl>`__.