fix collateral engine transfer requests processing

vegaprotocol · Jul 2, 2021 · 90c1cbe · 90c1cbe
1 parent 4e66299
commit 90c1cbe
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 30 deletions.
diff --git a/collateral/engine.go b/collateral/engine.go
@@ -552,6 +552,9 @@ func (e *Engine) MarkToMarket(ctx context.Context, marketID string, transfers []
 		// accumulate the expected transfer size
 		expCollected.AddSum(req.Amount)
 		expectCollected = expectCollected.Add(num.DecimalFromUint(req.Amount))
+		// doing a copy of the amount here, as the request is send to getLedgerEntries, which actually
+		// modifies it
+		requestAmount := req.Amount.Clone()
 
 		// set the amount (this can change the req.Amount value if we entered loss socialisation
 		res, err := e.getLedgerEntries(ctx, req)
@@ -579,8 +582,8 @@ func (e *Engine) MarkToMarket(ctx context.Context, marketID string, transfers []
 
 		// here we check if we were able to collect all monies,
 		// if not send an event to notify the plugins
-		if totalInAccount := num.Sum(marginAcc.Balance, generalAcc.Balance); totalInAccount.LT(req.Amount) {
-			delta := req.Amount.Sub(req.Amount, totalInAccount)
+		if totalInAccount := num.Sum(marginAcc.Balance, generalAcc.Balance); totalInAccount.LT(requestAmount) {
+			delta := req.Amount.Sub(requestAmount, totalInAccount)
 			e.log.Warn("loss socialization missing amount to be collected or used from insurance pool",
 				logging.String("party-id", evt.Party()),
 				logging.BigUint("amount", delta),

diff --git a/integration/features/1847-closeout-long-with-fees.feature b/integration/features/1847-closeout-long-with-fees.feature
@@ -69,9 +69,7 @@ Feature: Long close-out test (see ln 293 of system-tests/grpc/trading/tradesTest
     Then the traders should have the following profit and loss:
       | trader | volume | unrealised pnl | realised pnl |
       | tt_4   | 4      | -200           | 0            |
-      | tt_5   | 0      | 0              | -200         |
+      | tt_5   | 0      | 0              | -102         |
       | tt_6   | -4     | 200            | -28          |
       | tt_10  | 30     | 0              | 0            |
       | tt_11  | -30    | 200            | -63          |
-      # This is after uint changes...
-      # | tt_5   | 0      | 0              | -102         |
diff --git a/integration/features/1847-closeout-long.feature b/integration/features/1847-closeout-long.feature
@@ -60,9 +60,7 @@ Feature: Long close-out test (see ln 293 of system-tests/grpc/trading/tradesTest
     Then the traders should have the following profit and loss:
       | trader | volume | unrealised pnl | realised pnl |
       | tt_4   | 4      | -200           | 0            |
-      | tt_5   | 0      | 0              | -200         |
+      | tt_5   | 0      | 0              | -100         |
       | tt_6   | -4     | 200            | -27          |
       | tt_10  | 30     | 0              | 0            |
       | tt_11  | -30    | 200            | -65          |
-      # Again: a change after uint stuff
-      # | tt_5   | 0      | 0              | -100         |
diff --git a/integration/features/verified-loss-socialization-case1.feature b/integration/features/verified-loss-socialization-case1.feature
@@ -66,10 +66,8 @@ Feature: Test loss socialization case 1
     Then the trading mode should be "TRADING_MODE_CONTINUOUS" for the market "ETH/DEC19"
     Then the traders should have the following profit and loss:
       | trader  | volume | unrealised pnl | realised pnl |
-      | trader1 | 0      | 0              | -8000        |
+      | trader1 | 0      | 0              | -5000        |
       | trader2 | 200    | 8000           | -2970        |
       | trader3 | -100   | 0              | 0            |
-      # value before uint stuff
-      #| trader1 | 0      | 0              | -5000        |
     And the insurance pool balance should be "0" for the market "ETH/DEC19"
     And the cumulated balance for all accounts should be worth "400105000"
diff --git a/integration/features/verified-loss-socialization-case2.feature b/integration/features/verified-loss-socialization-case2.feature
@@ -71,7 +71,7 @@ Feature: Test loss socialization case 2
 # check positions
     Then the traders should have the following profit and loss:
       | trader  | volume | unrealised pnl | realised pnl |
-      | trader1 | 0      | 0              | -5000        |
+      | trader1 | 0      | 0              | -2500        |
       | trader2 | 35     | 2000           | -1362        |
       | trader3 | 75     | 6000           | -4083        |
       | trader4 | -10    | 0              | 0            |

diff --git a/integration/features/verified-loss-socialization-case3.feature b/integration/features/verified-loss-socialization-case3.feature
@@ -81,11 +81,8 @@ Feature: Test loss socialization case 3
 # check positions
     Then the traders should have the following profit and loss:
       | trader  | volume | unrealised pnl | realised pnl |
-      | trader1 | 0      | 0              | -2400        |
+      | trader1 | 0      | 0              | -2000        |
       | trader2 | 100    | 7200           | -2455        |
-      | trader3 | 0      | 0              | -5600        |
+      | trader3 | 0      | 0              | -3000        |
       | trader4 | 0      | 0              | 528          |
-      # value before uint stuff
-      #| trader1 | 0      | 0              | -2000        |
-      #| trader3 | 0      | 0              | -3000        |
     And the insurance pool balance should be "0" for the market "ETH/DEC19"
diff --git a/integration/features/verified-loss-socialization-case4.feature b/integration/features/verified-loss-socialization-case4.feature
@@ -81,11 +81,8 @@ Feature: Test loss socialization case 4
 # check positions
     Then the traders should have the following profit and loss:
       | trader  | volume | unrealised pnl | realised pnl |
-      | trader1 | 0      | 0              | -2400        |
+      | trader1 | 0      | 0              | -2000        |
       | trader2 | 100    | 7200           | -90          |
-      | trader3 | 0      | 0              | -5600        |
+      | trader3 | 0      | 0              | -3000        |
       | trader4 | 0      | 0              | 791          |
-      # value before uint stuff
-      #| trader1 | 0      | 0              | -2000        |
-      #| trader3 | 0      | 0              | -3000        |
     And the insurance pool balance should be "0" for the market "ETH/DEC19"
diff --git a/integration/features/verified-loss-socialization-case5.feature b/integration/features/verified-loss-socialization-case5.feature
@@ -76,11 +76,8 @@ Feature: Test loss socialization case 5
 # check positions
     Then the traders should have the following profit and loss:
       | trader  | volume | unrealised pnl | realised pnl |
-      | trader1 | 0      | 0              | -2400        |
+      | trader1 | 0      | 0              | -2000        |
       | trader2 | 100    | 7200           | 0            |
-      | trader3 | 0      | 0              | -5600        |
+      | trader3 | 0      | 0              | -3000        |
       | trader4 | 0      | 0              | 800          |
-      # value before uint stuff
-      #| trader1 | 0      | 0              | -2000        |
-      #| trader3 | 0      | 0              | -3000        |
     And the insurance pool balance should be "0" for the market "ETH/DEC19"
diff --git a/integration/features/verified-positions-resolution-4.feature b/integration/features/verified-positions-resolution-4.feature
@@ -70,10 +70,8 @@ Feature: Position resolution case 4
 #check positions
     Then the traders should have the following profit and loss:
       | trader           | volume | unrealised pnl | realised pnl |
-      | designatedLooser | 0      | 0              | -11500       |
+      | designatedLooser | 0      | 0              | -10000       |
       | buySideProvider  | 101    | 11500          | -1363        |
-      # value before uint stuff
-      #| designatedLooser | 0      | 0              | -10000       |
 
 # checking margins
     Then the traders should have the following account balances: