diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-06-26 18:44:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 18:44:35 +0800 |
| commit | feb29327066d6076d1802cdc1492d43a39cec276 (patch) | |
| tree | 93f3231648b0f225c0c8d44bf81304282f93b605 /cmd/geth/main.go | |
| parent | f321ed23fbaad8a13cc672f601b15f5272b4b2bb (diff) | |
| parent | ea1d1825a8509b3353c535c9444861e15471942a (diff) | |
| download | go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.gz go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.bz2 go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.lz go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.xz go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.tar.zst go-tangerine-feb29327066d6076d1802cdc1492d43a39cec276.zip | |
Merge pull request #14540 from bas-vk/whisper-api
whisperv5: integrate whisper and implement API
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index b5cdd712d..7e0242d8f 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -95,7 +95,6 @@ var ( utils.NetrestrictFlag, utils.NodeKeyFileFlag, utils.NodeKeyHexFlag, - utils.WhisperEnabledFlag, utils.DevModeFlag, utils.TestnetFlag, utils.RinkebyFlag, @@ -125,6 +124,12 @@ var ( utils.IPCDisabledFlag, utils.IPCPathFlag, } + + whisperFlags = []cli.Flag{ + utils.WhisperEnabledFlag, + utils.WhisperMaxMessageSizeFlag, + utils.WhisperMinPOWFlag, + } ) func init() { @@ -161,6 +166,7 @@ func init() { app.Flags = append(app.Flags, rpcFlags...) app.Flags = append(app.Flags, consoleFlags...) app.Flags = append(app.Flags, debug.Flags...) + app.Flags = append(app.Flags, whisperFlags...) app.Before = func(ctx *cli.Context) error { runtime.GOMAXPROCS(runtime.NumCPU()) |