Merge branch 'develop' into dev/remove_golint

cosmos · Sep 4, 2018 · bb7b2ca · bb7b2ca
2 parents 9b26ccf + d1e8eda
commit bb7b2ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/PENDING.md b/PENDING.md
@@ -35,7 +35,8 @@ BREAKING CHANGES
     * [x/slashing] [#2122](https://github.com/cosmos/cosmos-sdk/pull/2122) - Implement slashing period
     * [types] \#2119 Parsed error messages and ABCI log errors to make them more human readable.
     * [simulation] Rename TestAndRunTx to Operation [#2153](https://github.com/cosmos/cosmos-sdk/pull/2153)
-    * [tools] Removed golint [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
+    * [tools] Removed gocyclo [#2211](https://github.com/cosmos/cosmos-sdk/issues/2211)
+    * [baseapp] Remove `SetTxDecoder` in favor of requiring the decoder be set in baseapp initialization. [#1441](https://github.com/cosmos/cosmos-sdk/issues/1441)
 
 * Tendermint
 

diff --git a/baseapp/setters.go b/baseapp/setters.go
@@ -26,12 +26,6 @@ func (app *BaseApp) SetCMS(cms store.CommitMultiStore) {
 	}
 	app.cms = cms
 }
-func (app *BaseApp) SetTxDecoder(txDecoder sdk.TxDecoder) {
-	if app.sealed {
-		panic("SetTxDecoder() on sealed BaseApp")
-	}
-	app.txDecoder = txDecoder
-}
 func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) {
 	if app.sealed {
 		panic("SetInitChainer() on sealed BaseApp")