diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-11-15 20:46:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 20:46:47 +0800 |
| commit | 81d9d7d38555a63602b9da3d07955ad4e5a62f02 (patch) | |
| tree | 9ce0d55bfe182f6493867ea5497bf2c8cd9e8523 /eth/backend.go | |
| parent | ef9265d0d7abf6614c1d2fb977989ab0d400a590 (diff) | |
| parent | 822355f8a6e8826561433392fd94a8bde7e4dbf3 (diff) | |
| download | go-tangerine-1.4.19.tar go-tangerine-1.4.19.tar.gz go-tangerine-1.4.19.tar.bz2 go-tangerine-1.4.19.tar.lz go-tangerine-1.4.19.tar.xz go-tangerine-1.4.19.tar.zst go-tangerine-1.4.19.zip | |
Merge pull request #3252 from obscuren/release/1.4v1.4.19
1.4 HF
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/eth/backend.go b/eth/backend.go index 7176c2887..b967ba301 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -37,7 +37,6 @@ import ( "github.com/ethereum/go-ethereum/common/registrar/ethreg" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/ethdb" @@ -47,6 +46,7 @@ import ( "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" ) @@ -65,7 +65,7 @@ var ( ) type Config struct { - ChainConfig *core.ChainConfig // chain configuration + ChainConfig *params.ChainConfig // chain configuration NetworkId int // Network ID to use for selecting peers to connect to Genesis string // Genesis JSON to seed the chain database with @@ -104,14 +104,13 @@ type Config struct { } type Ethereum struct { - chainConfig *core.ChainConfig + chainConfig *params.ChainConfig // Channel for shutting down the ethereum shutdownChan chan bool // DB interfaces chainDb ethdb.Database // Block chain database dappDb ethdb.Database // Dapp database - // Handlers txPool *core.TxPool txMu sync.Mutex @@ -253,10 +252,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { core.WriteChainConfig(chainDb, genesis.Hash(), config.ChainConfig) eth.chainConfig = config.ChainConfig - eth.chainConfig.VmConfig = vm.Config{ - EnableJit: config.EnableJit, - ForceJit: config.ForceJit, - } eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.EventMux()) if err != nil { |