Commit edd10bb1 authored by linj's avatar linj Committed by vipwzw

fix test

parent af81d2f7
...@@ -36,6 +36,7 @@ type orderArgs struct { ...@@ -36,6 +36,7 @@ type orderArgs struct {
var ( var (
Symbol = "TEST" Symbol = "TEST"
SymbolA = "TESTA"
AssetExecToken = "token" AssetExecToken = "token"
AssetExecPara = "paracross" AssetExecPara = "paracross"
...@@ -70,7 +71,7 @@ func TestTrade_Exec_SellLimit(t *testing.T) { ...@@ -70,7 +71,7 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
env := execEnv{ env := execEnv{
1539918074, 1539918074,
types.GetDappFork("trade", pty.ForkTradeAssetX), types.GetDappFork("trade", pty.ForkTradePriceX),
2, 2,
1539918074, 1539918074,
"hash", "hash",
...@@ -97,6 +98,8 @@ func TestTrade_Exec_SellLimit(t *testing.T) { ...@@ -97,6 +98,8 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
TotalBoardlot: sellArgs.total, TotalBoardlot: sellArgs.total,
Fee: 0, Fee: 0,
AssetExec: AssetExecToken, AssetExec: AssetExecToken,
PriceExec: "coins",
PriceSymbol: "bty",
} }
tx, _ := pty.CreateRawTradeSellTx(sell) tx, _ := pty.CreateRawTradeSellTx(sell)
tx, _ = signTx(tx, PrivKeyA) tx, _ = signTx(tx, PrivKeyA)
...@@ -218,7 +221,7 @@ func TestTrade_Exec_BuyLimit(t *testing.T) { ...@@ -218,7 +221,7 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
stateDB, _ := dbm.NewGoMemDB("1", "2", 100) stateDB, _ := dbm.NewGoMemDB("1", "2", 100)
_, ldb, kvdb := util.CreateTestDB() _, ldb, kvdb := util.CreateTestDB()
accB := account.NewCoinsAccount() accB, _ := account.NewAccountDB(AssetExecToken, SymbolA, stateDB)
accB.SetDB(stateDB) accB.SetDB(stateDB)
accB.SaveExecAccount(address.ExecAddress("trade"), &accountB) accB.SaveExecAccount(address.ExecAddress("trade"), &accountB)
...@@ -238,6 +241,8 @@ func TestTrade_Exec_BuyLimit(t *testing.T) { ...@@ -238,6 +241,8 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
TotalBoardlot: buyArgs.total, TotalBoardlot: buyArgs.total,
Fee: 0, Fee: 0,
AssetExec: AssetExecPara, AssetExec: AssetExecPara,
PriceExec: AssetExecToken,
PriceSymbol: SymbolA,
} }
tx, _ := pty.CreateRawTradeBuyLimitTx(buy) tx, _ := pty.CreateRawTradeBuyLimitTx(buy)
tx, _ = signTx(tx, PrivKeyB) tx, _ = signTx(tx, PrivKeyB)
...@@ -343,6 +348,7 @@ func TestTradeSellFixAssetDB(t *testing.T) { ...@@ -343,6 +348,7 @@ func TestTradeSellFixAssetDB(t *testing.T) {
types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeAssetX, int64(10)) types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeAssetX, int64(10))
types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeIDX, int64(10)) types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeIDX, int64(10))
types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeFixAssetDBX, int64(20)) types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradeFixAssetDBX, int64(20))
types.SetDappFork(types.GetTitle(), pty.TradeX, pty.ForkTradePriceX, int64(30))
sellArgs := &orderArgs{100, 2, 2, 100} sellArgs := &orderArgs{100, 2, 2, 100}
buyArgs := &orderArgs{total: 5} buyArgs := &orderArgs{total: 5}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment