WIP

vegaprotocol · Apr 30, 2021 · 97f73bc · 97f73bc
1 parent 99e77fc
commit 97f73bc
Show file tree

Hide file tree

Showing 21 changed files with 484 additions and 693 deletions.
diff --git a/api/mocks/governance_service_mock.go b/api/mocks/governance_service_mock.go
diff --git a/execution/2500_GTT_amended_to_GTC_expires_test.go b/execution/2500_GTT_amended_to_GTC_expires_test.go
@@ -29,11 +29,10 @@ func TestGTTAmendToGTCAmendInPlace_OrderGetExpired(t *testing.T) {
 	// now we edit the order t make it GTC so it should not expire
 	amendment := &types.OrderAmendment{
 		OrderId:     o1.Id,
-		PartyId:     "aaa",
 		TimeInForce: types.Order_TIME_IN_FORCE_GTC,
 	}
 
-	amendConf, err := tm.market.AmendOrder(ctx, amendment)
+	amendConf, err := tm.market.AmendOrder(ctx, amendment, "aaa")
 	require.NotNil(t, amendConf)
 	require.NoError(t, err)
 	assert.Equal(t, types.Order_STATUS_ACTIVE, amendConf.Order.Status)

diff --git a/execution/amends_test_flip_gtt_gtc_test.go b/execution/amends_test_flip_gtt_gtc_test.go
@@ -31,14 +31,13 @@ func TestOrderBookAmends_FlipToGTT(t *testing.T) {
 	// now we edit the order t make it GTC so it should not expire
 	amendment := &types.OrderAmendment{
 		OrderId:     o1.Id,
-		PartyId:     "aaa",
 		TimeInForce: types.Order_TIME_IN_FORCE_GTT,
 		ExpiresAt: &types.Timestamp{
 			Value: now.Add(10 * time.Second).UnixNano(),
 		},
 	}
 
-	amendConf, err := tm.market.AmendOrder(ctx, amendment)
+	amendConf, err := tm.market.AmendOrder(ctx, amendment, "aaa")
 	require.NotNil(t, amendConf)
 	require.NoError(t, err)
 	assert.Equal(t, types.Order_STATUS_ACTIVE, amendConf.Order.Status)
@@ -47,14 +46,13 @@ func TestOrderBookAmends_FlipToGTT(t *testing.T) {
 	// now we edit the order t make it GTC so it should not expire
 	amendment2 := &types.OrderAmendment{
 		OrderId:     o1.Id,
-		PartyId:     "aaa",
 		TimeInForce: types.Order_TIME_IN_FORCE_GTT,
 		ExpiresAt: &types.Timestamp{
 			Value: now.Add(20 * time.Second).UnixNano(),
 		},
 	}
 
-	amendConf2, err := tm.market.AmendOrder(ctx, amendment2)
+	amendConf2, err := tm.market.AmendOrder(ctx, amendment2, "aaa")
 	require.NotNil(t, amendConf2)
 	require.NoError(t, err)
 	assert.Equal(t, types.Order_STATUS_ACTIVE, amendConf2.Order.Status)
@@ -63,11 +61,10 @@ func TestOrderBookAmends_FlipToGTT(t *testing.T) {
 	// now we edit the order t make it GTC so it should not expire
 	amendment3 := &types.OrderAmendment{
 		OrderId:     o1.Id,
-		PartyId:     "aaa",
 		TimeInForce: types.Order_TIME_IN_FORCE_GTC,
 	}
 
-	amendConf3, err := tm.market.AmendOrder(ctx, amendment3)
+	amendConf3, err := tm.market.AmendOrder(ctx, amendment3, "aaa")
 	require.NotNil(t, amendConf3)
 	require.NoError(t, err)
 	assert.Equal(t, types.Order_STATUS_ACTIVE, amendConf3.Order.Status)

diff --git a/execution/engine.go b/execution/engine.go
@@ -463,9 +463,9 @@ func (e *Engine) SubmitOrder(ctx context.Context, order *types.Order) (*types.Or
 
 // AmendOrder takes order amendment details and attempts to amend the order
 // if it exists and is in a editable state.
-func (e *Engine) AmendOrder(ctx context.Context, orderAmendment *types.OrderAmendment) (confirmation *types.OrderConfirmation, returnedErr error) {
+func (e *Engine) AmendOrder(ctx context.Context, orderAmendment *types.OrderAmendment, party string) (confirmation *types.OrderConfirmation, returnedErr error) {
 	defer func() {
-		e.notifyFailureOnError(ctx, returnedErr, orderAmendment.PartyId, orderAmendment)
+		e.notifyFailureOnError(ctx, returnedErr, party, orderAmendment)
 	}()
 
 	if e.log.IsDebug() {
@@ -479,7 +479,7 @@ func (e *Engine) AmendOrder(ctx context.Context, orderAmendment *types.OrderAmen
 
 	// we're passing a pointer here, so we need the wasActive var to be certain we're checking the original
 	// order status. It's possible order.Status will reflect the new status value if we don't
-	conf, err := mkt.AmendOrder(ctx, orderAmendment)
+	conf, err := mkt.AmendOrder(ctx, orderAmendment, party)
 	if err != nil {
 		return nil, err
 	}