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

Jump to bottom

Tulasi/export homepath #8194

Merged
merged 9 commits into from
Dec 18, 2020
Merged

Tulasi/export homepath #8194

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb44e5b
homepath added
Dec 17, 2020
19b1d20
temp added
Dec 17, 2020
61e1bea
changes done
Dec 17, 2020
8e13065
modified
Dec 17, 2020
50b7e1b
modified
Dec 18, 2020
71b7768
Merge branch 'master' into tulasi/export_homepath
Dec 18, 2020
ad2d5df
Update simapp/simd/cmd/root.go
alessio Dec 18, 2020
ebfe73c
Update simapp/simd/cmd/root.go
alessio Dec 18, 2020
3fb29b0
Update simapp/simd/cmd/root.go
alessio Dec 18, 2020
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
11 changes: 9 additions & 2 deletions simapp/simd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package cmd

import (
"errors"
"io"
"os"
"path/filepath"
Expand Down Expand Up @@ -204,14 +205,20 @@ func createSimappAndExport(
encCfg := simapp.MakeTestEncodingConfig() // Ideally, we would reuse the one created by NewRootCmd.
encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry)
var simApp *simapp.SimApp

homePath, ok := appOpts.Get(flags.FlagHome).(string)
alessio marked this conversation as resolved.
Show resolved Hide resolved
if !ok || homePath == "" {
return servertypes.ExportedApp{}, errors.New("application home not set")
}
alessio marked this conversation as resolved.
Show resolved Hide resolved

alessio marked this conversation as resolved.
Show resolved Hide resolved
if height != -1 {
simApp = simapp.NewSimApp(logger, db, traceStore, false, map[int64]bool{}, "", uint(1), encCfg, appOpts)
simApp = simapp.NewSimApp(logger, db, traceStore, false, map[int64]bool{}, homePath, uint(1), encCfg, appOpts)

if err := simApp.LoadHeight(height); err != nil {
return servertypes.ExportedApp{}, err
}
} else {
simApp = simapp.NewSimApp(logger, db, traceStore, true, map[int64]bool{}, "", uint(1), encCfg, appOpts)
simApp = simapp.NewSimApp(logger, db, traceStore, true, map[int64]bool{}, homePath, uint(1), encCfg, appOpts)
}

return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs)
Expand Down