From 03cc5df9b7ea7d9bf5569b5b4e320c7c7d0e0930 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Mon, 23 Mar 2015 16:23:06 +0000
Subject: [PATCH] eth: fix protocol version/network id copied from config to
Ethereum field
---
eth/backend.go | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/eth/backend.go b/eth/backend.go
index 06c3cbd17..4e60e16f2 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -177,15 +177,16 @@ func New(config *Config) (*Ethereum, error) {
servlogger.Infof("Protocol Version: %v, Network Id: %v", config.ProtocolVersion, config.NetworkId)
eth := &Ethereum{
- shutdownChan: make(chan bool),
- blockDb: blockDb,
- stateDb: stateDb,
- extraDb: extraDb,
- eventMux: &event.TypeMux{},
- // logger: servlogsystem,
- accountManager: config.AccountManager,
- DataDir: config.DataDir,
- version: config.Name, // TODO should separate from Name
+ shutdownChan: make(chan bool),
+ blockDb: blockDb,
+ stateDb: stateDb,
+ extraDb: extraDb,
+ eventMux: &event.TypeMux{},
+ accountManager: config.AccountManager,
+ DataDir: config.DataDir,
+ version: config.Name, // TODO should separate from Name
+ ProtocolVersion: config.ProtocolVersion,
+ NetworkId: config.NetworkId,
}
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
--
GitLab