Remove extra db lookup #1645
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,22 +4,21 @@ import { | |
| dbHelpers, | ||
| MarketFromDatabase, | ||
| MarketMessageContents, | ||
| OraclePriceFromDatabase, | ||
| OraclePriceTable, | ||
| PerpetualMarketFromDatabase, | ||
| perpetualMarketRefresher, | ||
| PerpetualPositionFromDatabase, | ||
| PerpetualPositionStatus, | ||
| PerpetualPositionTable, | ||
| PositionSide, | ||
| SubaccountMessageContents, | ||
| SubaccountTable, | ||
| testConstants, | ||
| testMocks, | ||
| TransferFromDatabase, | ||
| TransferType, | ||
| UpdatedPerpetualPositionSubaccountKafkaObject, | ||
| } from '@dydxprotocol-indexer/postgres'; | ||
| import { IndexerSubaccountId } from '@dydxprotocol-indexer/v4-protos'; | ||
| import { DateTime } from 'luxon'; | ||
|
|
@@ -492,9 +491,6 @@ describe('kafka-helper', () => { | |
| }); | ||
|
|
||
| describe('pnl', () => { | ||
| const updatedObject: UpdatedPerpetualPositionSubaccountKafkaObject = { | ||
| perpetualId: '0', | ||
| maxSize: '25', | ||
|
|
@@ -545,7 +541,7 @@ describe('kafka-helper', () => { | |
| } = getPnl( | ||
| updatedObject, | ||
| perpetualMarketRefresher.getPerpetualMarketsMap()[updatedObject.perpetualId], | ||
| testConstants.defaultMarket, | ||
|
There was a problem hiding this comment. Tip Codebase Verification There are still multiple references to
Please update these references to ensure consistency with the new approach of using Analysis chainLGTM! Ensure all references to the old market map are updated. Also applies to: 565-565, 607-607 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Description: Verify all references to the old market map have been updated.
# Test: Search for the old market map usage. Expect: No occurrences.
rg --type python $'marketIdToMarket'
Length of output: 66 Script: #!/bin/bash
# Description: Verify all references to the old market map have been updated.
# Test: Search for the old market map usage. Expect: No occurrences.
rg --type ts $'marketIdToMarket'
Length of output: 2576 |
||
| ); | ||
| expect(realizedPnl).toEqual('-199998'); // 0*0-199998 | ||
| expect(unrealizedPnl).toEqual('1.5'); // 0.0001*(15000-0) | ||
|
|
@@ -566,7 +562,7 @@ describe('kafka-helper', () => { | |
| } = getPnl( | ||
| updatedObject2, | ||
| perpetualMarketRefresher.getPerpetualMarketsMap()[updatedObject2.perpetualId], | ||
| testConstants.defaultMarket, | ||
| ); | ||
| expect(realizedPnl).toEqual('-199993'); // 1*5-199998 | ||
| expect(unrealizedPnl).toEqual('1.5'); // 0.0001*(15000-0) | ||
|
|
@@ -608,7 +604,7 @@ describe('kafka-helper', () => { | |
| const updatedObjectWithPnl: UpdatedPerpetualPositionSubaccountKafkaObject = annotateWithPnl( | ||
| updatedObject2, | ||
| perpetualMarketRefresher.getPerpetualMarketsMap(), | ||
| testConstants.defaultMarket, | ||
| ); | ||
| expect( | ||
| updatedObjectWithPnl, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,8 @@ import { logger } from '@dydxprotocol-indexer/base'; | |
| import { | ||
| FillFromDatabase, | ||
| FillModel, | ||
| MarketFromDatabase, | ||
| MarketModel, | ||
| PerpetualMarketFromDatabase, | ||
| PerpetualMarketModel, | ||
| perpetualMarketRefresher, | ||
|
|
@@ -15,7 +13,6 @@ import { | |
| UpdatedPerpetualPositionSubaccountKafkaObject, | ||
| } from '@dydxprotocol-indexer/postgres'; | ||
| import { DeleveragingEventV1 } from '@dydxprotocol-indexer/v4-protos'; | ||
| import * as pg from 'pg'; | ||
|
|
||
| import { SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants'; | ||
|
|
@@ -60,31 +57,24 @@ export class DeleveragingHandler extends AbstractOrderFillHandler<DeleveragingEv | |
| resultRow.offsetting_fill) as FillFromDatabase; | ||
| const perpetualMarket: PerpetualMarketFromDatabase = PerpetualMarketModel.fromJson( | ||
| resultRow.perpetual_market) as PerpetualMarketFromDatabase; | ||
| const market: MarketFromDatabase = MarketModel.fromJson( | ||
| resultRow.market) as MarketFromDatabase; | ||
| const liquidatedPerpetualPosition: | ||
| PerpetualPositionFromDatabase = PerpetualPositionModel.fromJson( | ||
| resultRow.liquidated_perpetual_position) as PerpetualPositionFromDatabase; | ||
| const offsettingPerpetualPosition: | ||
| PerpetualPositionFromDatabase = PerpetualPositionModel.fromJson( | ||
| resultRow.offsetting_perpetual_position) as PerpetualPositionFromDatabase; | ||
|
|
||
| const liquidatedPositionUpdate: UpdatedPerpetualPositionSubaccountKafkaObject = annotateWithPnl( | ||
| convertPerpetualPosition(liquidatedPerpetualPosition), | ||
| perpetualMarketRefresher.getPerpetualMarketsMap(), | ||
| market, | ||
| ); | ||
| const offsettingPositionUpdate: UpdatedPerpetualPositionSubaccountKafkaObject = annotateWithPnl( | ||
| convertPerpetualPosition(offsettingPerpetualPosition), | ||
| perpetualMarketRefresher.getPerpetualMarketsMap(), | ||
| market, | ||
| ); | ||
| const kafkaEvents: ConsolidatedKafkaEvent[] = [ | ||
| this.generateConsolidatedKafkaEvent( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,42 +2,32 @@ import { | |
| FillFromDatabase, | ||
| FillModel, | ||
| Liquidity, | ||
| MarketFromDatabase, | ||
| MarketModel, | ||
| OrderFromDatabase, | ||
| OrderModel, | ||
| OrderStatus, | ||
| OrderTable, | ||
| PerpetualMarketFromDatabase, | ||
| PerpetualMarketModel, | ||
| perpetualMarketRefresher, | ||
| PerpetualPositionFromDatabase, | ||
| PerpetualPositionModel, | ||
| SubaccountTable, | ||
| UpdatedPerpetualPositionSubaccountKafkaObject, | ||
| } from '@dydxprotocol-indexer/postgres'; | ||
| import { StateFilledQuantumsCache } from '@dydxprotocol-indexer/redis'; | ||
| import { isStatefulOrder } from '@dydxprotocol-indexer/v4-proto-parser'; | ||
| import { IndexerOrderId, LiquidationOrderV1 } from '@dydxprotocol-indexer/v4-protos'; | ||
| import Long from 'long'; | ||
| import * as pg from 'pg'; | ||
|
|
||
| import { STATEFUL_ORDER_ORDER_FILL_EVENT_TYPE, SUBACCOUNT_ORDER_FILL_EVENT_TYPE } from '../../constants'; | ||
| import { annotateWithPnl, convertPerpetualPosition } from '../../helpers/kafka-helper'; | ||
| import { redisClient } from '../../helpers/redis/redis-controller'; | ||
| import { orderFillWithLiquidityToOrderFillEventWithLiquidation } from '../../helpers/translation-helper'; | ||
| import { OrderFillWithLiquidity } from '../../lib/translated-types'; | ||
| import { ConsolidatedKafkaEvent, OrderFillEventWithLiquidation } from '../../lib/types'; | ||
| import { AbstractOrderFillHandler } from './abstract-order-fill-handler'; | ||
|
|
||
| export class LiquidationHandler extends AbstractOrderFillHandler<OrderFillWithLiquidity> { | ||
|
|
@@ -99,23 +89,15 @@ export class LiquidationHandler extends AbstractOrderFillHandler<OrderFillWithLi | |
| resultRow[field].fill) as FillFromDatabase; | ||
| const perpetualMarket: PerpetualMarketFromDatabase = PerpetualMarketModel.fromJson( | ||
| resultRow[field].perpetual_market) as PerpetualMarketFromDatabase; | ||
| const market: MarketFromDatabase = MarketModel.fromJson( | ||
| resultRow[field].market) as MarketFromDatabase; | ||
| const position: PerpetualPositionFromDatabase = PerpetualPositionModel.fromJson( | ||
| resultRow[field].perpetual_position) as PerpetualPositionFromDatabase; | ||
|
|
||
| const positionUpdate: UpdatedPerpetualPositionSubaccountKafkaObject = annotateWithPnl( | ||
| convertPerpetualPosition(position), | ||
| perpetualMarketRefresher.getPerpetualMarketsMap(), | ||
| market, | ||
| ); | ||
|
|
||
| if (this.event.liquidity === Liquidity.MAKER) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tip
Codebase Verification
There are still multiple references to
marketIdToMarketin the codebase that need to be updated.indexer/packages/postgres/__tests__/db/helpers.test.tsindexer/services/comlink/__tests__/lib/helpers.test.tsindexer/services/ender/__tests__/helpers/indexer-proto-helpers.tsindexer/services/ender/src/handlers/subaccount-update-handler.tsindexer/services/comlink/src/controllers/api/v4/perpetual-positions-controller.tsindexer/services/comlink/src/controllers/api/v4/addresses-controller.tsindexer/services/ender/src/helpers/kafka-helper.tsPlease ensure all these references are updated to use the new market constant.
Analysis chain
LGTM! Ensure all references to the old market map are updated.
Also applies to: 309-309, 384-384, 390-390, 650-650
Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 66
Script:
Length of output: 74
Script:
Length of output: 2576