Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove unused placeholder vars #4549

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: remove unused placeholder vars #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ad6733
fix: remove unused placeholder vars
Pantani Mar 2, 2025
fb7ab1d
add changelog
Pantani Mar 2, 2025
498d96a
Merge remote-tracking branch 'origin/main' into feat/remove-unused-pl…
Pantani Mar 2, 2025
547005f
remove unnecessary simulation var placeholder
Pantani Mar 2, 2025
9c6a62c
fix module import
Pantani Mar 2, 2025
db3df12
Merge branch 'main' into feat/remove-unused-placeholder-vars
julienrbrt Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
- [#4384](https://github.com/ignite/cli/pull/4384) Compare genesis params into chain genesis tests
- [#4463](https://github.com/ignite/cli/pull/4463) Run `chain simulation` with any simulation test case
- [#4533](https://github.com/ignite/cli/pull/4533) Promote GitHub codespace instead of Gitpod
- [#4549](https://github.com/ignite/cli/pull/4549) Remove unused placeholder vars

### Fixes

Expand Down
3 changes: 0 additions & 3 deletions ...emplates/ibc/files/packet/messages/x/{{moduleName}}/client/cli/tx_{{packetName}}.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cli

import (
"strconv"
<%= for (goImport) in mergeGoImports(fields) { %>
<%= goImport.Alias %> "<%= goImport.Name %>"<% } %>
"github.com/spf13/cobra"
Expand All @@ -15,8 +14,6 @@ import (
"<%= ModulePath %>/x/<%= moduleName %>/types"
)

var _ = strconv.Itoa(0)

// CmdSend<%= packetName.UpperCamel %>() returns the <%= packetName.UpperCamel %> send packet command.
// This command does not use AutoCLI because it gives a better UX to do not.
func CmdSend<%= packetName.UpperCamel %>() *cobra.Command {
Expand Down
1 change: 1 addition & 0 deletions ignite/templates/message/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ func moduleSimulationModify(opts *Options) genny.RunFn {

content, err := typed.ModuleSimulationMsgModify(
f.String(),
opts.ModulePath,
opts.ModuleName,
opts.MsgName,
opts.MsgSigner,
Expand Down
14 changes: 0 additions & 14 deletions ignite/templates/module/create/files/base/x/{{moduleName}}/module/simulation.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
package <%= moduleName %>

import (
"math/rand"

"cosmossdk.io/core/address"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"

"<%= modulePath %>/testutil/sample"
<%= moduleName %>simulation "<%= modulePath %>/x/<%= moduleName %>/simulation"
"<%= modulePath %>/x/<%= moduleName %>/types"
)

// avoid unused import issue
var (
_ = rand.Rand{}
_ = sample.AccAddress
_ = sdk.AccAddress{}
_ = simulation.MsgEntryKind
_ = <%= moduleName %>simulation.PlaceHolder
)

// GenerateGenesisState creates a randomized GenState of the module.
func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
accs := make([]string, len(simState.Accounts))
Expand Down
3 changes: 0 additions & 3 deletions ignite/templates/module/create/files/base/x/{{moduleName}}/simulation/placeholder.go.plush
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ignite/templates/typed/list/simulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func moduleSimulationModify(opts *typed.Options) genny.RunFn {

content, err = typed.ModuleSimulationMsgModify(
content,
opts.ModulePath,
opts.ModuleName,
opts.TypeName,
opts.MsgSigner,
Expand Down
4 changes: 0 additions & 4 deletions ignite/templates/typed/map/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package simulation

import (
"math/rand"
"strconv"

"github.com/cosmos/cosmos-sdk/baseapp"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand All @@ -14,9 +13,6 @@ import (
"<%= ModulePath %>/x/<%= ModuleName %>/types"
)

// Prevent strconv unused error
var _ = strconv.IntSize

func SimulateMsgCreate<%= TypeName.UpperCamel %>(
ak types.AuthKeeper,
bk types.BankKeeper,
Expand Down
5 changes: 0 additions & 5 deletions .../typed/map/files/tests/component/x/{{moduleName}}/keeper/query_{{typeName}}_test.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package keeper_test

import (
"strconv"
"testing"

"github.com/cosmos/cosmos-sdk/types/query"
Expand All @@ -14,14 +13,10 @@ import (
"<%= ModulePath %>/x/<%= ModuleName %>/keeper"
)

// Prevent strconv unused error
var _ = strconv.IntSize

func createN<%= TypeName.UpperCamel %>(keeper keeper.Keeper, ctx context.Context, n int) []types.<%= TypeName.UpperCamel %> {
items := make([]types.<%= TypeName.UpperCamel %>, n)
for i := range items {
items[i].<%= Index.Name.UpperCamel %> = <%= Index.ValueLoop() %>

_ = keeper.<%= TypeName.UpperCamel %>.Set(ctx, items[i].<%= Index.Name.UpperCamel %>, items[i])
}
return items
Expand Down
4 changes: 0 additions & 4 deletions ...ed/map/files/tests/messages/x/{{moduleName}}/keeper/msg_server_{{typeName}}_test.go.plush
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package keeper_test

import (
"strconv"
"testing"

sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand All @@ -11,9 +10,6 @@ import (
"<%= ModulePath %>/x/<%= ModuleName %>/types"
)

// Prevent strconv unused error
var _ = strconv.IntSize

func Test<%= TypeName.UpperCamel %>MsgServerCreate(t *testing.T) {
f := initFixture(t)
srv := keeper.NewMsgServerImpl(f.keeper)
Expand Down
1 change: 1 addition & 0 deletions ignite/templates/typed/map/simulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func moduleSimulationModify(opts *typed.Options) genny.RunFn {

content, err = typed.ModuleSimulationMsgModify(
content,
opts.ModulePath,
opts.ModuleName,
opts.TypeName,
opts.MsgSigner,
Expand Down
17 changes: 15 additions & 2 deletions ignite/templates/typed/simulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
)

func ModuleSimulationMsgModify(
content string,
content,
modulePath,
moduleName string,
typeName, msgSigner multiformatname.Name,
msgs ...string,
Expand All @@ -18,7 +19,19 @@ func ModuleSimulationMsgModify(
msgs = append(msgs, "")
}

var err error
// Import
content, err := xast.AppendImports(
content,
xast.WithLastNamedImport(
fmt.Sprintf("%[1]vsimulation", moduleName),
Copy link
Member

@julienrbrt julienrbrt Mar 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't <modulename>/testutil/sample be added here too

fmt.Sprintf("%[1]v/x/%[2]v/simulation", modulePath, moduleName),
),
xast.WithImport("math/rand", 0),
)
if err != nil {
return "", err
}

for _, msg := range msgs {
// simulation operations
replacementOp := fmt.Sprintf(`
Expand Down
1 change: 1 addition & 0 deletions ignite/templates/typed/singleton/simulation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func moduleSimulationModify(opts *typed.Options) genny.RunFn {

content, err := typed.ModuleSimulationMsgModify(
f.String(),
opts.ModulePath,
opts.ModuleName,
opts.TypeName,
opts.MsgSigner,
Expand Down
Loading