ignite · ilgooz · Jan 5, 2022 · Dec 16, 2021 · Dec 17, 2021 · Dec 17, 2021
diff --git a/integration/list/cmd_list_test.go b/integration/list/cmd_list_test.go
@@ -49,6 +49,7 @@ func TestGenerateAnAppWithStargateWithListAndVerify(t *testing.T) {
 				"textCoin:coin",
 				"textCoins:array.coin",
 				"textCoinsAlias:coins",
+				"--no-simulation",
 			),
 			step.Workdir(path),
 		)),

diff --git a/integration/map/cmd_map_test.go b/integration/map/cmd_map_test.go
@@ -47,7 +47,16 @@ func TestCreateMapWithStargate(t *testing.T) {
 
 	env.Must(env.Exec("create a list",
 		step.NewSteps(step.New(
-			step.Exec("starport", "s", "list", "user", "email", "--module", "example"),
+			step.Exec(
+				"starport",
+				"s",
+				"list",
+				"user",
+				"email",
+				"--module",
+				"example",
+				"--no-simulation",
+			),
 			step.Workdir(path),
 		)),
 	))

diff --git a/integration/other_components/cmd_message_test.go b/integration/other_components/cmd_message_test.go
@@ -48,6 +48,7 @@ func TestGenerateAnAppWithMessage(t *testing.T) {
 				"foo,bar:int,foobar:bool",
 				"--path",
 				"blog",
+				"--no-simulation",
 			),
 			step.Workdir(filepath.Dir(path)),
 		)),

diff --git a/integration/simulation/simapp_test.go b/integration/simulation/simapp_test.go
@@ -30,6 +30,13 @@ func TestGenerateAnAppAndSimulate(t *testing.T) {
 		)),
 	))
 
+	env.Must(env.Exec("create an singleton type",
+		step.NewSteps(step.New(
+			step.Exec("starport", "s", "list", "noSimapp", "foobar", "--no-simulation"),
+			step.Workdir(path),
+		)),
+	))
+
 	env.Must(env.Exec("create a message",
 		step.NewSteps(step.New(
 			step.Exec("starport", "s", "msgFoo", "foobar"),

diff --git a/starport/cmd/scaffold.go b/starport/cmd/scaffold.go
@@ -12,10 +12,11 @@ import (
 
 // flags related to component scaffolding
 const (
-	flagModule      = "module"
-	flagNoMessage   = "no-message"
-	flagResponse    = "response"
-	flagDescription = "desc"
+	flagModule       = "module"
+	flagNoMessage    = "no-message"
+	flagNoSimulation = "no-simulation"
+	flagResponse     = "response"
+	flagDescription  = "desc"
 )
 
 // NewScaffold returns a command that groups scaffolding related sub commands.
@@ -53,12 +54,13 @@ func scaffoldType(
 	kind scaffolder.AddTypeKind,
 ) error {
 	var (
-		typeName       = args[0]
-		fields         = args[1:]
-		moduleName     = flagGetModule(cmd)
-		withoutMessage = flagGetNoMessage(cmd)
-		signer         = flagGetSigner(cmd)
-		appPath        = flagGetPath(cmd)
+		typeName          = args[0]
+		fields            = args[1:]
+		moduleName        = flagGetModule(cmd)
+		withoutMessage    = flagGetNoMessage(cmd)
+		withoutSimulation = flagGetNoSimulation(cmd)
+		signer            = flagGetSigner(cmd)
+		appPath           = flagGetPath(cmd)
 	)
 
 	var options []scaffolder.AddTypeOption
@@ -71,8 +73,13 @@ func scaffoldType(
 	}
 	if withoutMessage {
 		options = append(options, scaffolder.TypeWithoutMessage())
-	} else if signer != "" {
-		options = append(options, scaffolder.TypeWithSigner(signer))
+	} else {
+		if signer != "" {
+			options = append(options, scaffolder.TypeWithSigner(signer))
+		}
+		if withoutSimulation {
+			options = append(options, scaffolder.TypeWithoutSimulation())
+		}
 	}
 
 	s := clispinner.New().SetText("Scaffolding...")
@@ -105,6 +112,7 @@ func flagSetScaffoldType() *flag.FlagSet {
 	f := flag.NewFlagSet("", flag.ContinueOnError)
 	f.String(flagModule, "", "Module to add into. Default is app's main module")
 	f.Bool(flagNoMessage, false, "Disable CRUD interaction messages scaffolding")
+	f.Bool(flagNoSimulation, false, "Disable CRUD simulation scaffolding")
 	f.String(flagSigner, "", "Label for the message signer (default: creator)")
 	return f
 }
@@ -114,6 +122,11 @@ func flagGetModule(cmd *cobra.Command) string {
 	return module
 }
 
+func flagGetNoSimulation(cmd *cobra.Command) bool {
+	noMessage, _ := cmd.Flags().GetBool(flagNoSimulation)
+	return noMessage
+}
+
 func flagGetNoMessage(cmd *cobra.Command) bool {
 	noMessage, _ := cmd.Flags().GetBool(flagNoMessage)
 	return noMessage

diff --git a/starport/cmd/scaffold_message.go b/starport/cmd/scaffold_message.go
@@ -23,6 +23,7 @@ func NewScaffoldMessage() *cobra.Command {
 	flagSetPath(c)
 	c.Flags().String(flagModule, "", "Module to add the message into. Default: app's main module")
 	c.Flags().StringSliceP(flagResponse, "r", []string{}, "Response fields")
+	c.Flags().Bool(flagNoSimulation, false, "Disable CRUD simulation scaffolding")
 	c.Flags().StringP(flagDescription, "d", "", "Description of the command")
 	c.Flags().String(flagSigner, "", "Label for the message signer (default: creator)")
 
@@ -31,11 +32,12 @@ func NewScaffoldMessage() *cobra.Command {
 
 func messageHandler(cmd *cobra.Command, args []string) error {
 	var (
-		module, _    = cmd.Flags().GetString(flagModule)
-		resFields, _ = cmd.Flags().GetStringSlice(flagResponse)
-		desc, _      = cmd.Flags().GetString(flagDescription)
-		signer       = flagGetSigner(cmd)
-		appPath      = flagGetPath(cmd)
+		module, _         = cmd.Flags().GetString(flagModule)
+		resFields, _      = cmd.Flags().GetStringSlice(flagResponse)
+		desc, _           = cmd.Flags().GetString(flagDescription)
+		signer            = flagGetSigner(cmd)
+		appPath           = flagGetPath(cmd)
+		withoutSimulation = flagGetNoSimulation(cmd)
 	)
 
 	s := clispinner.New().SetText("Scaffolding...")
@@ -53,6 +55,11 @@ func messageHandler(cmd *cobra.Command, args []string) error {
 		options = append(options, scaffolder.WithSigner(signer))
 	}
 
+	// Skip scaffold simulation
+	if withoutSimulation {
+		options = append(options, scaffolder.WithoutSimulation())
+	}
+
 	sc, err := newApp(appPath)
 	if err != nil {
 		return err

diff --git a/starport/services/scaffolder/message.go b/starport/services/scaffolder/message.go
@@ -16,8 +16,9 @@ import (
 
 // messageOptions represents configuration for the message scaffolding
 type messageOptions struct {
-	description string
-	signer      string
+	description       string
+	signer            string
+	withoutSimulation bool
 }
 
 // newMessageOptions returns a messageOptions with default options
@@ -45,6 +46,13 @@ func WithSigner(signer string) MessageOption {
 	}
 }
 
+// WithoutSimulation disables generating messages simulation
+func WithoutSimulation() MessageOption {
+	return func(m *messageOptions) {
+		m.withoutSimulation = true
+	}
+}
+
 // AddMessage adds a new message to scaffolded app
 func (s Scaffolder) AddMessage(
 	ctx context.Context,
@@ -106,16 +114,17 @@ func (s Scaffolder) AddMessage(
 	var (
 		g    *genny.Generator
 		opts = &message.Options{
-			AppName:    s.modpath.Package,
-			AppPath:    s.path,
-			ModulePath: s.modpath.RawPath,
-			ModuleName: moduleName,
-			OwnerName:  owner(s.modpath.RawPath),
-			MsgName:    name,
-			Fields:     parsedMsgFields,
-			ResFields:  parsedResFields,
-			MsgDesc:    scaffoldingOpts.description,
-			MsgSigner:  mfSigner,
+			AppName:      s.modpath.Package,
+			AppPath:      s.path,
+			ModulePath:   s.modpath.RawPath,
+			ModuleName:   moduleName,
+			OwnerName:    owner(s.modpath.RawPath),
+			MsgName:      name,
+			Fields:       parsedMsgFields,
+			ResFields:    parsedResFields,
+			MsgDesc:      scaffoldingOpts.description,
+			MsgSigner:    mfSigner,
+			NoSimulation: scaffoldingOpts.withoutSimulation,
 		}
 	)
 

diff --git a/starport/services/scaffolder/type.go b/starport/services/scaffolder/type.go
@@ -35,8 +35,9 @@ type addTypeOptions struct {
 
 	indexes []string
 
-	withoutMessage bool
-	signer         string
+	withoutMessage    bool
+	withoutSimulation bool
+	signer            string
 }
 
 // newAddTypeOptions returns a addTypeOptions with default options
@@ -96,6 +97,13 @@ func TypeWithoutMessage() AddTypeOption {
 	}
 }
 
+// TypeWithoutSimulation disables generating messages simulation.
+func TypeWithoutSimulation() AddTypeOption {
+	return func(o *addTypeOptions) {
+		o.withoutSimulation = true
+	}
+}
+
 // TypeWithSigner provides a custom signer name for the message
 func TypeWithSigner(signer string) AddTypeOption {
 	return func(o *addTypeOptions) {
@@ -162,16 +170,17 @@ func (s Scaffolder) AddType(
 	var (
 		g    *genny.Generator
 		opts = &typed.Options{
-			AppName:    s.modpath.Package,
-			AppPath:    s.path,
-			ModulePath: s.modpath.RawPath,
-			ModuleName: moduleName,
-			OwnerName:  owner(s.modpath.RawPath),
-			TypeName:   name,
-			Fields:     tFields,
-			NoMessage:  o.withoutMessage,
-			MsgSigner:  mfSigner,
-			IsIBC:      isIBC,
+			AppName:      s.modpath.Package,
+			AppPath:      s.path,
+			ModulePath:   s.modpath.RawPath,
+			ModuleName:   moduleName,
+			OwnerName:    owner(s.modpath.RawPath),
+			TypeName:     name,
+			Fields:       tFields,
+			NoMessage:    o.withoutMessage,
+			NoSimulation: o.withoutSimulation,
+			MsgSigner:    mfSigner,
+			IsIBC:        isIBC,
 		}
 		gens []*genny.Generator
 	)

diff --git a/starport/templates/message/message.go b/starport/templates/message/message.go
@@ -12,8 +12,11 @@ import (
 )
 
 var (
-	//go:embed stargate/* stargate/**/*
-	fsStargate embed.FS
+	//go:embed stargate/message/* stargate/message/**/*
+	fsStargateMessage embed.FS
+
+	//go:embed stargate/simapp/* stargate/simapp/**/*
+	fsStargateSimapp embed.FS
 )
 
 func Box(box packd.Walker, opts *Options, g *genny.Generator) error {

diff --git a/starport/templates/message/options.go b/starport/templates/message/options.go
@@ -7,16 +7,17 @@ import (
 
 // Options ...
 type Options struct {
-	AppName    string
-	AppPath    string
-	ModuleName string
-	ModulePath string
-	OwnerName  string
-	MsgName    multiformatname.Name
-	MsgSigner  multiformatname.Name
-	MsgDesc    string
-	Fields     field.Fields
-	ResFields  field.Fields
+	AppName      string
+	AppPath      string
+	ModuleName   string
+	ModulePath   string
+	OwnerName    string
+	MsgName      multiformatname.Name
+	MsgSigner    multiformatname.Name
+	MsgDesc      string
+	Fields       field.Fields
+	ResFields    field.Fields
+	NoSimulation bool
 }
 
 // Validate that options are usuable

diff --git a/starport/templates/message/stargate.go b/starport/templates/message/stargate.go
@@ -20,13 +20,24 @@ func NewStargate(replacer placeholder.Replacer, opts *Options) (*genny.Generator
 	g.RunFn(protoTxMessageModify(replacer, opts))
 	g.RunFn(typesCodecModify(replacer, opts))
 	g.RunFn(clientCliTxModify(replacer, opts))
-	g.RunFn(moduleSimulationModify(replacer, opts))
 
 	template := xgenny.NewEmbedWalker(
-		fsStargate,
-		"stargate/",
+		fsStargateMessage,
+		"stargate/message",
 		opts.AppPath,
 	)
+
+	if !opts.NoSimulation {
+		g.RunFn(moduleSimulationModify(replacer, opts))
+		simappTemplate := xgenny.NewEmbedWalker(
+			fsStargateSimapp,
+			"stargate/simapp",
+			opts.AppPath,
+		)
+		if err := Box(simappTemplate, opts, g); err != nil {
+			return nil, err
+		}
+	}
 	return g, Box(template, opts, g)
 }
 

diff --git a/...Name}}/client/cli/tx_{{msgName}}.go.plush → ...Name}}/client/cli/tx_{{msgName}}.go.plush b/...Name}}/client/cli/tx_{{msgName}}.go.plush → ...Name}}/client/cli/tx_{{msgName}}.go.plush
diff --git a/...}}/keeper/msg_server_{{msgName}}.go.plush → ...}}/keeper/msg_server_{{msgName}}.go.plush b/...}}/keeper/msg_server_{{msgName}}.go.plush → ...}}/keeper/msg_server_{{msgName}}.go.plush
diff --git a/...Name}}/types/message_{{msgName}}.go.plush → ...Name}}/types/message_{{msgName}}.go.plush b/...Name}}/types/message_{{msgName}}.go.plush → ...Name}}/types/message_{{msgName}}.go.plush
diff --git a/...}/types/message_{{msgName}}_test.go.plush → ...}/types/message_{{msgName}}_test.go.plush b/...}/types/message_{{msgName}}_test.go.plush → ...}/types/message_{{msgName}}_test.go.plush
diff --git a/...uleName}}/simulation/{{msgName}}.go.plush → ...uleName}}/simulation/{{msgName}}.go.plush b/...uleName}}/simulation/{{msgName}}.go.plush → ...uleName}}/simulation/{{msgName}}.go.plush
diff --git a/starport/templates/typed/list/stargate.go b/starport/templates/typed/list/stargate.go
@@ -19,6 +19,9 @@ var (
 
 	//go:embed stargate/messages/* stargate/messages/**/*
 	fsStargateMessages embed.FS
+
+	//go:embed stargate/simapp/* stargate/simapp/**/*
+	fsStargateSimapp embed.FS
 )
 
 // NewStargate returns the generator to scaffold a new type in a Stargate module
@@ -36,6 +39,11 @@ func NewStargate(replacer placeholder.Replacer, opts *typed.Options) (*genny.Gen
 			"stargate/component/",
 			opts.AppPath,
 		)
+		simappTemplate = xgenny.NewEmbedWalker(
+			fsStargateSimapp,
+			"stargate/simapp/",
+			opts.AppPath,
+		)
 	)
 
 	g.RunFn(protoQueryModify(replacer, opts))
@@ -52,7 +60,13 @@ func NewStargate(replacer placeholder.Replacer, opts *typed.Options) (*genny.Gen
 		g.RunFn(protoTxModify(replacer, opts))
 		g.RunFn(typesCodecModify(replacer, opts))
 		g.RunFn(clientCliTxModify(replacer, opts))
-		g.RunFn(moduleSimulationModify(replacer, opts))
+
+		if !opts.NoSimulation {
+			g.RunFn(moduleSimulationModify(replacer, opts))
+			if err := typed.Box(simappTemplate, opts, g); err != nil {
+				return nil, err
+			}
+		}
 
 		// Messages template
 		if err := typed.Box(messagesTemplate, opts, g); err != nil {

diff --git a/...leName}}/simulation/{{typeName}}.go.plush → ...leName}}/simulation/{{typeName}}.go.plush b/...leName}}/simulation/{{typeName}}.go.plush → ...leName}}/simulation/{{typeName}}.go.plush