diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-11-24 20:48:47 +0800 |
| commit | 5490437942967638bcc6198035315f6811febaa8 (patch) | |
| tree | ec4fbee454bacbf2b80b5a7ff402fb48dd2c10cf /cmd/utils/flags.go | |
| parent | e5532154a50114d5ffb1ffd850b746cab00cb899 (diff) | |
| parent | b0fb48c389460193d9fc0a5118d79ff6dec48ce0 (diff) | |
| download | go-tangerine-1.3.2.tar go-tangerine-1.3.2.tar.gz go-tangerine-1.3.2.tar.bz2 go-tangerine-1.3.2.tar.lz go-tangerine-1.3.2.tar.xz go-tangerine-1.3.2.tar.zst go-tangerine-1.3.2.zip | |
Merge branch 'develop' into release/1.3.2v1.3.2
Conflicts:
VERSION
cmd/geth/main.go
Diffstat (limited to 'cmd/utils/flags.go')
| -rw-r--r-- | cmd/utils/flags.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d741d0544..3792dc1e0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -150,11 +150,11 @@ var ( } FastSyncFlag = cli.BoolFlag{ Name: "fast", - Usage: "Enables fast syncing through state downloads", + Usage: "Enable fast syncing through state downloads", } LightKDFFlag = cli.BoolFlag{ Name: "lightkdf", - Usage: "Reduce KDF memory & CPU usage at some expense of KDF strength", + Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength", } // Miner settings // TODO: refactor CPU vs GPU mining flags @@ -557,8 +557,6 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database Fatalf("Could not start chainmanager: %v", err) } - proc := core.NewBlockProcessor(chainDb, pow, chain, eventMux) - chain.SetProcessor(proc) return chain, chainDb } |