Skip to content

Commit

Permalink
Merge branch 'master' into alessio/8530-unchecked-error
Browse files Browse the repository at this point in the history
  • Loading branch information
Alessio Treglia authored Feb 6, 2021
2 parents 40a0c6f + c5c049a commit 0182d44
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 149 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (x/{bank,distrib,gov,slashing,staking}) [\#8363](https://github.com/cosmos/cosmos-sdk/issues/8363) Store keys have been modified to allow for variable-length addresses.
* (x/ibc) [\#8266](https://github.com/cosmos/cosmos-sdk/issues/8266) Add amino JSON for IBC messages in order to support Ledger text signing.
* (x/evidence) [\#8502](https://github.com/cosmos/cosmos-sdk/pull/8502) `HandleEquivocationEvidence` persists the evidence to state.

### Improvements

Expand Down
148 changes: 0 additions & 148 deletions cosmovisor/README.md

This file was deleted.

1 change: 1 addition & 0 deletions cosmovisor/README.md
1 change: 1 addition & 0 deletions x/evidence/keeper/infraction.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,5 @@ func (k Keeper) HandleEquivocationEvidence(ctx sdk.Context, evidence *types.Equi

k.slashingKeeper.JailUntil(ctx, consAddr, types.DoubleSignJailEndTime)
k.slashingKeeper.Tombstone(ctx, consAddr)
k.SetEvidence(ctx, evidence)
}
4 changes: 4 additions & 0 deletions x/evidence/keeper/infraction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ func (suite *KeeperTestSuite) TestHandleDoubleSign() {
tstaking.Ctx = ctx
tstaking.Denom = stakingParams.BondDenom
tstaking.Undelegate(sdk.AccAddress(operatorAddr), operatorAddr, totalBond, true)

// query evidence from store
evidences := suite.app.EvidenceKeeper.GetAllEvidence(ctx)
suite.Len(evidences, 1)
}

func (suite *KeeperTestSuite) TestHandleDoubleSign_TooOld() {
Expand Down
3 changes: 2 additions & 1 deletion x/evidence/spec/01_concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ The `Handler` (defined below) is responsible for executing the entirety of the
business logic for handling `Evidence`. This typically includes validating the
evidence, both stateless checks via `ValidateBasic` and stateful checks via any
keepers provided to the `Handler`. In addition, the `Handler` may also perform
capabilities such as slashing and jailing a validator.
capabilities such as slashing and jailing a validator. All `Evidence` handled
by the `Handler` should be persisted.

```go
// Handler defines an agnostic Evidence handler. The handler is responsible
Expand Down

0 comments on commit 0182d44

Please sign in to comment.