diff --git a/cmd/cosmos-sdk-cli/cmd/init.go b/cmd/cosmos-sdk-cli/cmd/init.go index eb72f6d943..f5ded2215a 100644 --- a/cmd/cosmos-sdk-cli/cmd/init.go +++ b/cmd/cosmos-sdk-cli/cmd/init.go @@ -53,7 +53,7 @@ var initCmd = &cobra.Command{ fmt.Print("configuring the project in " + projectPath + "\n\n") time.Sleep(2 * time.Second) box := packr.NewBox("../template") - var replacer = strings.NewReplacer("_CAPITALIZED_PROJECT_SHORT_NAME_", capitalizedProjectName, "_PROJECT_SHORT_NAME_", shortProjectName, "_REMOTE_PROJECT_PATH_", remoteProjectPath) + var replacer = strings.NewReplacer("MyAwesomeProject", capitalizedProjectName, "myawesomeproject", shortProjectName, "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli", remoteProjectPath) box.Walk(func(path string, file packr.File) error { actualPath := replacer.Replace(path) fmt.Println("Creating file: " + actualPath) diff --git a/cmd/cosmos-sdk-cli/template/Makefile b/cmd/cosmos-sdk-cli/template/Makefile index 33ef7263b3..8d7f55706d 100644 --- a/cmd/cosmos-sdk-cli/template/Makefile +++ b/cmd/cosmos-sdk-cli/template/Makefile @@ -1,5 +1,5 @@ PACKAGES=$(shell go list ./... | grep -v '/vendor/') -#BUILD_FLAGS = -ldflags "-X _REMOTE_PROJECT_PATH_/version.GitCommit=`git rev-parse --short HEAD`" +#BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/version.GitCommit=`git rev-parse --short HEAD`" all: get_tools get_vendor_deps build test @@ -7,7 +7,7 @@ get_tools: go get github.com/golang/dep/cmd/dep build: - go build -o bin/_PROJECT_SHORT_NAME_cli cmd/cli/main.go && go build -o bin/_PROJECT_SHORT_NAME_d cmd/node/main.go + go build -o bin/myawesomeprojectcli cmd/cli/main.go && go build -o bin/_PROJECT_SHORT_NAME_d cmd/node/main.go get_vendor_deps: @rm -rf vendor/ diff --git a/cmd/cosmos-sdk-cli/template/app/app.go b/cmd/cosmos-sdk-cli/template/app/app.go index 7c2df96f22..bc536101ce 100644 --- a/cmd/cosmos-sdk-cli/template/app/app.go +++ b/cmd/cosmos-sdk-cli/template/app/app.go @@ -15,15 +15,15 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" - "_REMOTE_PROJECT_PATH_/types" + "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/types" ) const ( - appName = "_CAPITALIZED_PROJECT_SHORT_NAME_App" + appName = "MyAwesomeProjectApp" ) // Extended ABCI application -type _CAPITALIZED_PROJECT_SHORT_NAME_App struct { +type MyAwesomeProjectApp struct { *bam.BaseApp cdc *wire.Codec @@ -39,13 +39,13 @@ type _CAPITALIZED_PROJECT_SHORT_NAME_App struct { accountMapper auth.AccountMapper } -func New_CAPITALIZED_PROJECT_SHORT_NAME_App(logger log.Logger, db dbm.DB) *_CAPITALIZED_PROJECT_SHORT_NAME_App { +func NewMyAwesomeProjectApp(logger log.Logger, db dbm.DB) *MyAwesomeProjectApp { // Create app-level codec for txs and accounts. var cdc = MakeCodec() // Create your application object. - var app = &_CAPITALIZED_PROJECT_SHORT_NAME_App{ + var app = &MyAwesomeProjectApp{ BaseApp: bam.NewBaseApp(appName, cdc, logger, db), cdc: cdc, capKeyMainStore: sdk.NewKVStoreKey("main"), @@ -84,16 +84,16 @@ func MakeCodec() *wire.Codec { // Register AppAccount cdc.RegisterInterface((*auth.Account)(nil), nil) - cdc.RegisterConcrete(&types.AppAccount{}, "_PROJECT_SHORT_NAME_/Account", nil) + cdc.RegisterConcrete(&types.AppAccount{}, "myawesomeproject/Account", nil) cdc.Seal() return cdc } -// custom logic for _PROJECT_SHORT_NAME_ initialization +// custom logic for myawesomeproject initialization // nolint: unparam -func (app *_CAPITALIZED_PROJECT_SHORT_NAME_App) initChainerFn() sdk.InitChainer { +func (app *MyAwesomeProjectApp) initChainerFn() sdk.InitChainer { return func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { stateJSON := req.AppStateBytes @@ -118,7 +118,7 @@ func (app *_CAPITALIZED_PROJECT_SHORT_NAME_App) initChainerFn() sdk.InitChainer } // Custom logic for state export -func (app *_CAPITALIZED_PROJECT_SHORT_NAME_App) ExportAppStateAndValidators() (appState json.RawMessage, validators []tmtypes.GenesisValidator, err error) { +func (app *MyAwesomeProjectApp) ExportAppStateAndValidators() (appState json.RawMessage, validators []tmtypes.GenesisValidator, err error) { ctx := app.NewContext(true, abci.Header{}) // iterate to get the accounts diff --git a/cmd/cosmos-sdk-cli/template/cmd/cli/main.go b/cmd/cosmos-sdk-cli/template/cmd/cli/main.go index 8d03bf8255..33a888f3ba 100644 --- a/cmd/cosmos-sdk-cli/template/cmd/cli/main.go +++ b/cmd/cosmos-sdk-cli/template/cmd/cli/main.go @@ -17,15 +17,15 @@ import ( authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli" - "_REMOTE_PROJECT_PATH_/app" - "_REMOTE_PROJECT_PATH_/types" + "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/app" + "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/types" ) // rootCmd is the entry point for this binary var ( rootCmd = &cobra.Command{ - Use: "_PROJECT_SHORT_NAME_cli", - Short: "_CAPITALIZED_PROJECT_SHORT_NAME_ light-client", + Use: "myawesomeprojectcli", + Short: "MyAwesomeProject light-client", } ) @@ -56,7 +56,7 @@ func main() { client.PostCommands( bankcmd.SendTxCmd(cdc), )...) - // and now _PROJECT_SHORT_NAME_ specific commands here + // and now myawesomeproject specific commands here // add proxy, version and key info rootCmd.AddCommand( @@ -68,7 +68,7 @@ func main() { ) // prepare and add flags - executor := cli.PrepareMainCmd(rootCmd, "BC", os.ExpandEnv("$HOME/._PROJECT_SHORT_NAME_cli")) + executor := cli.PrepareMainCmd(rootCmd, "BC", os.ExpandEnv("$HOME/.myawesomeprojectcli")) err := executor.Execute() if err != nil { // handle with #870 diff --git a/cmd/cosmos-sdk-cli/template/cmd/node/main.go b/cmd/cosmos-sdk-cli/template/cmd/node/main.go index edc20449e4..79722ae20f 100644 --- a/cmd/cosmos-sdk-cli/template/cmd/node/main.go +++ b/cmd/cosmos-sdk-cli/template/cmd/node/main.go @@ -12,20 +12,20 @@ import ( "github.com/tendermint/tendermint/libs/log" tmtypes "github.com/tendermint/tendermint/types" - "_REMOTE_PROJECT_PATH_/app" + "github.com/cosmos/cosmos-sdk/cmd/cosmos-sdk-cli/app" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/wire" ) // init parameters -var _CAPITALIZED_PROJECT_SHORT_NAME_AppInit = server.AppInit{ - AppGenState: _CAPITALIZED_PROJECT_SHORT_NAME_AppGenState, +var MyAwesomeProjectAppInit = server.AppInit{ + AppGenState: MyAwesomeProjectAppGenState, AppGenTx: server.SimpleAppGenTx, } // GenAppParams sets up the app_state, append any other app specific components. -func _CAPITALIZED_PROJECT_SHORT_NAME_AppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (appState json.RawMessage, err error) { +func MyAwesomeProjectAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (appState json.RawMessage, err error) { appState, err = server.SimpleAppGenState(cdc, appGenTxs) if err != nil { return @@ -35,11 +35,11 @@ func _CAPITALIZED_PROJECT_SHORT_NAME_AppGenState(cdc *wire.Codec, appGenTxs []js } func newApp(logger log.Logger, db dbm.DB) abci.Application { - return app.New_CAPITALIZED_PROJECT_SHORT_NAME_App(logger, db) + return app.NewMyAwesomeProjectApp(logger, db) } func exportAppStateAndTMValidators(logger log.Logger, db dbm.DB) (json.RawMessage, []tmtypes.GenesisValidator, error) { - dapp := app.New_CAPITALIZED_PROJECT_SHORT_NAME_App(logger, db) + dapp := app.NewMyAwesomeProjectApp(logger, db) return dapp.ExportAppStateAndValidators() } @@ -48,17 +48,17 @@ func main() { ctx := server.NewDefaultContext() rootCmd := &cobra.Command{ - Use: "_PROJECT_SHORT_NAME_d", - Short: "_CAPITALIZED_PROJECT_SHORT_NAME_ Daemon (server)", + Use: "myawesomeprojectd", + Short: "MyAwesomeProject Daemon (server)", PersistentPreRunE: server.PersistentPreRunEFn(ctx), } - server.AddCommands(ctx, cdc, rootCmd, _CAPITALIZED_PROJECT_SHORT_NAME_AppInit, - server.ConstructAppCreator(newApp, "_PROJECT_SHORT_NAME_"), - server.ConstructAppExporter(exportAppStateAndTMValidators, "_PROJECT_SHORT_NAME_")) + server.AddCommands(ctx, cdc, rootCmd, MyAwesomeProjectAppInit, + server.ConstructAppCreator(newApp, "myawesomeproject"), + server.ConstructAppExporter(exportAppStateAndTMValidators, "myawesomeproject")) // prepare and add flags - rootDir := os.ExpandEnv("$HOME/._PROJECT_SHORT_NAME_d") + rootDir := os.ExpandEnv("$HOME/.myawesomeprojectd") executor := cli.PrepareBaseCmd(rootCmd, "BC", rootDir) err := executor.Execute() if err != nil {