update simulation test

app/ante/ante.go

@@ -21,10 +21,6 @@ func NewAnteHandler(options HandlerOptions) sdk.AnteHandler {
 
 		defer ethante.Recover(ctx.Logger(), &err)
 
-		if options.Simulate {
-			sim = true
-		}
-
 		txWithExtensions, ok := tx.(authante.HasExtensionOptionsTx)
 		if ok {
 			opts := txWithExtensions.GetExtensionOptions()

app/ante/decorators.go

@@ -81,16 +81,10 @@ func (vsd ValidateServiceDecorator) AnteHandle(
 	simulate bool,
 	next sdk.AnteHandler,
 ) (sdk.Context, error) {
-<<<<<<< HEAD
-	if simulate {
-		return next(ctx, tx, simulate)
-	}
-=======
 	if vsd.SimulateTest {
 		return next(ctx, tx, simulate)
 	}
 
->>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 	for _, msg := range tx.GetMsgs() {
 		switch msg := msg.(type) {
 		case *servicetypes.MsgCallService:

app/ante/handler_options.go

@@ -31,11 +31,7 @@ type HandlerOptions struct {
 	FeeMarketKeeper      ethante.FeeMarketKeeper
 	BypassMinFeeMsgTypes []string
 	MaxTxGasWanted       uint64
-<<<<<<< HEAD
-	Simulate             bool
-=======
 	SimulationTest       bool
->>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 }
 
 // newCosmosAnteHandler creates the default ante handler for Ethereum transactions

app/app.go

@@ -78,7 +78,6 @@ func NewIrisApp(
 	loadLatest bool,
 	encodingConfig params.EncodingConfig,
 	appOpts servertypes.AppOptions,
-	simulate bool,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *IrisApp {
 	appCodec := encodingConfig.Marshaler
@@ -203,11 +202,7 @@ func NewIrisApp(
 			FeeMarketKeeper:      app.FeeMarketKeeper,
 			BypassMinFeeMsgTypes: []string{},
 			MaxTxGasWanted:       maxGasWanted,
-<<<<<<< HEAD
-			Simulate:             simulate,
-=======
 			SimulationTest:       simulationTest,
->>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		},
 	)
 

app/sim_bench_test.go

@@ -53,14 +53,9 @@ func BenchmarkFullAppSimulation(b *testing.B) {
 		nil,
 		true,
 		encfg,
-<<<<<<< HEAD
-		EmptyAppOptions{},
-		true,
-=======
 		SimTestAppOptions{
 			options: map[string]interface{}{params.SimulationTest: true},
 		},
->>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		interBlockCacheOpt(),
 	)
 
@@ -127,14 +122,9 @@ func BenchmarkInvariants(b *testing.B) {
 		nil,
 		true,
 		encfg,
-<<<<<<< HEAD
-		EmptyAppOptions{},
-		true,
-=======
 		SimTestAppOptions{
 			options: map[string]interface{}{params.SimulationTest: true},
 		},
->>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		interBlockCacheOpt(),
 	)
 

cmd/iris/cmd/root.go

@@ -43,7 +43,7 @@ import (
 // main function.
 func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 
-	tempApplication := app.NewIrisApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, app.RegisterEncodingConfig(), testutil.EmptyAppOptions{}, false)
+	tempApplication := app.NewIrisApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, app.RegisterEncodingConfig(), testutil.EmptyAppOptions{})
 
 	encodingConfig := app.RegisterEncodingConfig()
 	initClientCtx := client.Context{}.
@@ -263,7 +263,6 @@ func (ac appCreator) newApp(
 		true,
 		ac.encCfg,
 		appOpts,
-		false,
 		baseappOptions...,
 	)
 }
@@ -296,7 +295,6 @@ func (ac appCreator) appExport(
 		loadLatest,
 		ac.encCfg,
 		appOpts,
-		false,
 	)
 
 	if height != -1 {

testutil/app.go

@@ -42,7 +42,6 @@ func setup(
 		true,
 		encCdc,
 		appOpts,
-		true,
 		baseAppOptions...,
 	)
 	return &AppWrapper{app}