LWDEV-9478 Refactor balances sub-system #262
Open
Conversation
This file contains hidden or 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
# Conflicts: # src/main/kotlin/com/lykke/matching/engine/balance/WalletOperationsProcessor.kt # src/main/kotlin/com/lykke/matching/engine/holders/BalancesHolder.kt # src/main/kotlin/com/lykke/matching/engine/order/cancel/AbstractLimitOrdersCanceller.kt # src/main/kotlin/com/lykke/matching/engine/order/cancel/GenericLimitOrdersCanceller.kt # src/main/kotlin/com/lykke/matching/engine/order/cancel/GenericLimitOrdersCancellerFactory.kt # src/main/kotlin/com/lykke/matching/engine/order/cancel/LimitOrdersCanceller.kt # src/main/kotlin/com/lykke/matching/engine/order/cancel/StopLimitOrdersCanceller.kt # src/main/kotlin/com/lykke/matching/engine/order/transaction/ExecutionContextFactory.kt # src/main/kotlin/com/lykke/matching/engine/services/CashTransferOperationService.kt # src/main/kotlin/com/lykke/matching/engine/services/ReservedCashInOutOperationService.kt # src/test/kotlin/com/lykke/matching/engine/balance/WalletOperationsProcessorTest.kt # src/test/kotlin/com/lykke/matching/engine/config/TestApplicationContext.kt # src/test/kotlin/com/lykke/matching/engine/performance/AbstractPerformanceTest.kt
# Conflicts: # src/dist/cfg/log4j.properties # src/main/kotlin/com/lykke/matching/engine/balance/WalletOperationsProcessor.kt # src/main/kotlin/com/lykke/matching/engine/holders/BalancesHolder.kt # src/main/kotlin/com/lykke/matching/engine/services/ReservedCashInOutOperationService.kt # src/main/kotlin/com/lykke/matching/engine/utils/balance/ReservedVolumesRecalculator.kt # src/test/kotlin/com/lykke/matching/engine/config/TestApplicationContext.kt
# Conflicts: # src/main/kotlin/com/lykke/matching/engine/services/CashInOutOperationService.kt # src/main/kotlin/com/lykke/matching/engine/services/CashTransferOperationService.kt # src/test/kotlin/com/lykke/matching/engine/config/TestApplicationContext.kt # src/test/kotlin/com/lykke/matching/engine/config/TestExecutionContext.kt # src/test/kotlin/com/lykke/matching/engine/performance/AbstractPerformanceTest.kt
| messageSequenceNumber)) | ||
| } | ||
|
|
||
| fun sendNotification(id: String, type: String, messageId: String) { |
Contributor
There was a problem hiding this comment.
I propose to move sending notification outside from WalletOperationsProcessor additionally in the frame of this task
| private val applicationSettingsHolder: ApplicationSettingsHolder, | ||
| private val assetsHolder: AssetsHolder, | ||
| private val balancesService: BalancesService) { | ||
| fun create(logger: Logger?, validate: Boolean = true): WalletOperationsProcessor { |
| class BalancesHolder(private val balancesDbAccessorsHolder: BalancesDatabaseAccessorsHolder): BalancesGetter { | ||
|
|
||
| companion object { | ||
| private val LOGGER = LoggerFactory.getLogger(BalancesHolder::class.java.name) |
Contributor
There was a problem hiding this comment.
Now this logger is unused
|
|
||
| interface BalancesService { | ||
| fun insertOrUpdateWallets(wallets: Collection<Wallet>, messageSequenceNumber: Long?): Boolean | ||
| fun sendBalanceUpdate(balanceUpdate: BalanceUpdate) |
Contributor
There was a problem hiding this comment.
I propose to split this interface: insertOrUpdateWallets is used only for services used while starting ME, sendBalanceUpdate is used for sending old format messages. There is no reason to keep them in one service.
Contributor
Author
There was a problem hiding this comment.
sendBalanceUpdate - moved to separate interface implemented by CashInOutOldEventSender
| open fun testBackOfficeDatabaseAccessor(): TestBackOfficeDatabaseAccessor { | ||
| val testBackOfficeDatabaseAccessor = TestBackOfficeDatabaseAccessor() | ||
| testBackOfficeDatabaseAccessor.addAsset(Asset("USD", 2)) | ||
| testBackOfficeDatabaseAccessor.addAsset(Asset("EUR", 4)) |
Contributor
There was a problem hiding this comment.
Is it actually needed ?
Contributor
Author
There was a problem hiding this comment.
deduplicated code
| testOrderBookWrapper.addLimitOrder(buildLimitOrder(assetId = "EURJPY", price = 116.356, volume = 1000.0, clientId = "Client3")) | ||
| testBalanceHolderWrapper.updateBalance("Client3", "JPY", 1000.0) | ||
| testBalanceHolderWrapper.updateBalance("Client4", "EUR", 0.00999999999999999) | ||
| testBalanceHolderWrapper.updateBalance("Client4", "EUR", 0.0) |
Contributor
There was a problem hiding this comment.
Why has the value been changed to 0.0 ?
# Conflicts: # src/test/kotlin/com/lykke/matching/engine/performance/AbstractPerformanceTest.kt
# Conflicts: # src/main/kotlin/com/lykke/matching/engine/outgoing/senders/impl/specialized/CashInOutEventSender.kt # src/main/kotlin/com/lykke/matching/engine/outgoing/senders/impl/specialized/CashInOutOldEventSender.kt # src/main/kotlin/com/lykke/matching/engine/outgoing/senders/impl/specialized/CashTransferEventSender.kt # src/main/kotlin/com/lykke/matching/engine/outgoing/senders/impl/specialized/CashTransferOldEventSender.kt # src/main/kotlin/com/lykke/matching/engine/services/ReservedCashInOutOperationService.kt # src/main/kotlin/com/lykke/matching/engine/utils/balance/ReservedVolumesRecalculator.kt # src/test/kotlin/com/lykke/matching/engine/balance/WalletOperationsProcessorTest.kt # src/test/kotlin/com/lykke/matching/engine/config/TestApplicationContext.kt # src/test/kotlin/com/lykke/matching/engine/config/TestExecutionContext.kt # src/test/kotlin/com/lykke/matching/engine/services/CashInOutOperationServiceTest.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.