From 52d03d0071c737e1048ea4bd8ef12f4cd490211c Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 18 Apr 2017 21:35:00 -0400 Subject: [PATCH] post rebase fixes --- state/execution.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/state/execution.go b/state/execution.go index 4874fdc70..0b1aff699 100644 --- a/state/execution.go +++ b/state/execution.go @@ -233,12 +233,6 @@ func (s *State) ApplyBlock(eventCache types.Fireable, proxyAppConn proxy.AppConn 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 // save the state @@ -277,12 +271,17 @@ func (s *State) CommitStateUpdateMempool(proxyAppConn proxy.AppConnConsensus, bl func (s *State) indexTxs(abciResponses *ABCIResponses) { // save the tx results using the TxIndexer // 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 { 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