Merge branch 'develop' into cwgoes/update-tendermint-upstream

baseapp/baseapp.go

@@ -345,6 +345,7 @@ func handleQueryStore(app *BaseApp, path []string, req abci.RequestQuery) (res a
 	return queryable.Query(req)
 }
 
+// nolint: unparam
 func handleQueryP2P(app *BaseApp, path []string, req abci.RequestQuery) (res abci.ResponseQuery) {
 	// "/p2p" prefix for p2p queries
 	if len(path) >= 4 {

baseapp/baseapp_test.go

@@ -626,12 +626,12 @@ func TestSimulateTx(t *testing.T) {
 		// simulate a message, check gas reported
 		result := app.Simulate(tx)
 		require.True(t, result.IsOK(), result.Log)
-		require.Equal(t, int64(gasConsumed), result.GasUsed)
+		require.Equal(t, gasConsumed, result.GasUsed)
 
 		// simulate again, same result
 		result = app.Simulate(tx)
 		require.True(t, result.IsOK(), result.Log)
-		require.Equal(t, int64(gasConsumed), result.GasUsed)
+		require.Equal(t, gasConsumed, result.GasUsed)
 
 		// simulate by calling Query with encoded tx
 		txBytes, err := codec.MarshalBinary(tx)

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")