Commit d7fe5d7c authored by vipwzw's avatar vipwzw

auto ci

parent 2baff87a
...@@ -40,14 +40,14 @@ var opt_exchange_order = &table.Option{ ...@@ -40,14 +40,14 @@ var opt_exchange_order = &table.Option{
Prefix: KeyPrefixLocalDB, Prefix: KeyPrefixLocalDB,
Name: "order", Name: "order",
Primary: "orderID", Primary: "orderID",
Index: []string{"market_order","addr_status"}, Index: []string{"market_order", "addr_status"},
} }
var opt_exchange_history = &table.Option{ var opt_exchange_history = &table.Option{
Prefix: KeyPrefixLocalDB, Prefix: KeyPrefixLocalDB,
Name: "history", Name: "history",
Primary: "index", Primary: "index",
Index: []string{"name","addr_status"}, Index: []string{"name", "addr_status"},
} }
//NewTable 新建表 //NewTable 新建表
...@@ -69,7 +69,6 @@ func NewMarketOrderTable(kvdb db.KV) *table.Table { ...@@ -69,7 +69,6 @@ func NewMarketOrderTable(kvdb db.KV) *table.Table {
return table return table
} }
func NewHistoryOrderTable(kvdb db.KV) *table.Table { func NewHistoryOrderTable(kvdb db.KV) *table.Table {
rowmeta := NewHistoryOrderRow() rowmeta := NewHistoryOrderRow()
table, err := table.NewTable(rowmeta, kvdb, opt_exchange_history) table, err := table.NewTable(rowmeta, kvdb, opt_exchange_history)
...@@ -109,7 +108,7 @@ func (r *OrderRow) Get(key string) ([]byte, error) { ...@@ -109,7 +108,7 @@ func (r *OrderRow) Get(key string) ([]byte, error) {
return []byte(fmt.Sprintf("%022d", r.OrderID)), nil return []byte(fmt.Sprintf("%022d", r.OrderID)), nil
} else if key == "market_order" { } else if key == "market_order" {
return []byte(fmt.Sprintf("%s:%s:%d:%016d", r.GetLimitOrder().LeftAsset.GetSymbol(), r.GetLimitOrder().RightAsset.GetSymbol(), r.GetLimitOrder().Op, int64(Truncate(r.GetLimitOrder().Price*float64(1e8))))), nil return []byte(fmt.Sprintf("%s:%s:%d:%016d", r.GetLimitOrder().LeftAsset.GetSymbol(), r.GetLimitOrder().RightAsset.GetSymbol(), r.GetLimitOrder().Op, int64(Truncate(r.GetLimitOrder().Price*float64(1e8))))), nil
} else if key == "addr_status"{ } else if key == "addr_status" {
return []byte(fmt.Sprintf("%s:%d", r.Addr, r.Status)), nil return []byte(fmt.Sprintf("%s:%d", r.Addr, r.Status)), nil
} }
return nil, types.ErrNotFound return nil, types.ErrNotFound
...@@ -141,9 +140,9 @@ func (m *HistoryOrderRow) SetPayload(data types.Message) error { ...@@ -141,9 +140,9 @@ func (m *HistoryOrderRow) SetPayload(data types.Message) error {
func (m *HistoryOrderRow) Get(key string) ([]byte, error) { func (m *HistoryOrderRow) Get(key string) ([]byte, error) {
if key == "index" { if key == "index" {
return []byte(fmt.Sprintf("%022d", m.Index)), nil return []byte(fmt.Sprintf("%022d", m.Index)), nil
}else if key == "name"{ } else if key == "name" {
return []byte(fmt.Sprintf("%s:%s", m.GetLimitOrder().LeftAsset.GetSymbol(), m.GetLimitOrder().RightAsset.GetSymbol())), nil return []byte(fmt.Sprintf("%s:%s", m.GetLimitOrder().LeftAsset.GetSymbol(), m.GetLimitOrder().RightAsset.GetSymbol())), nil
} else if key == "addr_status"{ } else if key == "addr_status" {
return []byte(fmt.Sprintf("%s:%d", m.Addr, m.Status)), nil return []byte(fmt.Sprintf("%s:%d", m.Addr, m.Status)), nil
} }
return nil, types.ErrNotFound return nil, types.ErrNotFound
......
...@@ -26,12 +26,15 @@ It has these top-level messages: ...@@ -26,12 +26,15 @@ It has these top-level messages:
*/ */
package types package types
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import ( import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
math "math"
context "golang.org/x/net/context" context "golang.org/x/net/context"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
) )
......
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