Merge branch origin/develop into accounts-integration

Conflicts:
	cmd/blocktest/main.go
	cmd/mist/debugger.go
	cmd/utils/cmd.go

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 {