Skip to content

Commit 4918996

Browse files
authored
feat: remove app config and ibc add route placeholders (#4877)
* feat: remove app config and ibc add route placeholders * fix lint and add changelog * rename files * remove testdata placeholders * remove unused placeholder * fix lint
1 parent 62ae705 commit 4918996

File tree

17 files changed

+655
-101
lines changed

17 files changed

+655
-101
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## Features
6+
7+
- [#4877](https://github.com/ignite/cli/pull/4877) Remove app config and ibc add route placeholders.
8+
59
### Changes
610

711
- [#4880](https://github.com/ignite/cli/pull/4880) Add possibility to scaffold underscore package.

ignite/pkg/cosmosanalysis/app/testdata/modules/app_config/app_config.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ var (
104104
// icatypes.ModuleName,
105105
// chain modules
106106
marsmoduletypes.ModuleName,
107-
// this line is used by starport scaffolding # stargate/app/initGenesis
108107
}
109108

110109
// During begin block slashing happens after distr.BeginBlocker so that
@@ -129,7 +128,6 @@ var (
129128
ibcfeetypes.ModuleName,
130129
// chain modules
131130
marsmoduletypes.ModuleName,
132-
// this line is used by starport scaffolding # stargate/app/beginBlockers
133131
}
134132

135133
endBlockers = []string{
@@ -146,7 +144,6 @@ var (
146144
ibcfeetypes.ModuleName,
147145
// chain modules
148146
marsmoduletypes.ModuleName,
149-
// this line is used by starport scaffolding # stargate/app/endBlockers
150147
}
151148

152149
// module account permissions
@@ -288,7 +285,6 @@ var (
288285
Name: marsmoduletypes.ModuleName,
289286
Config: appconfig.WrapAny(&marsmoduletypes.Module{}),
290287
},
291-
// this line is used by starport scaffolding # stargate/app/moduleConfig
292288
},
293289
}),
294290
depinject.Supply(

ignite/pkg/cosmosanalysis/module/testdata/earth/app/app_config.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ var (
107107
// icatypes.ModuleName,
108108
// chain modules
109109
marsmoduletypes.ModuleName,
110-
// this line is used by starport scaffolding # stargate/app/initGenesis
111110
}
112111

113112
// During begin block slashing happens after distr.BeginBlocker so that
@@ -131,7 +130,6 @@ var (
131130
ibcfeetypes.ModuleName,
132131
// chain modules
133132
marsmoduletypes.ModuleName,
134-
// this line is used by starport scaffolding # stargate/app/beginBlockers
135133
}
136134

137135
endBlockers = []string{
@@ -148,12 +146,10 @@ var (
148146
ibcfeetypes.ModuleName,
149147
// chain modules
150148
marsmoduletypes.ModuleName,
151-
// this line is used by starport scaffolding # stargate/app/endBlockers
152149
}
153150

154151
preBlockers = []string{
155152
upgradetypes.ModuleName,
156-
// this line is used by starport scaffolding # stargate/app/preBlockers
157153
}
158154

159155
// module account permissions
@@ -296,7 +292,6 @@ var (
296292
Name: marsmoduletypes.ModuleName,
297293
Config: appconfig.WrapAny(&marsmoduletypes.Module{}),
298294
},
299-
// this line is used by starport scaffolding # stargate/app/moduleConfig
300295
},
301296
}),
302297
depinject.Supply(

ignite/services/scaffolder/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func generate(
146146
}
147147

148148
runner := xgenny.NewRunner(ctx, absRoot)
149-
if err := runner.Run(moduleGen, modulecreate.NewAppModify(runner.Tracer(), opts)); err != nil {
149+
if err := runner.Run(moduleGen, modulecreate.NewAppModify(opts)); err != nil {
150150
return smc, err
151151
}
152152
// generate module template

ignite/services/scaffolder/module.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func (s Scaffolder) CreateModule(
228228
}
229229
gens = append(gens, g)
230230
}
231-
gens = append(gens, modulecreate.NewAppModify(s.Tracer(), opts))
231+
gens = append(gens, modulecreate.NewAppModify(opts))
232232

233233
err = s.Run(gens...)
234234
var validationErr errors.ValidationError

ignite/templates/app/files-minimal/app/app_config.go.plush

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ var (
5757
// NOTE: upgrade module is required to be prioritized
5858
PreBlockers: []string{
5959
authtypes.ModuleName,
60-
// this line is used by starport scaffolding # stargate/app/preBlockers
6160
},
6261
// During begin block slashing happens after distr.BeginBlocker so that
6362
// there is nothing left over in the validator fee pool, so as to keep the
@@ -67,12 +66,10 @@ var (
6766
distrtypes.ModuleName,
6867
stakingtypes.ModuleName,
6968
// chain modules
70-
// this line is used by starport scaffolding # stargate/app/beginBlockers
7169
},
7270
EndBlockers: []string{
7371
stakingtypes.ModuleName,
7472
// chain modules
75-
// this line is used by starport scaffolding # stargate/app/endBlockers
7673
},
7774
// The following is mostly only needed when ModuleName != StoreKey name.
7875
OverrideStoreKeys: []*runtimev1alpha1.StoreKeyConfig{
@@ -92,7 +89,6 @@ var (
9289
stakingtypes.ModuleName,
9390
genutiltypes.ModuleName,
9491
// chain modules
95-
// this line is used by starport scaffolding # stargate/app/initGenesis
9692
},
9793
}),
9894
},
@@ -138,7 +134,6 @@ var (
138134
Name: consensustypes.ModuleName,
139135
Config: appconfig.WrapAny(&consensusmodulev1.Module{}),
140136
},
141-
// this line is used by starport scaffolding # stargate/app/moduleConfig
142137
},
143138
})
144139
)

ignite/templates/app/files/app/app_config.go.plush

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ var (
106106
PreBlockers: []string{
107107
upgradetypes.ModuleName,
108108
authtypes.ModuleName,
109-
// this line is used by starport scaffolding # stargate/app/preBlockers
110109
},
111110
// During begin block slashing happens after distr.BeginBlocker so that
112111
// there is nothing left over in the validator fee pool, so as to keep the
@@ -123,15 +122,13 @@ var (
123122
// ibc modules
124123
ibcexported.ModuleName,
125124
// chain modules
126-
// this line is used by starport scaffolding # stargate/app/beginBlockers
127125
},
128126
EndBlockers: []string{
129127
govtypes.ModuleName,
130128
stakingtypes.ModuleName,
131129
feegrant.ModuleName,
132130
group.ModuleName,
133131
// chain modules
134-
// this line is used by starport scaffolding # stargate/app/endBlockers
135132
},
136133
// The following is mostly only needed when ModuleName != StoreKey name.
137134
OverrideStoreKeys: []*runtimev1alpha1.StoreKeyConfig{
@@ -167,7 +164,6 @@ var (
167164
ibctransfertypes.ModuleName,
168165
icatypes.ModuleName,
169166
// chain modules
170-
// this line is used by starport scaffolding # stargate/app/initGenesis
171167
},
172168
}),
173169
},
@@ -263,7 +259,6 @@ var (
263259
Name: epochstypes.ModuleName,
264260
Config: appconfig.WrapAny(&epochsmodulev1.Module{}),
265261
},
266-
// this line is used by starport scaffolding # stargate/app/moduleConfig
267262
},
268263
})
269264
)

ignite/templates/app/files/app/ibc.go.plush

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ func (app *App) registerIBCModules(appOpts servertypes.AppOptions) error {
118118
ibcv2Router := ibcapi.NewRouter().
119119
AddRoute(ibctransfertypes.PortID, transferStackV2)
120120

121-
// this line is used by starport scaffolding # ibc/app/module
122-
123121
app.IBCKeeper.SetRouter(ibcRouter)
124122
app.IBCKeeper.SetRouterV2(ibcv2Router)
125123

0 commit comments

Comments
 (0)