RPC refactor to separate core from core_client and the rest of RPC.

Other random changes.

node/node.go

@@ -0,0 +1,185 @@
+package node
+
+import (
+	"os"
+	"os/signal"
+
+	bc "github.com/tendermint/tendermint/blockchain"
+	. "github.com/tendermint/tendermint/common"
+	"github.com/tendermint/tendermint/config"
+	"github.com/tendermint/tendermint/consensus"
+	dbm "github.com/tendermint/tendermint/db"
+	mempl "github.com/tendermint/tendermint/mempool"
+	"github.com/tendermint/tendermint/p2p"
+	"github.com/tendermint/tendermint/rpc"
+	"github.com/tendermint/tendermint/rpc/core"
+	sm "github.com/tendermint/tendermint/state"
+)
+
+type Node struct {
+	sw               *p2p.Switch
+	book             *p2p.AddrBook
+	blockStore       *bc.BlockStore
+	pexReactor       *p2p.PEXReactor
+	bcReactor        *bc.BlockchainReactor
+	mempoolReactor   *mempl.MempoolReactor
+	consensusState   *consensus.ConsensusState
+	consensusReactor *consensus.ConsensusReactor
+	privValidator    *sm.PrivValidator
+}
+
+func NewNode() *Node {
+	// Get BlockStore
+	blockStoreDB := dbm.GetDB("blockstore")
+	blockStore := bc.NewBlockStore(blockStoreDB)
+
+	// Get State
+	stateDB := dbm.GetDB("state")
+	state := sm.LoadState(stateDB)
+	if state == nil {
+		state = sm.MakeGenesisStateFromFile(stateDB, config.App().GetString("GenesisFile"))
+		state.Save()
+	}
+
+	// Get PrivValidator
+	var privValidator *sm.PrivValidator
+	if _, err := os.Stat(config.App().GetString("PrivValidatorFile")); err == nil {
+		privValidator = sm.LoadPrivValidator(config.App().GetString("PrivValidatorFile"))
+		log.Info("Loaded PrivValidator", "file", config.App().GetString("PrivValidatorFile"), "privValidator", privValidator)
+	} else {
+		log.Info("No PrivValidator found", "file", config.App().GetString("PrivValidatorFile"))
+	}
+
+	// Get PEXReactor
+	book := p2p.NewAddrBook(config.App().GetString("AddrBookFile"))
+	pexReactor := p2p.NewPEXReactor(book)
+
+	// Get BlockchainReactor
+	bcReactor := bc.NewBlockchainReactor(state, blockStore, config.App().GetBool("FastSync"))
+
+	// Get MempoolReactor
+	mempool := mempl.NewMempool(state.Copy())
+	mempoolReactor := mempl.NewMempoolReactor(mempool)
+
+	// Get ConsensusReactor
+	consensusState := consensus.NewConsensusState(state, blockStore, mempoolReactor)
+	consensusReactor := consensus.NewConsensusReactor(consensusState, blockStore)
+	if privValidator != nil {
+		consensusReactor.SetPrivValidator(privValidator)
+	}
+
+	sw := p2p.NewSwitch()
+	sw.SetNetwork(config.App().GetString("Network"))
+	sw.AddReactor("PEX", pexReactor)
+	sw.AddReactor("MEMPOOL", mempoolReactor)
+	sw.AddReactor("BLOCKCHAIN", bcReactor)
+	sw.AddReactor("CONSENSUS", consensusReactor)
+
+	return &Node{
+		sw:               sw,
+		book:             book,
+		blockStore:       blockStore,
+		pexReactor:       pexReactor,
+		bcReactor:        bcReactor,
+		mempoolReactor:   mempoolReactor,
+		consensusState:   consensusState,
+		consensusReactor: consensusReactor,
+		privValidator:    privValidator,
+	}
+}
+
+func (n *Node) Start() {
+	log.Info("Starting Node")
+	n.book.Start()
+	n.sw.Start()
+	if config.App().GetBool("FastSync") {
+		// TODO: When FastSync is done, start CONSENSUS.
+		n.sw.Reactor("CONSENSUS").Stop()
+	}
+}
+
+func (n *Node) Stop() {
+	log.Info("Stopping Node")
+	// TODO: gracefully disconnect from peers.
+	n.sw.Stop()
+	n.book.Stop()
+}
+
+// Add a Listener to accept inbound peer connections.
+func (n *Node) AddListener(l p2p.Listener) {
+	log.Info(Fmt("Added %v", l))
+	n.sw.AddListener(l)
+	n.book.AddOurAddress(l.ExternalAddress())
+}
+
+func (n *Node) DialSeed() {
+	addr := p2p.NewNetAddressString(config.App().GetString("SeedNode"))
+	peer, err := n.sw.DialPeerWithAddress(addr)
+	if err != nil {
+		log.Error("Error dialing seed", "error", err)
+		//n.book.MarkAttempt(addr)
+		return
+	} else {
+		log.Info("Connected to seed", "peer", peer)
+		n.book.AddAddress(addr, addr)
+	}
+}
+
+func (n *Node) StartRPC() {
+	core.SetBlockStore(n.blockStore)
+	core.SetConsensusState(n.consensusState)
+	core.SetMempoolReactor(n.mempoolReactor)
+	core.SetSwitch(n.sw)
+
+	rpc.StartHTTPServer(config.App().GetString("RPC.HTTP.ListenAddr"), core.Routes)
+}
+
+func (n *Node) Switch() *p2p.Switch {
+	return n.sw
+}
+
+func (n *Node) ConsensusState() *consensus.ConsensusState {
+	return n.consensusState
+}
+
+func (n *Node) MempoolReactor() *mempl.MempoolReactor {
+	return n.mempoolReactor
+}
+
+//------------------------------------------------------------------------------
+
+func RunNode() {
+	// Create & start node
+	n := NewNode()
+	l := p2p.NewDefaultListener("tcp", config.App().GetString("ListenAddr"), false)
+	n.AddListener(l)
+	n.Start()
+
+	// If seedNode is provided by config, dial out.
+	if config.App().GetString("SeedNode") != "" {
+		n.DialSeed()
+	}
+
+	// Run the RPC server.
+	if config.App().GetString("RPC.HTTP.ListenAddr") != "" {
+		n.StartRPC()
+	}
+
+	// Sleep forever and then...
+	trapSignal(func() {
+		n.Stop()
+	})
+}
+
+func trapSignal(cb func()) {
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt)
+	go func() {
+		for sig := range c {
+			log.Info(Fmt("captured %v, exiting..", sig))
+			cb()
+			os.Exit(1)
+		}
+	}()
+	select {}
+}