fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 06:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix Merge pull request #319

Browse Source
This commit is contained in:
Jae Kwon 2016-12-06 01:16:13 -08:00
parent dc436e72f9
commit 4202c4bf20
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/replay.go
View File

@ -100,7 +100,9 @@ func (cs *ConsensusState) catchupReplay(csHeight int) error {
// Search for height marker // Search for height marker
gr, found, err = cs.wal.group.Search("#HEIGHT: ", makeHeightSearchFunc(csHeight)) gr, found, err = cs.wal.group.Search("#HEIGHT: ", makeHeightSearchFunc(csHeight))
if err != nil { if err == io.EOF {
return nil
} else if err != nil {
return err return err
} }
if !found { if !found {

2
consensus/replay_test.go
View File

@ -116,7 +116,7 @@ func toPV(pv PrivValidator) *types.PrivValidator {
func setupReplayTest(thisCase *testCase, nLines int, crashAfter bool) (*ConsensusState, chan interface{}, string, string) { func setupReplayTest(thisCase *testCase, nLines int, crashAfter bool) (*ConsensusState, chan interface{}, string, string) {
fmt.Println("-------------------------------------") fmt.Println("-------------------------------------")
log.Notice(Fmt("Starting replay test of %d lines of WAL. Crash after = %v", nLines, crashAfter)) log.Notice(Fmt("Starting replay test %v (of %d lines of WAL). Crash after = %v", thisCase.name, nLines, crashAfter))
lineStep := nLines lineStep := nLines
if crashAfter { if crashAfter {

4
glide.lock generated
View File

@ -78,7 +78,7 @@ imports:
- name: github.com/tendermint/go-merkle - name: github.com/tendermint/go-merkle
version: bfc4afe28c7a50045d4d1eb043e67460f8a51a4f version: bfc4afe28c7a50045d4d1eb043e67460f8a51a4f
- name: github.com/tendermint/go-p2p - name: github.com/tendermint/go-p2p
version: f173a17ed3e9b341d480b36e5041819c8a5b8350 version: 67963ab800a72e91fecfb954e489b21aa906171a
subpackages: subpackages:
- upnp - upnp
- name: github.com/tendermint/go-rpc - name: github.com/tendermint/go-rpc
@ -94,7 +94,7 @@ imports:
subpackages: subpackages:
- term - term
- name: github.com/tendermint/tmsp - name: github.com/tendermint/tmsp
version: 3742e35e6db5dcd7596aac9f661b46f5699ebec8 version: 40448a3897dc870cc8e57a41a1e2872e976de539
subpackages: subpackages:
- client - client
- example/counter - example/counter

1
state/execution.go
View File

@ -264,6 +264,7 @@ func (s *State) CommitStateUpdateMempool(proxyAppConn proxy.AppConnConsensus, bl
// Set the state's new AppHash // Set the state's new AppHash
s.AppHash = res.Data s.AppHash = res.Data
s.AppHashIsStale = false
// Update mempool. // Update mempool.
mempool.Update(block.Height, block.Txs) mempool.Update(block.Height, block.Txs)

1
types/block.go
View File

@ -151,7 +151,6 @@ func (b *Block) StringShort() string {
type Header struct { type Header struct {
ChainID string `json:"chain_id"` ChainID string `json:"chain_id"`
Version string `json:"version"` // TODO:
Height int `json:"height"` Height int `json:"height"`
Time time.Time `json:"time"` Time time.Time `json:"time"`
NumTxs int `json:"num_txs"` // XXX: Can we get rid of this? NumTxs int `json:"num_txs"` // XXX: Can we get rid of this?