fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-12 21:01:21 +00:00
Code Issues Projects Releases Wiki Activity

post rebase fixes

Browse Source
This commit is contained in:
Ethan Buchman
2017-04-18 21:35:00 -04:00
parent 29a893b193
commit 52d03d0071
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
state/execution.go
View File

@ -233,12 +233,6 @@ func (s *State) ApplyBlock(eventCache types.Fireable, proxyAppConn proxy.AppConn
return fmt.Errorf("Commit failed for application: %v", err) return fmt.Errorf("Commit failed for application: %v", err)
} }
batch := txindex.NewBatch(block.NumTxs)
for _, r := range txResults {
batch.Add(*r)
}
s.TxIndexer.AddBatch(batch)
fail.Fail() // XXX fail.Fail() // XXX
// save the state // save the state
@ -277,12 +271,17 @@ func (s *State) CommitStateUpdateMempool(proxyAppConn proxy.AppConnConsensus, bl
func (s *State) indexTxs(abciResponses *ABCIResponses) { func (s *State) indexTxs(abciResponses *ABCIResponses) {
// save the tx results using the TxIndexer // save the tx results using the TxIndexer
// NOTE: these may be overwriting, but the values should be the same. // NOTE: these may be overwriting, but the values should be the same.
batch := txindexer.NewBatch() batch := txindex.NewBatch(len(abciResponses.DeliverTx))
for i, d := range abciResponses.DeliverTx { for i, d := range abciResponses.DeliverTx {
tx := abciResponses.txs[i] tx := abciResponses.txs[i]
batch.Index(tx.Hash(), types.TxResult{uint64(abciResponses.Height), uint32(i), *d}) batch.Add(types.TxResult{
Height: uint64(abciResponses.Height),
Index: uint32(i),
Tx: tx,
Result: *d,
})
} }
s.TxIndexer.Batch(batch) s.TxIndexer.AddBatch(batch)
} }
// Exec and commit a block on the proxyApp without validating or mutating the state // Exec and commit a block on the proxyApp without validating or mutating the state