From c2803b80e8ba7206d6b3cffe3280f50230593894 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 23 Oct 2017 11:05:20 -0400
Subject: [PATCH] update changelog; fixes from rebase

---
 CHANGELOG.md             | 4 ++--
 state/state.go           | 7 -------
 state/txindex/indexer.go | 3 +--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b97fe65..df87c163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,6 @@ BREAKING CHANGES:
 - Better support for injecting randomness
 - Pass evidence/voteInfo through ABCI
 - Upgrade consensus for more real-time use of evidence
-- func(s *State) LoadABCIResponses() *ABCIResponses now returns nil if now ABCIResponses could be loaded from the database.
-  Previously it would return a pointer to an ABCIResponses object if it didn't find anything in the database.
 
 FEATURES:
 - Peer reputation management
@@ -30,6 +28,8 @@ BUG FIXES:
 - Graceful handling/recovery for apps that have non-determinism or fail to halt
 - Graceful handling/recovery for violations of safety, or liveness
 
+## 0.12.0 (TBA)
+
 ## 0.11.1 (October 10, 2017)
 
 IMPROVEMENTS:
diff --git a/state/state.go b/state/state.go
index 752fbff1..4241f9de 100644
--- a/state/state.go
+++ b/state/state.go
@@ -279,13 +279,6 @@ func (s *State) GetValidators() (last *types.ValidatorSet, current *types.Valida
 	return s.LastValidators, s.Validators
 }
 
-// Params returns the consensus parameters used for validating blocks
-func (s *State) Params() types.ConsensusParams {
-	// TODO: this should move into the State proper
-	// when we allow the app to change it
-	return *s.GenesisDoc.ConsensusParams
-}
-
 //------------------------------------------------------------------------
 
 // ABCIResponses retains the responses of the various ABCI calls during block processing.
diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go
index e17f2135..66897905 100644
--- a/state/txindex/indexer.go
+++ b/state/txindex/indexer.go
@@ -7,7 +7,6 @@ import (
 )
 
 // TxIndexer interface defines methods to index and search transactions.
-// TODO: Add the ability to create an independent TxIndexer.
 type TxIndexer interface {
 
 	// AddBatch analyzes, indexes or stores a batch of transactions.
@@ -16,7 +15,7 @@ type TxIndexer interface {
 	// support batching.
 	AddBatch(b *Batch) error
 
-	// Get return the transaction specified by hash or nil if the transaction is not indexed
+	// Get returns the transaction specified by hash or nil if the transaction is not indexed
 	// or stored.
 	Get(hash []byte) (*types.TxResult, error)
 }