fix match engine (#522)

[bytom/vapor.git] / application / mov / match / fee_strategy.go

diff --git a/application/mov/match/fee_strategy.go b/application/mov/match/fee_strategy.go
index f3d1dfc..70a58a6 100644 (file)
--- a/application/mov/match/fee_strategy.go
+++ b/application/mov/match/fee_strategy.go
@@ -15,12 +15,27 @@ var (
 // AllocatedAssets represent reallocated assets after calculating fees
 type AllocatedAssets struct {
        Receives []*bc.AssetAmount
-       Refunds  []RefundAssets
+       Refunds  RefundAssets
        Fees     []*bc.AssetAmount
 }
 
 // RefundAssets represent alias for assetAmount array, because each transaction participant can be refunded multiple assets
-type RefundAssets []*bc.AssetAmount
+type RefundAssets [][]*bc.AssetAmount
+
+// Add used to add a refund to specify order
+func (r RefundAssets) Add(index int, asset bc.AssetID, amount uint64) {
+       if index >= len(r) {
+               index = 0
+       }
+
+       for _, assetAmount := range r[index] {
+               if *assetAmount.AssetId == asset {
+                       assetAmount.Amount += amount
+                       return
+               }
+       }
+       r[index] = append(r[index], &bc.AssetAmount{AssetId: &asset, Amount: amount})
+}
 
 // FeeStrategy used to indicate how to charge a matching fee
 type FeeStrategy interface {
@@ -50,7 +65,7 @@ func (d *DefaultFeeStrategy) Allocate(receiveAmounts, priceDiffs []*bc.AssetAmou
        }
 
        var fees []*bc.AssetAmount
-       refunds := make([]RefundAssets, len(receiveAmounts))
+       refunds := make([][]*bc.AssetAmount, len(receiveAmounts))
        receives := make([]*bc.AssetAmount, len(receiveAmounts))
 
        for i, receiveAmount := range receiveAmounts {