add pool id to position closed (#212)

* add pool id to position closed

* fix test

Author: xlc

modules/margin-protocol/src/lib.rs

@@ -116,8 +116,8 @@ decl_event! {
 	{
 		/// Position opened: (who, position_id, pool_id, trading_pair, leverage, leveraged_amount, market_price)
 		PositionOpened(AccountId, PositionId, LiquidityPoolId, TradingPair, Leverage, Amount, Price),
-		/// Position closed: (who, position_id, market_price)
-		PositionClosed(AccountId, PositionId, Price),
+		/// Position closed: (who, position_id, pool_id, market_price)
+		PositionClosed(AccountId, PositionId, LiquidityPoolId, Price),
 		/// Deposited: (who, pool_id, amount)
 		Deposited(AccountId, LiquidityPoolId, Amount),
 		/// Withdrew: (who, pool_id, amount)
@@ -446,6 +446,7 @@ impl<T: Trait> Module<T> {
 		Self::deposit_event(RawEvent::PositionClosed(
 			who.clone(),
 			position_id,
+			position.pool,
 			FixedU128::from_parts(u128_from_fixed_128(market_price)),
 		));
 

modules/margin-protocol/src/tests.rs

@@ -1319,8 +1319,12 @@ fn close_loss_position_works() {
 			assert_eq!(MarginProtocol::positions_by_trader(ALICE, (MOCK_POOL, id)), None);
 			assert_eq!(MarginProtocol::positions_by_pool(MOCK_POOL, (EUR_USD_PAIR, id)), None);
 
-			let event =
-				TestEvent::margin_protocol(RawEvent::PositionClosed(ALICE, id, Price::from_rational(11988, 10000)));
+			let event = TestEvent::margin_protocol(RawEvent::PositionClosed(
+				ALICE,
+				id,
+				MOCK_POOL,
+				Price::from_rational(11988, 10000),
+			));
 			assert!(System::events().iter().any(|record| record.event == event));
 		});
 }