diff options
| author | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
| commit | 24349144b6c0642755569268bab56b9033743212 (patch) | |
| tree | 9d9d2b6659fd8a56512dfc807aafe4b733165ae1 /cmd/geth | |
| parent | 7d56602391e155e2ce9ba7c261300a1804ab9972 (diff) | |
| parent | d3441ebb563439bac0837d70591f92e2c6080303 (diff) | |
| download | dexon-24349144b6c0642755569268bab56b9033743212.tar dexon-24349144b6c0642755569268bab56b9033743212.tar.gz dexon-24349144b6c0642755569268bab56b9033743212.tar.bz2 dexon-24349144b6c0642755569268bab56b9033743212.tar.lz dexon-24349144b6c0642755569268bab56b9033743212.tar.xz dexon-24349144b6c0642755569268bab56b9033743212.tar.zst dexon-24349144b6c0642755569268bab56b9033743212.zip | |
Merge branch 'master' into max-stream-peer-servers
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/chaincmd.go | 4 | ||||
| -rw-r--r-- | cmd/geth/main.go | 2 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 87548865b..562c7e0de 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -340,9 +340,9 @@ func importPreimages(ctx *cli.Context) error { start := time.Now() if err := utils.ImportPreimages(diskdb, ctx.Args().First()); err != nil { - utils.Fatalf("Export error: %v\n", err) + utils.Fatalf("Import error: %v\n", err) } - fmt.Printf("Export done in %v\n", time.Since(start)) + fmt.Printf("Import done in %v\n", time.Since(start)) return nil } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 134d5a4c0..fae4b5718 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -130,6 +130,8 @@ var ( utils.NoCompactionFlag, utils.GpoBlocksFlag, utils.GpoPercentileFlag, + utils.EWASMInterpreterFlag, + utils.EVMInterpreterFlag, configFileFlag, } diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index a674eca4f..8b0491ce3 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -207,6 +207,8 @@ var AppHelpFlagGroups = []flagGroup{ Name: "VIRTUAL MACHINE", Flags: []cli.Flag{ utils.VMEnableDebugFlag, + utils.EVMInterpreterFlag, + utils.EWASMInterpreterFlag, }, }, { |