Added configure API address and test ok.

diff --git a/cmd/bytom/commands/run_node.go b/cmd/bytom/commands/run_node.go
index e1891b3..68e1903 100644 (file)
--- a/cmd/bytom/commands/run_node.go
+++ b/cmd/bytom/commands/run_node.go
@@ -29,7 +29,6 @@ func init() {
 }
 
 func runNode(cmd *cobra.Command, args []string) error {
-
        genDocFile := config.GenesisFile()
        if !cmn.FileExists(genDocFile) {
                logger.Info(cmn.Fmt("Waiting for genesis file %v...", genDocFile))

diff --git a/config/config.go b/config/config.go
index ff7105d..11d9bb7 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -82,6 +82,8 @@ type BaseConfig struct {
 
        // Database directory
        DBPath string `mapstructure:"db_dir"`
+
+       ApiAddress string `mapstructure:"api_addr"`
 }
 
 func DefaultBaseConfig() BaseConfig {

diff --git a/config/toml.go b/config/toml.go
index 1976e69..50262aa 100644 (file)
--- a/config/toml.go
+++ b/config/toml.go
@@ -32,6 +32,7 @@ moniker = "__MONIKER__"
 fast_sync = true
 db_backend = "leveldb"
 log_level = "state:info,*:info"
+api_addr = "0.0.0.0:1999"
 
 [rpc]
 laddr = "tcp://0.0.0.0:46657"
@@ -48,16 +49,14 @@ func defaultConfig(moniker string) string {
 /****** these are for test settings ***********/
 
 func ResetTestRoot(testName string) *Config {
-       rootDir := os.ExpandEnv("$HOME/.tendermint_test")
+       rootDir := os.ExpandEnv("$HOME/.test")
        rootDir = filepath.Join(rootDir, testName)
-       // Remove ~/.tendermint_test_bak
        if cmn.FileExists(rootDir + "_bak") {
                err := os.RemoveAll(rootDir + "_bak")
                if err != nil {
                        cmn.PanicSanity(err.Error())
                }
        }
-       // Move ~/.tendermint_test to ~/.tendermint_test_bak
        if cmn.FileExists(rootDir) {
                err := os.Rename(rootDir, rootDir+"_bak")
                if err != nil {
@@ -94,6 +93,7 @@ moniker = "__MONIKER__"
 fast_sync = false
 db_backend = "memdb"
 log_level = "info"
+api_addr = "0.0.0.0:1999"
 
 [rpc]
 laddr = "tcp://0.0.0.0:36657"

diff --git a/node/node.go b/node/node.go
index a6ad390..e36b48b 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -67,7 +67,6 @@ type Node struct {
 var (
     // config vars
        rootCAs       = env.String("ROOT_CA_CERTS", "") // file path
-       listenAddr    = env.String("LISTEN", ":1999")
        splunkAddr    = os.Getenv("SPLUNKADDR")
        logFile       = os.Getenv("LOGFILE")
        logSize       = env.Int("LOGSIZE", 5e6) // 5MB
@@ -117,7 +116,7 @@ func (wh *waitHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
        wh.h.ServeHTTP(w, req)
 }
 
-func rpcInit(h *bc.BlockchainReactor) {
+func rpcInit(h *bc.BlockchainReactor, config *cfg.Config) {
        // The waitHandler accepts incoming requests, but blocks until its underlying
        // handler is set, when the second phase is complete.
        var coreHandler waitHandler
@@ -145,6 +144,7 @@ func rpcInit(h *bc.BlockchainReactor) {
                // https://github.com/golang/go/issues/17071
                TLSNextProto: map[string]func(*http.Server, *tls.Conn, http.Handler){},
        }
+       listenAddr := env.String("LISTEN", config.ApiAddress)
        listener, _ := net.Listen("tcp", *listenAddr)
 
        // The `Serve` call has to happen in its own goroutine because
@@ -209,7 +209,7 @@ func NewNode(config *cfg.Config, logger log.Logger) *Node {
     bcReactor.SetLogger(logger.With("module", "blockchain"))
     sw.AddReactor("BLOCKCHAIN", bcReactor)
 
-       rpcInit(bcReactor)
+       rpcInit(bcReactor, config)
        // Optionally, start the pex reactor
        var addrBook *p2p.AddrBook
        if config.P2P.PexReactor {