aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-11 00:14:31 +0800
committerFelix Lange <fjl@twurst.com>2015-03-11 00:14:31 +0800
commit269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (patch)
treec2e9e274c64f431f03b9a6b8b3de22585c016027 /eth
parent972e2c1e31067a9bab77228c19348b66964ce643 (diff)
parent0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff)
downloaddexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.gz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.bz2
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.lz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.xz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.zst
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.zip
Merge branch origin/develop into accounts-integration
Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go
Diffstat (limited to 'eth')
-rw-r--r--eth/backend.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 9d7ce4988..9e365161d 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -260,6 +260,17 @@ func (s *Ethereum) Start() error {
return nil
}
+func (s *Ethereum) StartForTest() {
+ jsonlogger.LogJson(&logger.LogStarting{
+ ClientString: s.net.Name,
+ ProtocolVersion: ProtocolVersion,
+ })
+
+ // Start services
+ s.txPool.Start()
+ s.blockPool.Start()
+}
+
func (self *Ethereum) SuggestPeer(nodeURL string) error {
n, err := discover.ParseNode(nodeURL)
if err != nil {