update test

plugin/dapp/exchange/test/cmd/main.go

@@ -23,6 +23,7 @@ var (
 	}
 )
 
+// 批量测试前，先确保测试账户有足够的币和钱
 func main() {
 	cli = test.NewGRPCCli("localhost:8802")
 	go buy()
@@ -39,7 +40,7 @@ func sell() {
 		Op:         et.OpSell,
 	}
 	ety := types.LoadExecutorType(et.ExchangeX)
-	fmt.Println("ety", ety)
+	// 卖 2000 次，需 2000*1=2000 个 bty
 	for i := 0; i < 2000; i++ {
 		fmt.Println("sell ", i)
 		tx, err := ety.Create("LimitOrder", req)
@@ -59,6 +60,7 @@ func buy() {
 		Op:         et.OpBuy,
 	}
 	ety := types.LoadExecutorType(et.ExchangeX)
+	// 买 2000 次，需 2000*1=2000 个 ccny
 	for i := 0; i < 2000; i++ {
 		fmt.Println("buy ", i)
 		tx, err := ety.Create("LimitOrder", req)

plugin/dapp/exchange/test/exchange_test.go

@@ -289,7 +289,7 @@ func testLimitOrder(t *testing.T, req *et.LimitOrder, addr string, privkey strin
 	assert.Nil(t, err)
 	t.Log(accPrev)
 
-	tokenPrev, err := getExcerTokenBalance(addr, "CCNY")
+	tokenPrev, err := getExcerTokenBalance(addr, token)
 	assert.Nil(t, err)
 	t.Log(tokenPrev)
 
@@ -300,7 +300,7 @@ func testLimitOrder(t *testing.T, req *et.LimitOrder, addr string, privkey strin
 	assert.Nil(t, err)
 	t.Log(accAfter)
 
-	tokenAfter, err := getExcerTokenBalance(addr, "CCNY")
+	tokenAfter, err := getExcerTokenBalance(addr, token)
 	assert.Nil(t, err)
 	t.Log(tokenAfter)
 

plugin/dapp/exchange/test/prepare.sh

@@ -40,8 +40,8 @@ sleep 1
 sleep 1
 ./chain33-cli config query_config -k token-blacklist
 
-
-./chain33-cli send token precreate -f 0.001 -i "test ccny" -n "ccny" -a 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs -p 0 -s CCNY -t 100000000 -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
+## 10亿
+./chain33-cli send token precreate -f 0.001 -i "test ccny" -n "ccny" -a 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs -p 0 -s CCNY -t 1000000000 -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
 sleep 1
 ./chain33-cli token get_precreated
 
@@ -57,7 +57,7 @@ sleep 1
 ./chain33-cli send coins transfer -a 10000 -t 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
 ./chain33-cli account list
 
-## send bty to execer
+## send bty to execer， 每人10000 bty
 ./chain33-cli send coins send_exec -e exchange -a 10000 -k 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4
 ./chain33-cli send coins send_exec -e exchange -a 10000 -k 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR
 ./chain33-cli send coins send_exec -e exchange -a 10000 -k 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k
@@ -68,17 +68,17 @@ echo "account balance in execer"
 ./chain33-cli account balance -e exchange -a 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k
 ./chain33-cli account balance -e exchange -a 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs
 
-##transfer token
-./chain33-cli send token transfer -a 10000000 -s CCNY -t 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
-./chain33-cli send token transfer -a 10000000 -s CCNY -t 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
-./chain33-cli send token transfer -a 10000000 -s CCNY -t 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
-./chain33-cli send token transfer -a 10000000 -s CCNY -t 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
+##transfer token，每人2亿 ccny
+./chain33-cli send token transfer -a 200000000 -s CCNY -t 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
+./chain33-cli send token transfer -a 200000000 -s CCNY -t 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
+./chain33-cli send token transfer -a 200000000 -s CCNY -t 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
+./chain33-cli send token transfer -a 200000000 -s CCNY -t 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs -k 1CbEVT9RnM5oZhWMj4fxUrJX94VtRotzvs
 
 ## send token to excer
-./chain33-cli send token send_exec -a 10000000 -e exchange -s CCNY -k 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4
-./chain33-cli send token send_exec -a 10000000 -e exchange -s CCNY -k 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR
-./chain33-cli send token send_exec -a 10000000 -e exchange -s CCNY -k 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k
-./chain33-cli send token send_exec -a 10000000 -e exchange -s CCNY -k 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs
+./chain33-cli send token send_exec -a 200000000 -e exchange -s CCNY -k 1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4
+./chain33-cli send token send_exec -a 200000000 -e exchange -s CCNY -k 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR
+./chain33-cli send token send_exec -a 200000000 -e exchange -s CCNY -k 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k
+./chain33-cli send token send_exec -a 200000000 -e exchange -s CCNY -k 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs
 echo "token balance in execer"
 ./chain33-cli token token_balance -e exchange -s CCNY -a "1KSBd17H7ZK8iT37aJztFB22XGwsPTdwE4 1JRNjdEqp4LJ5fqycUBm9ayCKSeeskgMKR 1NLHPEcbTWWxxU3dGUZBhayjrCHD3psX7k 1MCftFynyvG2F4ED5mdHYgziDxx6vDrScs"