Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
cf842b3f
Commit
cf842b3f
authored
Apr 01, 2016
by
Felix Lange
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmd/geth, eth: move --genesis deprecation warning to cmd/geth
This prevents display of the warning for --dev and --olympic.
parent
78b70d79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
main.go
cmd/geth/main.go
+6
-0
backend.go
eth/backend.go
+0
-4
No files found.
cmd/geth/main.go
View file @
cf842b3f
...
@@ -359,6 +359,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
...
@@ -359,6 +359,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
go
metrics
.
CollectProcessMetrics
(
3
*
time
.
Second
)
go
metrics
.
CollectProcessMetrics
(
3
*
time
.
Second
)
utils
.
SetupNetwork
(
ctx
)
utils
.
SetupNetwork
(
ctx
)
// Deprecation warning.
if
ctx
.
GlobalIsSet
(
utils
.
GenesisFileFlag
.
Name
)
{
common
.
PrintDepricationWarning
(
"--genesis is deprecated. Switch to use 'geth init /path/to/file'"
)
}
return
nil
return
nil
}
}
...
...
eth/backend.go
View file @
cf842b3f
...
@@ -169,10 +169,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
...
@@ -169,10 +169,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
// Load up any custom genesis block if requested
// Load up any custom genesis block if requested
if
len
(
config
.
Genesis
)
>
0
{
if
len
(
config
.
Genesis
)
>
0
{
// Using println instead of glog to make sure it **always** displays regardless of
// verbosity settings.
common
.
PrintDepricationWarning
(
"--genesis is deprecated. Switch to use 'geth init /path/to/file'"
)
block
,
err
:=
core
.
WriteGenesisBlock
(
chainDb
,
strings
.
NewReader
(
config
.
Genesis
))
block
,
err
:=
core
.
WriteGenesisBlock
(
chainDb
,
strings
.
NewReader
(
config
.
Genesis
))
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment