Skip to content

P
plugin
Commit e2f6160a authored by sanghg's avatar sanghg Committed by vipwzw
Browse files
Options

issues #58

修复make vet 提示错误
parent 40589b8e
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 185 deletions
plugin/dapp/trade/executor/exec_test.go
View file @ e2f6160a
......@@ -88,13 +88,13 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
driver.SetStateDB(stateDB)
sell := &pty.TradeSellTx{
Symbol,
sellArgs.amount,
sellArgs.min,
sellArgs.price,
sellArgs.total,
0,
AssetExecToken,
TokenSymbol: Symbol,
AmountPerBoardlot: sellArgs.amount,
MinBoardlot: sellArgs.min,
PricePerBoardlot: sellArgs.price,
TotalBoardlot: sellArgs.total,
Fee: 0,
AssetExec: AssetExecToken,
}
tx, _ := pty.CreateRawTradeSellTx(sell)
tx, _ = signTx(tx, PrivKeyA)
......@@ -125,9 +125,9 @@ func TestTrade_Exec_SellLimit(t *testing.T) {
assert.Equal(t, string(Nodes[0]), sellOrder.Address)
buy := &pty.TradeBuyTx{
sellOrder.SellID,
buyArgs.total,
0,
SellID: sellOrder.SellID,
BoardlotCnt: buyArgs.total,
Fee: 0,
}
tx, _ = pty.CreateRawTradeBuyTx(buy)
tx, _ = signTx(tx, PrivKeyB)
......@@ -197,13 +197,13 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
driver.SetStateDB(stateDB)
buy := &pty.TradeBuyLimitTx{
Symbol,
buyArgs.amount,
buyArgs.min,
buyArgs.price,
buyArgs.total,
0,
AssetExecPara,
TokenSymbol: Symbol,
AmountPerBoardlot: buyArgs.amount,
MinBoardlot: buyArgs.min,
PricePerBoardlot: buyArgs.price,
TotalBoardlot: buyArgs.total,
Fee: 0,
AssetExec: AssetExecPara,
}
tx, _ := pty.CreateRawTradeBuyLimitTx(buy)
tx, _ = signTx(tx, PrivKeyB)
......@@ -234,9 +234,9 @@ func TestTrade_Exec_BuyLimit(t *testing.T) {
assert.Equal(t, string(Nodes[1]), buyLimitOrder.Address)
sell := &pty.TradeSellMarketTx{
buyLimitOrder.BuyID,
sellArgs.total,
0,
BuyID: buyLimitOrder.BuyID,
BoardlotCnt: sellArgs.total,
Fee: 0,
}
tx, _ = pty.CreateRawTradeSellMarketTx(sell)
tx, _ = signTx(tx, PrivKeyA)
......
plugin/dapp/trade/executor/kv.go
View file @ e2f6160a
......@@ -158,13 +158,13 @@ func genBuyMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptBuyBase
keyID := receipt.TxHash
newkey := calcTokenBuyOrderKey(receipt.TokenSymbol, receipt.Owner, status, keyID, height)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesBuyOrderKeyStatus(receipt.TokenSymbol, receipt.Owner, status, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesBuyOrderKeyToken(receipt.TokenSymbol, receipt.Owner, status, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
priceBoardlot, err := strconv.ParseFloat(receipt.PricePerBoardlot, 64)
if err != nil {
......@@ -180,11 +180,11 @@ func genBuyMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptBuyBase
newkey = calcTokensBuyOrderKeyStatus(receipt.TokenSymbol, status,
price, receipt.Owner, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
st, ty := fromStatus(status)
newkey = calcOnesOrderKey(receipt.Owner, st, ty, height, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
return kv
}
......@@ -195,13 +195,13 @@ func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBa
keyID := receipt.TxHash
newkey := calcTokenSellOrderKey(receipt.TokenSymbol, receipt.Owner, status, keyID, height)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesSellOrderKeyStatus(receipt.TokenSymbol, receipt.Owner, status, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesSellOrderKeyToken(receipt.TokenSymbol, receipt.Owner, status, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
priceBoardlot, err := strconv.ParseFloat(receipt.PricePerBoardlot, 64)
if err != nil {
......@@ -217,11 +217,11 @@ func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBa
newkey = calcTokensSellOrderKeyStatus(receipt.TokenSymbol, status,
price, receipt.Owner, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
st, ty := fromStatus(status)
newkey = calcOnesOrderKey(receipt.Owner, st, ty, height, keyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
return kv
}
......@@ -235,42 +235,42 @@ func calcPriceOfToken(priceBoardlot, AmountPerBoardlot int64) int64 {
func genBuyLimitOrderKeyValue(kv []*types.KeyValue, buyOrder *pty.BuyLimitOrder, status int32, value []byte) []*types.KeyValue {
newkey := calcTokenBuyOrderKey(buyOrder.TokenSymbol, buyOrder.Address, status, buyOrder.BuyID, buyOrder.Height)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesBuyOrderKeyStatus(buyOrder.TokenSymbol, buyOrder.Address, status, buyOrder.BuyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesBuyOrderKeyToken(buyOrder.TokenSymbol, buyOrder.Address, status, buyOrder.BuyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcTokensBuyOrderKeyStatus(buyOrder.TokenSymbol, status,
calcPriceOfToken(buyOrder.PricePerBoardlot, buyOrder.AmountPerBoardlot), buyOrder.Address, buyOrder.BuyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
st, ty := fromStatus(status)
newkey = calcOnesOrderKey(buyOrder.Address, st, ty, buyOrder.Height, buyOrder.BuyID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
return kv
}
func genSellOrderKeyValue(kv []*types.KeyValue, sellorder *pty.SellOrder, status int32, value []byte) []*types.KeyValue {
newkey := calcTokenSellOrderKey(sellorder.TokenSymbol, sellorder.Address, status, sellorder.SellID, sellorder.Height)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesSellOrderKeyStatus(sellorder.TokenSymbol, sellorder.Address, status, sellorder.SellID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcOnesSellOrderKeyToken(sellorder.TokenSymbol, sellorder.Address, status, sellorder.SellID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
newkey = calcTokensSellOrderKeyStatus(sellorder.TokenSymbol, status,
calcPriceOfToken(sellorder.PricePerBoardlot, sellorder.AmountPerBoardlot), sellorder.Address, sellorder.SellID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
st, ty := fromStatus(status)
newkey = calcOnesOrderKey(sellorder.Address, st, ty, sellorder.Height, sellorder.SellID)
kv = append(kv, &types.KeyValue{newkey, value})
kv = append(kv, &types.KeyValue{Key: newkey, Value: value})
return kv
}
plugin/dapp/trade/executor/trade_test.go
View file @ e2f6160a
......@@ -15,54 +15,54 @@ import (
var (
sellorderOnsale = pty.SellOrder{
"Tokensymbol",
"Address",
20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
"IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
pty.TradeOrderStatusOnSale, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
"token",
TokenSymbol: "Tokensymbol",
Address: "Address",
AmountPerBoardlot: 20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
MinBoardlot: 2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
PricePerBoardlot: 1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
TotalBoardlot: 60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
SoldBoardlot: 2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
Starttime: 0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
Stoptime: 0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
Crowdfund: false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
SellID: "IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
Status: pty.TradeOrderStatusOnSale, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
Height: 100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
AssetExec: "token",
}
sellorderSoldOut = pty.SellOrder{
"Tokensymbol",
"Address",
20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
"IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
pty.TradeOrderStatusSoldOut, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
"token",
TokenSymbol: "Tokensymbol",
Address: "Address",
AmountPerBoardlot: 20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
MinBoardlot: 2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
PricePerBoardlot: 1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
TotalBoardlot: 60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
SoldBoardlot: 2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
Starttime: 0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
Stoptime: 0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
Crowdfund: false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
SellID: "IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
Status: pty.TradeOrderStatusSoldOut, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
Height: 100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
AssetExec: "token",
}
sellorderRevoked = pty.SellOrder{
"Tokensymbol",
"Address",
20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
"IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
pty.TradeOrderStatusRevoked, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
"token",
TokenSymbol: "Tokensymbol",
Address: "Address",
AmountPerBoardlot: 20 * 1e8, // Amountperboardlot int64 `protobuf:"varint,3,opt,name=amountperboardlot" json:"amountperboardlot,omitempty"`
MinBoardlot: 2, // Minboardlot int64 `protobuf:"varint,4,opt,name=minboardlot" json:"minboardlot,omitempty"`
PricePerBoardlot: 1 * 1e8, //Priceperboardlot int64 `protobuf:"varint,5,opt,name=priceperboardlot" json:"priceperboardlot,omitempty"`
TotalBoardlot: 60, // Totalboardlot int64 `protobuf:"varint,6,opt,name=totalboardlot" json:"totalboardlot,omitempty"`
SoldBoardlot: 2, // Soldboardlot int64 `protobuf:"varint,7,opt,name=soldboardlot" json:"soldboardlot,omitempty"`
Starttime: 0, //Starttime int64 `protobuf:"varint,8,opt,name=starttime" json:"starttime,omitempty"`
Stoptime: 0, //Stoptime int64 `protobuf:"varint,9,opt,name=stoptime" json:"stoptime,omitempty"`
Crowdfund: false, //Crowdfund bool `protobuf:"varint,10,opt,name=crowdfund" json:"crowdfund,omitempty"`
SellID: "IAMSELLID", // Sellid string `protobuf:"bytes,11,opt,name=sellid" json:"sellid,omitempty"`
Status: pty.TradeOrderStatusRevoked, //Status int32 `protobuf:"varint,12,opt,name=status" json:"status,omitempty"`
Height: 100, //Height int64 `protobuf:"varint,13,opt,name=height" json:"height,omitempty"`
AssetExec: "token",
}
)
......
plugin/dapp/trade/executor/tradedb.go
View file @ e2f6160a
......@@ -40,29 +40,29 @@ func (selldb *sellDB) getSellLogs(tradeType int32, txhash string) *types.Receipt
log := &types.ReceiptLog{}
log.Ty = tradeType
base := &pty.ReceiptSellBase{
selldb.TokenSymbol,
selldb.Address,
strconv.FormatFloat(float64(selldb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
selldb.MinBoardlot,
strconv.FormatFloat(float64(selldb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
selldb.TotalBoardlot,
selldb.SoldBoardlot,
selldb.Starttime,
selldb.Stoptime,
selldb.Crowdfund,
selldb.SellID,
pty.SellOrderStatus[selldb.Status],
"",
txhash,
selldb.Height,
selldb.AssetExec,
TokenSymbol: selldb.TokenSymbol,
Owner: selldb.Address,
AmountPerBoardlot: strconv.FormatFloat(float64(selldb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
MinBoardlot: selldb.MinBoardlot,
PricePerBoardlot: strconv.FormatFloat(float64(selldb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
TotalBoardlot: selldb.TotalBoardlot,
SoldBoardlot: selldb.SoldBoardlot,
Starttime: selldb.Starttime,
Stoptime: selldb.Stoptime,
Crowdfund: selldb.Crowdfund,
SellID: selldb.SellID,
Status: pty.SellOrderStatus[selldb.Status],
BuyID: "",
TxHash: txhash,
Height: selldb.Height,
AssetExec: selldb.AssetExec,
}
if pty.TyLogTradeSellLimit == tradeType {
receiptTrade := &pty.ReceiptTradeSellLimit{base}
receiptTrade := &pty.ReceiptTradeSellLimit{Base: base}
log.Log = types.Encode(receiptTrade)
} else if pty.TyLogTradeSellRevoke == tradeType {
receiptTrade := &pty.ReceiptTradeSellRevoke{base}
receiptTrade := &pty.ReceiptTradeSellRevoke{Base: base}
log.Log = types.Encode(receiptTrade)
}
......@@ -73,22 +73,22 @@ func (selldb *sellDB) getBuyLogs(buyerAddr string, boardlotcnt int64, txhash str
log := &types.ReceiptLog{}
log.Ty = pty.TyLogTradeBuyMarket
base := &pty.ReceiptBuyBase{
selldb.TokenSymbol,
buyerAddr,
strconv.FormatFloat(float64(selldb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
selldb.MinBoardlot,
strconv.FormatFloat(float64(selldb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
boardlotcnt,
boardlotcnt,
"",
pty.SellOrderStatus[pty.TradeOrderStatusBoughtOut],
selldb.SellID,
txhash,
selldb.Height,
selldb.AssetExec,
}
receipt := &pty.ReceiptTradeBuyMarket{base}
TokenSymbol: selldb.TokenSymbol,
Owner: buyerAddr,
AmountPerBoardlot: strconv.FormatFloat(float64(selldb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
MinBoardlot: selldb.MinBoardlot,
PricePerBoardlot: strconv.FormatFloat(float64(selldb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
TotalBoardlot: boardlotcnt,
BoughtBoardlot: boardlotcnt,
BuyID: "",
Status: pty.SellOrderStatus[pty.TradeOrderStatusBoughtOut],
SellID: selldb.SellID,
TxHash: txhash,
Height: selldb.Height,
AssetExec: selldb.AssetExec,
}
receipt := &pty.ReceiptTradeBuyMarket{Base: base}
log.Log = types.Encode(receipt)
return log
}
......@@ -131,7 +131,7 @@ func getTx(txHash []byte, db dbm.KV) (*types.TxResult, error) {
func (selldb *sellDB) getKVSet() (kvset []*types.KeyValue) {
value := types.Encode(&selldb.SellOrder)
key := []byte(selldb.SellID)
kvset = append(kvset, &types.KeyValue{key, value})
kvset = append(kvset, &types.KeyValue{Key: key, Value: value})
return kvset
}
......@@ -156,7 +156,7 @@ func (buydb *buyDB) save(db dbm.KV) []*types.KeyValue {
func (buydb *buyDB) getKVSet() (kvset []*types.KeyValue) {
value := types.Encode(&buydb.BuyLimitOrder)
key := []byte(buydb.BuyID)
kvset = append(kvset, &types.KeyValue{key, value})
kvset = append(kvset, &types.KeyValue{Key: key, Value: value})
return kvset
}
......@@ -164,26 +164,26 @@ func (buydb *buyDB) getBuyLogs(tradeType int32, txhash string) *types.ReceiptLog
log := &types.ReceiptLog{}
log.Ty = tradeType
base := &pty.ReceiptBuyBase{
buydb.TokenSymbol,
buydb.Address,
strconv.FormatFloat(float64(buydb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
buydb.MinBoardlot,
strconv.FormatFloat(float64(buydb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
buydb.TotalBoardlot,
buydb.BoughtBoardlot,
buydb.BuyID,
pty.SellOrderStatus[buydb.Status],
"",
txhash,
buydb.Height,
buydb.AssetExec,
TokenSymbol: buydb.TokenSymbol,
Owner: buydb.Address,
AmountPerBoardlot: strconv.FormatFloat(float64(buydb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
MinBoardlot: buydb.MinBoardlot,
PricePerBoardlot: strconv.FormatFloat(float64(buydb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
TotalBoardlot: buydb.TotalBoardlot,
BoughtBoardlot: buydb.BoughtBoardlot,
BuyID: buydb.BuyID,
Status: pty.SellOrderStatus[buydb.Status],
SellID: "",
TxHash: txhash,
Height: buydb.Height,
AssetExec: buydb.AssetExec,
}
if pty.TyLogTradeBuyLimit == tradeType {
receiptTrade := &pty.ReceiptTradeBuyLimit{base}
receiptTrade := &pty.ReceiptTradeBuyLimit{Base: base}
log.Log = types.Encode(receiptTrade)
} else if pty.TyLogTradeBuyRevoke == tradeType {
receiptTrade := &pty.ReceiptTradeBuyRevoke{base}
receiptTrade := &pty.ReceiptTradeBuyRevoke{Base: base}
log.Log = types.Encode(receiptTrade)
}
......@@ -209,22 +209,22 @@ func (buydb *buyDB) getSellLogs(sellerAddr string, sellID string, boardlotCnt in
log := &types.ReceiptLog{}
log.Ty = pty.TyLogTradeSellMarket
base := &pty.ReceiptSellBase{
buydb.TokenSymbol,
sellerAddr,
strconv.FormatFloat(float64(buydb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
buydb.MinBoardlot,
strconv.FormatFloat(float64(buydb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
boardlotCnt,
boardlotCnt,
0,
0,
false,
"",
pty.SellOrderStatus[pty.TradeOrderStatusSoldOut],
buydb.BuyID,
txhash,
buydb.Height,
buydb.AssetExec,
TokenSymbol: buydb.TokenSymbol,
Owner: sellerAddr,
AmountPerBoardlot: strconv.FormatFloat(float64(buydb.AmountPerBoardlot)/float64(types.TokenPrecision), 'f', 8, 64),
MinBoardlot: buydb.MinBoardlot,
PricePerBoardlot: strconv.FormatFloat(float64(buydb.PricePerBoardlot)/float64(types.Coin), 'f', 8, 64),
TotalBoardlot: boardlotCnt,
SoldBoardlot: boardlotCnt,
Starttime: 0,
Stoptime: 0,
Crowdfund: false,
SellID: "",
Status: pty.SellOrderStatus[pty.TradeOrderStatusSoldOut],
BuyID: buydb.BuyID,
TxHash: txhash,
Height: buydb.Height,
AssetExec: buydb.AssetExec,
}
receiptSellMarket := &pty.ReceiptSellMarket{Base: base}
log.Log = types.Encode(receiptSellMarket)
......@@ -272,20 +272,20 @@ func (action *tradeAction) tradeSell(sell *pty.TradeForSell) (*types.Receipt, er
var logs []*types.ReceiptLog
var kv []*types.KeyValue
sellOrder := pty.SellOrder{
sell.GetTokenSymbol(),
action.fromaddr,
sell.GetAmountPerBoardlot(),
sell.GetMinBoardlot(),
sell.GetPricePerBoardlot(),
sell.GetTotalBoardlot(),
0,
sell.GetStarttime(),
sell.GetStoptime(),
sell.GetCrowdfund(),
calcTokenSellID(action.txhash),
pty.TradeOrderStatusOnSale,
action.height,
sell.AssetExec,
TokenSymbol: sell.GetTokenSymbol(),
Address: action.fromaddr,
AmountPerBoardlot: sell.GetAmountPerBoardlot(),
MinBoardlot: sell.GetMinBoardlot(),
PricePerBoardlot: sell.GetPricePerBoardlot(),
TotalBoardlot: sell.GetTotalBoardlot(),
SoldBoardlot: 0,
Starttime: sell.GetStarttime(),
Stoptime: sell.GetStoptime(),
Crowdfund: sell.GetCrowdfund(),
SellID: calcTokenSellID(action.txhash),
Status: pty.TradeOrderStatusOnSale,
Height: action.height,
AssetExec: sell.AssetExec,
}
tokendb := newSellDB(sellOrder)
......@@ -295,7 +295,7 @@ func (action *tradeAction) tradeSell(sell *pty.TradeForSell) (*types.Receipt, er
kv = append(kv, receipt.KV...)
kv = append(kv, sellOrderKV...)
receipt = &types.Receipt{types.ExecOk, kv, logs}
receipt = &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
return receipt, nil
}
......@@ -366,7 +366,7 @@ func (action *tradeAction) tradeBuy(buyOrder *pty.TradeForBuy) (*types.Receipt,
kv = append(kv, receiptFromAcc.KV...)
kv = append(kv, receiptFromExecAcc.KV...)
kv = append(kv, sellOrderKV...)
return &types.Receipt{types.ExecOk, kv, logs}, nil
return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
}
func (action *tradeAction) tradeRevokeSell(revoke *pty.TradeForRevokeSell) (*types.Receipt, error) {
......@@ -409,7 +409,7 @@ func (action *tradeAction) tradeRevokeSell(revoke *pty.TradeForRevokeSell) (*typ
logs = append(logs, tokendb.getSellLogs(pty.TyLogTradeSellRevoke, action.txhash))
kv = append(kv, receiptFromExecAcc.KV...)
kv = append(kv, sellOrderKV...)
return &types.Receipt{types.ExecOk, kv, logs}, nil
return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
}
func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Receipt, error) {
......@@ -432,17 +432,17 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
var logs []*types.ReceiptLog
var kv []*types.KeyValue
buyOrder := pty.BuyLimitOrder{
buy.GetTokenSymbol(),
action.fromaddr,
buy.GetAmountPerBoardlot(),
buy.GetMinBoardlot(),
buy.GetPricePerBoardlot(),
buy.GetTotalBoardlot(),
0,
calcTokenBuyID(action.txhash),
pty.TradeOrderStatusOnBuy,
action.height,
buy.AssetExec,
TokenSymbol: buy.GetTokenSymbol(),
Address: action.fromaddr,
AmountPerBoardlot: buy.GetAmountPerBoardlot(),
MinBoardlot: buy.GetMinBoardlot(),
PricePerBoardlot: buy.GetPricePerBoardlot(),
TotalBoardlot: buy.GetTotalBoardlot(),
BoughtBoardlot: 0,
BuyID: calcTokenBuyID(action.txhash),
Status: pty.TradeOrderStatusOnBuy,
Height: action.height,
AssetExec: buy.AssetExec,
}
tokendb := newBuyDB(buyOrder)
......@@ -452,7 +452,7 @@ func (action *tradeAction) tradeBuyLimit(buy *pty.TradeForBuyLimit) (*types.Rece
kv = append(kv, receipt.KV...)
kv = append(kv, buyOrderKV...)
receipt = &types.Receipt{types.ExecOk, kv, logs}
receipt = &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}
return receipt, nil
}
......@@ -523,7 +523,7 @@ func (action *tradeAction) tradeSellMarket(sellOrder *pty.TradeForSellMarket) (*
kv = append(kv, receiptFromAcc.KV...)
kv = append(kv, receiptFromExecAcc.KV...)
kv = append(kv, sellOrderKV...)
return &types.Receipt{types.ExecOk, kv, logs}, nil
return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
}
func (action *tradeAction) tradeRevokeBuyLimit(revoke *pty.TradeForRevokeBuy) (*types.Receipt, error) {
......@@ -562,5 +562,5 @@ func (action *tradeAction) tradeRevokeBuyLimit(revoke *pty.TradeForRevokeBuy) (*
logs = append(logs, tokendb.getBuyLogs(pty.TyLogTradeBuyRevoke, action.txhash))
kv = append(kv, receiptFromExecAcc.KV...)
kv = append(kv, sellOrderKV...)
return &types.Receipt{types.ExecOk, kv, logs}, nil
return &types.Receipt{Ty: types.ExecOk, KV: kv, Logs: logs}, nil
}
plugin/dapp/trade/rpc/rpc.go
View file @ e2f6160a
......@@ -35,7 +35,7 @@ func (cc *channelClient) CreateRawTradeBuyTx(ctx context.Context, in *ptypes.Tra
}
buy := &ptypes.Trade{
Ty: ptypes.TradeBuyMarket,
Value: &ptypes.Trade_BuyMarket{in},
Value: &ptypes.Trade_BuyMarket{BuyMarket: in},
}
tx, err := types.CreateFormatTx(types.ExecName(ptypes.TradeX), types.Encode(buy))
if err != nil {
......@@ -52,7 +52,7 @@ func (cc *channelClient) CreateRawTradeRevokeTx(ctx context.Context, in *ptypes.
}
buy := &ptypes.Trade{
Ty: ptypes.TradeRevokeSell,
Value: &ptypes.Trade_RevokeSell{in},
Value: &ptypes.Trade_RevokeSell{RevokeSell: in},
}
tx, err := types.CreateFormatTx(types.ExecName(ptypes.TradeX), types.Encode(buy))
if err != nil {
......@@ -69,7 +69,7 @@ func (cc *channelClient) CreateRawTradeBuyLimitTx(ctx context.Context, in *ptype
}
buy := &ptypes.Trade{
Ty: ptypes.TradeBuyLimit,
Value: &ptypes.Trade_BuyLimit{in},
Value: &ptypes.Trade_BuyLimit{BuyLimit: in},
}
tx, err := types.CreateFormatTx(types.ExecName(ptypes.TradeX), types.Encode(buy))
if err != nil {
......@@ -86,7 +86,7 @@ func (cc *channelClient) CreateRawTradeSellMarketTx(ctx context.Context, in *pty
}
buy := &ptypes.Trade{
Ty: ptypes.TradeSellMarket,
Value: &ptypes.Trade_SellMarket{in},
Value: &ptypes.Trade_SellMarket{SellMarket: in},
}
tx, err := types.CreateFormatTx(types.ExecName(ptypes.TradeX), types.Encode(buy))
if err != nil {
......@@ -103,7 +103,7 @@ func (cc *channelClient) CreateRawTradeRevokeBuyTx(ctx context.Context, in *ptyp
}
buy := &ptypes.Trade{
Ty: ptypes.TradeRevokeBuy,
Value: &ptypes.Trade_RevokeBuy{in},
Value: &ptypes.Trade_RevokeBuy{RevokeBuy: in},
}
tx, err := types.CreateFormatTx(types.ExecName(ptypes.TradeX), types.Encode(buy))
if err != nil {
......
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