Commit f941df38 authored by vipwzw's avatar vipwzw

auto ci

parent ef3012f1
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
"github.com/33cn/chain33/account" "github.com/33cn/chain33/account"
"github.com/33cn/chain33/client" "github.com/33cn/chain33/client"
//"github.com/33cn/chain33/common" //"github.com/33cn/chain33/common"
dbm "github.com/33cn/chain33/common/db" dbm "github.com/33cn/chain33/common/db"
. "github.com/33cn/chain33/common/db/table" . "github.com/33cn/chain33/common/db/table"
......
...@@ -34,6 +34,7 @@ var opt_exchange_depth = &table.Option{ ...@@ -34,6 +34,7 @@ var opt_exchange_depth = &table.Option{
Primary: "price", Primary: "price",
Index: nil, Index: nil,
} }
//重新设计表,list查询全部在订单信息localdb查询中 //重新设计表,list查询全部在订单信息localdb查询中
var opt_exchange_order = &table.Option{ var opt_exchange_order = &table.Option{
Prefix: KeyPrefixLocalDB, Prefix: KeyPrefixLocalDB,
...@@ -57,7 +58,6 @@ var opt_exchange_completed = &table.Option{ ...@@ -57,7 +58,6 @@ var opt_exchange_completed = &table.Option{
Index: nil, Index: nil,
} }
//NewTable 新建表 //NewTable 新建表
func NewMarketDepthTable(kvdb db.KV) *table.Table { func NewMarketDepthTable(kvdb db.KV) *table.Table {
rowmeta := NewMarketDepthRow() rowmeta := NewMarketDepthRow()
...@@ -121,8 +121,8 @@ func (r *OrderRow) SetPayload(data types.Message) error { ...@@ -121,8 +121,8 @@ func (r *OrderRow) SetPayload(data types.Message) error {
//Get 按照indexName 查询 indexValue //Get 按照indexName 查询 indexValue
func (r *OrderRow) Get(key string) ([]byte, error) { func (r *OrderRow) Get(key string) ([]byte, error) {
if key == "orderID" { if key == "orderID" {
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
} }
return nil, types.ErrNotFound return nil, types.ErrNotFound
...@@ -169,7 +169,6 @@ func NewCompletedOrderRow() *CompletedOrderRow { ...@@ -169,7 +169,6 @@ func NewCompletedOrderRow() *CompletedOrderRow {
return &CompletedOrderRow{Order: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}} return &CompletedOrderRow{Order: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
} }
func (m *CompletedOrderRow) CreateRow() *table.Row { func (m *CompletedOrderRow) CreateRow() *table.Row {
return &table.Row{Data: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}} return &table.Row{Data: &ety.Order{Value: &ety.Order_LimitOrder{LimitOrder: &ety.LimitOrder{}}}}
} }
......
package types package types
import ( import (
"github.com/33cn/chain33/types"
"reflect" "reflect"
"github.com/33cn/chain33/types"
) )
/* /*
......
...@@ -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