| 修订版 | 28941b0c64dd2ff2cab3d35f3b308a9977ae8ef9 (tree) |
|---|---|
| 时间 | 2019-11-05 15:19:01 |
| 作者 | shenao78 <shenao.78@163....> |
| Commiter | shenao78 |
opt code
application/mov/match/match.go (diff)| @@ -42,20 +42,11 @@ func (e *Engine) HasMatchedTx(tradePairs ...*common.TradePair) bool { | ||
| 42 | 42 | // the size of trade pairs at least 2, and the sequence of trade pairs can form a loop |
| 43 | 43 | // for example, [assetA -> assetB, assetB -> assetC, assetC -> assetA] |
| 44 | 44 | func (e *Engine) NextMatchedTx(tradePairs ...*common.TradePair) (*types.Tx, error) { |
| 45 | - if err := validateTradePairs(tradePairs); err != nil { | |
| 46 | - return nil, err | |
| 47 | - } | |
| 48 | - | |
| 49 | - orders := e.peekOrders(tradePairs) | |
| 50 | - if len(orders) == 0 { | |
| 51 | - return nil, errors.New("no order for the specified trade pair in the order table") | |
| 52 | - } | |
| 53 | - | |
| 54 | - if !isMatched(orders) { | |
| 45 | + if !e.HasMatchedTx(tradePairs...) { | |
| 55 | 46 | return nil, errors.New("the specified trade pairs can not be matched") |
| 56 | 47 | } |
| 57 | 48 | |
| 58 | - tx, err := e.buildMatchTx(orders) | |
| 49 | + tx, err := e.buildMatchTx(e.peekOrders(tradePairs)) | |
| 59 | 50 | if err != nil { |
| 60 | 51 | return nil, err |
| 61 | 52 | } |
Fork