Merge branch 'develop' into anton/new-pubsub

This commit is contained in:
Anton Kaliaev
2019-02-13 11:47:14 +04:00
committed by GitHub
75 changed files with 1303 additions and 577 deletions

View File

@ -538,10 +538,8 @@ func makeBlockchainFromWAL(wal WAL) ([]*types.Block, []*types.Commit, error) {
}
case *types.Vote:
if p.Type == types.PrecommitType {
thisBlockCommit = &types.Commit{
BlockID: p.BlockID,
Precommits: []*types.CommitSig{p.CommitSig()},
}
commitSigs := []*types.CommitSig{p.CommitSig()}
thisBlockCommit = types.NewCommit(p.BlockID, commitSigs)
}
}
}