Fixed import cycle

ethereum.go

@@ -4,6 +4,7 @@ import (
 	"container/list"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethdb"
+	"github.com/ethereum/eth-go/etherpc"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/eth-go/ethwire"
 	"io/ioutil"
@@ -63,7 +64,7 @@ type Ethereum struct {
 
 	reactor *ethutil.ReactorEngine
 
-	// TODO: This no worky: RpcServer *etherpc.JsonRpcServer
+	RpcServer *etherpc.JsonRpcServer
 }
 
 func New(caps Caps, usePnp bool) (*Ethereum, error) {
@@ -338,9 +339,9 @@ func (s *Ethereum) Stop() {
 
 	close(s.quit)
 
+	s.RpcServer.Stop()
 	s.txPool.Stop()
 	s.stateManager.Stop()
-	// TODO: THIS NO WORKY: s.RpcServer.Stop()
 
 	close(s.shutdownChan)
 }

etherpc/server.go

@@ -41,7 +41,7 @@ func (s *JsonRpcServer) Start() {
 		conn, err := s.listener.Accept()
 		if err != nil {
 			ethutil.Config.Log.Infoln("[JSON] Error starting JSON-RPC:", err)
-			continue
+			break
 		}
 		ethutil.Config.Log.Debugln("[JSON] Incoming request.")
 		go jsonrpc.ServeConn(conn)

ethpub/pub.go

@@ -1,7 +1,6 @@
 package ethpub
 
 import (
-	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
 )
@@ -12,11 +11,11 @@ type PEthereum struct {
 	txPool       *ethchain.TxPool
 }
 
-func NewPEthereum(eth *eth.Ethereum) *PEthereum {
+func NewPEthereum(sm *ethchain.StateManager, bc *ethchain.BlockChain, txp *ethchain.TxPool) *PEthereum {
 	return &PEthereum{
-		eth.StateManager(),
+		sm,
-		eth.BlockChain(),
+		bc,
-		eth.TxPool(),
+		txp,
 	}
 }