aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorbas-vk <bas-vk@users.noreply.github.com>2017-04-13 05:04:14 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-04-13 05:04:14 +0800
commit5e29f4be935ff227bbf07a0c6e80e8809f5e0202 (patch)
tree18e1ef8db3c66c3bf777dc90326aa971f1343d34 /eth
parent43671067fb453a1ed798bcc3d8016710460f2bdf (diff)
downloaddexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar.gz
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar.bz2
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar.lz
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar.xz
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.tar.zst
dexon-5e29f4be935ff227bbf07a0c6e80e8809f5e0202.zip
cmd/utils, node: remove unused solc references and improve RPC config (#14324)
Currently http cors and websocket origins are a comma separated string in the config object. These are replaced with string arrays that are more expressive in case of a config file.
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go4
-rw-r--r--eth/config.go1
-rw-r--r--eth/gen_config.go6
3 files changed, 1 insertions, 10 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 7ee591f9e..03c2e38e5 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -79,7 +79,6 @@ type Ethereum struct {
Mining bool
MinerThreads int
etherbase common.Address
- solcPath string
netVersionId int
netRPCService *ethapi.PublicNetAPI
@@ -122,7 +121,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
netVersionId: config.NetworkId,
etherbase: config.Etherbase,
MinerThreads: config.MinerThreads,
- solcPath: config.SolcPath,
}
if err := addMipmapBloomBins(chainDb); err != nil {
@@ -236,7 +234,7 @@ func CreateConsensusEngine(ctx *node.ServiceContext, config *Config, chainConfig
// APIs returns the collection of RPC services the ethereum package offers.
// NOTE, some of these services probably need to be moved to somewhere else.
func (s *Ethereum) APIs() []rpc.API {
- apis := ethapi.GetAPIs(s.ApiBackend, s.solcPath)
+ apis := ethapi.GetAPIs(s.ApiBackend)
// Append any APIs exposed explicitly by the consensus engine
apis = append(apis, s.engine.APIs(s.BlockChain())...)
diff --git a/eth/config.go b/eth/config.go
index 9c3f8b0fb..daa402ca5 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -105,7 +105,6 @@ type Config struct {
EnablePreimageRecording bool
// Miscellaneous options
- SolcPath string
DocRoot string `toml:"-"`
PowFake bool `toml:"-"`
PowTest bool `toml:"-"`
diff --git a/eth/gen_config.go b/eth/gen_config.go
index d34273e1c..56fba1d89 100644
--- a/eth/gen_config.go
+++ b/eth/gen_config.go
@@ -35,7 +35,6 @@ func (c Config) MarshalTOML() (interface{}, error) {
EthashDatasetsOnDisk int
GPO gasprice.Config
EnablePreimageRecording bool
- SolcPath string
DocRoot string `toml:"-"`
PowFake bool `toml:"-"`
PowTest bool `toml:"-"`
@@ -63,7 +62,6 @@ func (c Config) MarshalTOML() (interface{}, error) {
enc.EthashDatasetsOnDisk = c.EthashDatasetsOnDisk
enc.GPO = c.GPO
enc.EnablePreimageRecording = c.EnablePreimageRecording
- enc.SolcPath = c.SolcPath
enc.DocRoot = c.DocRoot
enc.PowFake = c.PowFake
enc.PowTest = c.PowTest
@@ -94,7 +92,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
EthashDatasetsOnDisk *int
GPO *gasprice.Config
EnablePreimageRecording *bool
- SolcPath *string
DocRoot *string `toml:"-"`
PowFake *bool `toml:"-"`
PowTest *bool `toml:"-"`
@@ -167,9 +164,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
if dec.EnablePreimageRecording != nil {
c.EnablePreimageRecording = *dec.EnablePreimageRecording
}
- if dec.SolcPath != nil {
- c.SolcPath = *dec.SolcPath
- }
if dec.DocRoot != nil {
c.DocRoot = *dec.DocRoot
}