aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorkiel barry <kiel.j.barry@gmail.com>2018-06-05 18:31:34 +0800
committerFelix Lange <fjl@users.noreply.github.com>2018-06-05 18:31:34 +0800
commitcbfb40b0aab093e1b612f3b16834894b2cc67882 (patch)
tree19cbd1397343459aabf211857fcc5df26f4cee6c /cmd
parent4cf2b4110e9942bdcba1b9b1d82b3ca8ff552f64 (diff)
downloaddexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar.gz
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar.bz2
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar.lz
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar.xz
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.tar.zst
dexon-cbfb40b0aab093e1b612f3b16834894b2cc67882.zip
params: fix golint warnings (#16853)
params: fix golint warnings
Diffstat (limited to 'cmd')
-rw-r--r--cmd/faucet/faucet.go2
-rw-r--r--cmd/puppeth/genesis.go6
-rw-r--r--cmd/puppeth/module_dashboard.go2
-rw-r--r--cmd/puppeth/wizard_faucet.go2
-rw-r--r--cmd/puppeth/wizard_genesis.go2
-rw-r--r--cmd/puppeth/wizard_node.go2
-rw-r--r--cmd/puppeth/wizard_wallet.go2
7 files changed, 9 insertions, 9 deletions
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 5bad09bbd..5f00dde74 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -474,7 +474,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) {
amount = new(big.Int).Div(amount, new(big.Int).Exp(big.NewInt(2), big.NewInt(int64(msg.Tier)), nil))
tx := types.NewTransaction(f.nonce+uint64(len(f.reqs)), address, amount, 21000, f.price, nil)
- signed, err := f.keystore.SignTx(f.account, tx, f.config.ChainId)
+ signed, err := f.keystore.SignTx(f.account, tx, f.config.ChainID)
if err != nil {
f.lock.Unlock()
if err = sendError(conn, err); err != nil {
diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go
index 1974a94aa..5f39a889d 100644
--- a/cmd/puppeth/genesis.go
+++ b/cmd/puppeth/genesis.go
@@ -103,8 +103,8 @@ func newCppEthereumGenesisSpec(network string, genesis *core.Genesis) (*cppEther
spec.Params.ByzantiumForkBlock = (hexutil.Uint64)(genesis.Config.ByzantiumBlock.Uint64())
spec.Params.ConstantinopleForkBlock = (hexutil.Uint64)(math.MaxUint64)
- spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainId.Uint64())
- spec.Params.ChainID = (hexutil.Uint64)(genesis.Config.ChainId.Uint64())
+ spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
+ spec.Params.ChainID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
spec.Params.MaximumExtraDataSize = (hexutil.Uint64)(params.MaximumExtraDataSize)
spec.Params.MinGasLimit = (hexutil.Uint64)(params.MinGasLimit)
@@ -284,7 +284,7 @@ func newParityChainSpec(network string, genesis *core.Genesis, bootnodes []strin
spec.Params.MaximumExtraDataSize = (hexutil.Uint64)(params.MaximumExtraDataSize)
spec.Params.MinGasLimit = (hexutil.Uint64)(params.MinGasLimit)
spec.Params.GasLimitBoundDivisor = (hexutil.Uint64)(params.GasLimitBoundDivisor)
- spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainId.Uint64())
+ spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
spec.Params.MaxCodeSize = params.MaxCodeSize
spec.Params.EIP155Transition = genesis.Config.EIP155Block.Uint64()
spec.Params.EIP98Transition = math.MaxUint64
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 4f9e88899..a51762338 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -609,7 +609,7 @@ func deployDashboard(client *sshClient, network string, conf *config, config *da
}
template.Must(template.New("").Parse(dashboardContent)).Execute(indexfile, map[string]interface{}{
"Network": network,
- "NetworkID": conf.Genesis.Config.ChainId,
+ "NetworkID": conf.Genesis.Config.ChainID,
"NetworkTitle": strings.Title(network),
"EthstatsPage": config.ethstats,
"ExplorerPage": config.explorer,
diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go
index 9a429bc96..6f0840894 100644
--- a/cmd/puppeth/wizard_faucet.go
+++ b/cmd/puppeth/wizard_faucet.go
@@ -49,7 +49,7 @@ func (w *wizard) deployFaucet() {
existed := err == nil
infos.node.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
- infos.node.network = w.conf.Genesis.Config.ChainId.Int64()
+ infos.node.network = w.conf.Genesis.Config.ChainID.Int64()
// Figure out which port to listen on
fmt.Println()
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index f255ef6e6..6c4cd571f 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -121,7 +121,7 @@ func (w *wizard) makeGenesis() {
// Query the user for some custom extras
fmt.Println()
fmt.Println("Specify your chain/network ID if you want an explicit one (default = random)")
- genesis.Config.ChainId = new(big.Int).SetUint64(uint64(w.readDefaultInt(rand.Intn(65536))))
+ genesis.Config.ChainID = new(big.Int).SetUint64(uint64(w.readDefaultInt(rand.Intn(65536))))
// All done, store the genesis and flush to disk
log.Info("Configured new genesis block")
diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go
index a60948bc6..f3fef4034 100644
--- a/cmd/puppeth/wizard_node.go
+++ b/cmd/puppeth/wizard_node.go
@@ -56,7 +56,7 @@ func (w *wizard) deployNode(boot bool) {
existed := err == nil
infos.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
- infos.network = w.conf.Genesis.Config.ChainId.Int64()
+ infos.network = w.conf.Genesis.Config.ChainID.Int64()
// Figure out where the user wants to store the persistent data
fmt.Println()
diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go
index 933cd9ae5..7624d11e2 100644
--- a/cmd/puppeth/wizard_wallet.go
+++ b/cmd/puppeth/wizard_wallet.go
@@ -52,7 +52,7 @@ func (w *wizard) deployWallet() {
existed := err == nil
infos.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
- infos.network = w.conf.Genesis.Config.ChainId.Int64()
+ infos.network = w.conf.Genesis.Config.ChainID.Int64()
// Figure out which port to listen on
fmt.Println()