tmp_save

app/ante/decorators.go

@@ -63,11 +63,15 @@ func (vtd ValidateTokenDecorator) AnteHandle(
 }
 
 // ValidateServiceDecorator is responsible for checking the permission to execute MsgCallService
-type ValidateServiceDecorator struct{}
+type ValidateServiceDecorator struct {
+	SimulateTest bool
+}
 
 // NewValidateServiceDecorator returns an instance of ServiceAuthDecorator
-func NewValidateServiceDecorator() ValidateServiceDecorator {
-	return ValidateServiceDecorator{}
+func NewValidateServiceDecorator(simulateTest bool) ValidateServiceDecorator {
+	return ValidateServiceDecorator{
+		SimulateTest: simulateTest,
+	}
 }
 
 // AnteHandle checks the transaction
@@ -77,9 +81,16 @@ 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,7 +31,11 @@ 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
@@ -86,7 +90,7 @@ func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
 		NewValidateTokenDecorator(options.TokenKeeper),
 		tokenkeeper.NewValidateTokenFeeDecorator(options.TokenKeeper, options.BankKeeper),
 		oraclekeeper.NewValidateOracleAuthDecorator(options.OracleKeeper, options.GuardianKeeper),
-		NewValidateServiceDecorator(),
+		NewValidateServiceDecorator(options.SimulationTest),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
 	)

app/app.go

@@ -178,6 +178,13 @@ func NewIrisApp(
 	app.MountMemoryStores(app.MemoryStoreKeys())
 
 	maxGasWanted := cast.ToUint64(appOpts.Get(srvflags.EVMMaxTxGasWanted))
+
+	simulationTest := false
+	opt = appOpts.Get(params.SimulationTest)
+	if opt, ok := opt.(bool); ok {
+		simulationTest = opt
+	}
+
 	anteHandler := irishubante.NewAnteHandler(
 		irishubante.HandlerOptions{
 			HandlerOptions: ante.HandlerOptions{
@@ -196,7 +203,11 @@ func NewIrisApp(
 			FeeMarketKeeper:      app.FeeMarketKeeper,
 			BypassMinFeeMsgTypes: []string{},
 			MaxTxGasWanted:       maxGasWanted,
+<<<<<<< HEAD
 			Simulate:             simulate,
+=======
+			SimulationTest:       simulationTest,
+>>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		},
 	)
 

app/params/params.go

@@ -4,4 +4,5 @@ package params
 const (
 	StakePerAccount           = "stake_per_account"
 	InitiallyBondedValidators = "initially_bonded_validators"
+	SimulationTest            = "simulation_test"
 )

app/sim_bench_test.go

@@ -11,6 +11,8 @@ import (
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
+
+	"github.com/irisnet/irishub/v4/app/params"
 )
 
 // Profile with:
@@ -51,8 +53,14 @@ func BenchmarkFullAppSimulation(b *testing.B) {
 		nil,
 		true,
 		encfg,
+<<<<<<< HEAD
 		EmptyAppOptions{},
 		true,
+=======
+		SimTestAppOptions{
+			options: map[string]interface{}{params.SimulationTest: true},
+		},
+>>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		interBlockCacheOpt(),
 	)
 
@@ -119,8 +127,14 @@ func BenchmarkInvariants(b *testing.B) {
 		nil,
 		true,
 		encfg,
+<<<<<<< HEAD
 		EmptyAppOptions{},
 		true,
+=======
+		SimTestAppOptions{
+			options: map[string]interface{}{params.SimulationTest: true},
+		},
+>>>>>>> 684f3471c7649a941b8984dde1bebe293375e67a
 		interBlockCacheOpt(),
 	)
 

app/sim_test.go

@@ -477,6 +477,16 @@ func (ao EmptyAppOptions) Get(o string) interface{} {
 	return nil
 }
 
+// SimTestAppOptions is a stub implementing AppOptions
+type SimTestAppOptions struct {
+	options map[string]interface{}
+}
+
+// Get implements AppOptions
+func (o SimTestAppOptions) Get(key string) interface{} {
+	return o.options[key]
+}
+
 func createApp(
 	logger log.Logger,
 	db dbm.DB,
@@ -493,8 +503,9 @@ func createApp(
 		nil,
 		true,
 		encodingConfig,
-		EmptyAppOptions{},
-		true,
+		SimTestAppOptions{
+			options: map[string]interface{}{params.SimulationTest: true},
+		},
 		baseAppOptions...,
 	)
 }