Changed bytom node test.

diff --git a/cmd/bytom/test.sh b/cmd/bytom/test.sh
index aa15795..1a53823 100755 (executable)
--- a/cmd/bytom/test.sh
+++ b/cmd/bytom/test.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [ "$1" = "node1" ];
+if [ "$1" = "bytom0" ];
 then
-    ./bytom node --home ./test/.blockchain
-elif [ "$1" = "node2" ];
+    ./bytom node --home ./test/.bytom0
+elif [ "$1" = "bytom1" ];
 then
-    ./bytom node --home ./test/.blockchain1
+    ./bytom node --home ./test/.bytom1
 else
-    echo "please cin -----./test.sh node1[node2]------ ."
+    echo "please cin -----./test.sh bytom0[bytom1]------ ."
 fi

diff --git a/cmd/bytom/test/.blockchain/genesis.json b/cmd/bytom/test/.blockchain/genesis.json
deleted file mode 100644 (file)
index 51052f2..0000000
--- a/cmd/bytom/test/.blockchain/genesis.json
+++ /dev/null
@@ -1 +0,0 @@
-{"genesis_time":"0001-01-01T00:00:00Z","chain_id":"chain0","validators":[{"pub_key":{"type":"ed25519","data":"72C3013E7C237C3A45865B05B1B9F9C8CA8E00186777862E59CECCF1771DDE70"},"amount":10,"name":""}],"app_hash":""}
\ No newline at end of file

diff --git a/cmd/bytom/test/.blockchain/priv_validator.json b/cmd/bytom/test/.blockchain/priv_validator.json
deleted file mode 100644 (file)
index 56e28d2..0000000
--- a/cmd/bytom/test/.blockchain/priv_validator.json
+++ /dev/null
@@ -1 +0,0 @@
-{"address":"6F1C63636D9F0247AE829415735AC04B6AFE8374","pub_key":{"type":"ed25519","data":"72C3013E7C237C3A45865B05B1B9F9C8CA8E00186777862E59CECCF1771DDE70"},"last_height":0,"last_round":0,"last_step":0,"last_signature":null,"priv_key":{"type":"ed25519","data":"630BEB082A08D0EF9E37FE02E0A17F46E2A63E4B0FA0EF9089B811D211E5140572C3013E7C237C3A45865B05B1B9F9C8CA8E00186777862E59CECCF1771DDE70"}}
\ No newline at end of file

diff --git a/cmd/bytom/test/.blockchain1/genesis.json b/cmd/bytom/test/.blockchain1/genesis.json
deleted file mode 100644 (file)
index b5a11df..0000000
--- a/cmd/bytom/test/.blockchain1/genesis.json
+++ /dev/null
@@ -1 +0,0 @@
-{"genesis_time":"0001-01-01T00:00:00Z","chain_id":"chain0","validators":[{"pub_key":{"type":"ed25519","data":"A4CEE75748FFFB2DE321CC07D813E5421BD148B4852042C3AC4F1FB5AE0B2BBF"},"amount":10,"name":""}],"app_hash":""}
\ No newline at end of file

diff --git a/cmd/bytom/test/.blockchain1/priv_validator.json b/cmd/bytom/test/.blockchain1/priv_validator.json
deleted file mode 100644 (file)
index b0036d4..0000000
--- a/cmd/bytom/test/.blockchain1/priv_validator.json
+++ /dev/null
@@ -1 +0,0 @@
-{"address":"55FA5FFF009D41AEBB6C08A76E628ED55F1A5BA6","pub_key":{"type":"ed25519","data":"A4CEE75748FFFB2DE321CC07D813E5421BD148B4852042C3AC4F1FB5AE0B2BBF"},"last_height":0,"last_round":0,"last_step":0,"last_signature":null,"priv_key":{"type":"ed25519","data":"35A8F7DA011682AF9EF58EEB33F4B5F3208A08624CED870B60B9C36CDC82E71FA4CEE75748FFFB2DE321CC07D813E5421BD148B4852042C3AC4F1FB5AE0B2BBF"}}
\ No newline at end of file

diff --git a/cmd/bytom/test/.blockchain/config.toml b/cmd/bytom/test/.bytom0/config.toml
similarity index 88%
rename from cmd/bytom/test/.blockchain/config.toml
rename to cmd/bytom/test/.bytom0/config.toml
index cbaa9fa..2c5cfb9 100644 (file)
--- a/cmd/bytom/test/.blockchain/config.toml
+++ b/cmd/bytom/test/.bytom0/config.toml
@@ -1,11 +1,11 @@
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml
 
-proxy_app = "tcp://127.0.0.1:46658"
 moniker = "anonymous"
 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"

diff --git a/cmd/bytom/test/.bytom0/genesis.json b/cmd/bytom/test/.bytom0/genesis.json
new file mode 100644 (file)
index 0000000..a6b82cc
--- /dev/null
+++ b/cmd/bytom/test/.bytom0/genesis.json
@@ -0,0 +1 @@
+{"genesis_time":"0001-01-01T00:00:00Z","chain_id":"bytom","app_hash":""}
\ No newline at end of file

diff --git a/cmd/bytom/test/.blockchain1/config.toml b/cmd/bytom/test/.bytom1/config.toml
similarity index 88%
rename from cmd/bytom/test/.blockchain1/config.toml
rename to cmd/bytom/test/.bytom1/config.toml
index 0d41fa7..9ea5425 100644 (file)
--- a/cmd/bytom/test/.blockchain1/config.toml
+++ b/cmd/bytom/test/.bytom1/config.toml
@@ -1,11 +1,11 @@
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml
 
-proxy_app = "tcp://127.0.0.1:46658"
 moniker = "anonymous"
 fast_sync = true
 db_backend = "leveldb"
 log_level = "state:info,*:info"
+api_addr = "0.0.0.0:2000"
 
 [rpc]
 laddr = "tcp://0.0.0.0:46658"

diff --git a/cmd/bytom/test/.bytom1/genesis.json b/cmd/bytom/test/.bytom1/genesis.json
new file mode 100644 (file)
index 0000000..a6b82cc
--- /dev/null
+++ b/cmd/bytom/test/.bytom1/genesis.json
@@ -0,0 +1 @@
+{"genesis_time":"0001-01-01T00:00:00Z","chain_id":"bytom","app_hash":""}
\ No newline at end of file