Revert "eth: refactor creation of EthAPIBackend (#20476)" (#20536)

karalabe · web-flow · commit b211742e5f1e · 2020-01-09T13:26:37.000+02:00
This reverts commit a1bc0e3.
diff --git a/eth/backend.go b/eth/backend.go
@@ -213,12 +213,12 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 	eth.miner = miner.New(eth, &config.Miner, chainConfig, eth.EventMux(), eth.engine, eth.isLocalBlock)
 	eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))
 
+	eth.APIBackend = &EthAPIBackend{ctx.ExtRPCEnabled(), eth, nil}
 	gpoParams := config.GPO
 	if gpoParams.Default == nil {
 		gpoParams.Default = config.Miner.GasPrice
 	}
-
-	eth.APIBackend = &EthAPIBackend{ctx.ExtRPCEnabled(), eth, gasprice.NewOracle(eth.APIBackend, gpoParams)}
+	eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, gpoParams)
 
 	return eth, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -213,12 +213,12 @@ func New(ctx node.ServiceContext, config Config) (*Ethereum, error) {`
`213`	`213`	`eth.miner = miner.New(eth, &config.Miner, chainConfig, eth.EventMux(), eth.engine, eth.isLocalBlock)`
`214`	`214`	`eth.miner.SetExtra(makeExtraData(config.Miner.ExtraData))`
`215`	`215`
	`216`	`+ eth.APIBackend = &EthAPIBackend{ctx.ExtRPCEnabled(), eth, nil}`
`216`	`217`	`gpoParams := config.GPO`
`217`	`218`	`if gpoParams.Default == nil {`
`218`	`219`	`gpoParams.Default = config.Miner.GasPrice`
`219`	`220`	`}`
`220`		`-`
`221`		`- eth.APIBackend = &EthAPIBackend{ctx.ExtRPCEnabled(), eth, gasprice.NewOracle(eth.APIBackend, gpoParams)}`
	`221`	`+ eth.APIBackend.gpo = gasprice.NewOracle(eth.APIBackend, gpoParams)`
`222`	`222`
`223`	`223`	`return eth, nil`
`224`	`224`	`}`